From f68cd9da44f9ab2521b8af54c67bdd995ede3bea Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Wed, 4 Sep 2024 19:49:32 +0200 Subject: [PATCH] feat(operator): Update Loki operand to v3.1.1 (#14042) --- operator/CHANGELOG.md | 8 ++++++++ .../loki-operator.clusterserviceversion.yaml | 4 ++-- .../development/manager_related_image_patch.yaml | 2 +- .../openshift/manager_related_image_patch.yaml | 2 +- .../production/manager_related_image_patch.yaml | 2 +- operator/docs/operator/compatibility.md | 13 +------------ operator/hack/addons_dev.yaml | 4 ++-- operator/hack/addons_ocp.yaml | 4 ++-- operator/internal/manifests/var.go | 2 +- 9 files changed, 19 insertions(+), 22 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 8f8dbed05cb7..11e6cc0b5048 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,13 @@ ## Main +## Release 5.6.24 + +- [14042](https://github.com/grafana/loki/pull/14042) **periklis**: feat(operator): Update Loki operand to v3.1.1 + +## Release 5.6.23 + +No changes. + ## Release 5.6.22 - [13708](https://github.com/grafana/loki/pull/13708) **periklis**: fix(operator): Don't overwrite annotations for LokiStack ingress resources diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index 622e2858eb45..fd88493f21b4 100644 --- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml @@ -1342,7 +1342,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v3.1.0 + value: quay.io/openshift-logging/loki:v3.1.1 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1464,7 +1464,7 @@ spec: provider: name: Grafana.com relatedImages: - - image: quay.io/openshift-logging/loki:v3.1.0 + - image: quay.io/openshift-logging/loki:v3.1.1 name: loki - image: quay.io/observatorium/api:latest name: gateway diff --git a/operator/config/overlays/development/manager_related_image_patch.yaml b/operator/config/overlays/development/manager_related_image_patch.yaml index 3ae62832b150..21aa79f99a7d 100644 --- a/operator/config/overlays/development/manager_related_image_patch.yaml +++ b/operator/config/overlays/development/manager_related_image_patch.yaml @@ -9,6 +9,6 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:3.1.0 + value: docker.io/grafana/loki:3.1.1 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest diff --git a/operator/config/overlays/openshift/manager_related_image_patch.yaml b/operator/config/overlays/openshift/manager_related_image_patch.yaml index 675a31564035..3bb2b65cf461 100644 --- a/operator/config/overlays/openshift/manager_related_image_patch.yaml +++ b/operator/config/overlays/openshift/manager_related_image_patch.yaml @@ -9,7 +9,7 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v3.1.0 + value: quay.io/openshift-logging/loki:v3.1.1 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA diff --git a/operator/config/overlays/production/manager_related_image_patch.yaml b/operator/config/overlays/production/manager_related_image_patch.yaml index 3ae62832b150..21aa79f99a7d 100644 --- a/operator/config/overlays/production/manager_related_image_patch.yaml +++ b/operator/config/overlays/production/manager_related_image_patch.yaml @@ -9,6 +9,6 @@ spec: - name: manager env: - name: RELATED_IMAGE_LOKI - value: docker.io/grafana/loki:3.1.0 + value: docker.io/grafana/loki:3.1.1 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest diff --git a/operator/docs/operator/compatibility.md b/operator/docs/operator/compatibility.md index 76531b3163e2..382e7e6a7673 100644 --- a/operator/docs/operator/compatibility.md +++ b/operator/docs/operator/compatibility.md @@ -27,16 +27,5 @@ Due to the use of apiextensions.k8s.io/v1 CustomResourceDefinitions, requires Ku The versions of Loki compatible to be run with the Loki Operator are: -* v2.7.1 -* v2.7.2 -* v2.7.3 -* v2.7.4 -* v2.8.0 -* v2.8.3 -* v2.9.1 -* v2.9.2 -* v2.9.3 -* v2.9.4 -* v2.9.6 -* v2.9.8 * v3.1.0 +* v3.1.1 diff --git a/operator/hack/addons_dev.yaml b/operator/hack/addons_dev.yaml index feb9781d269d..320743bc3732 100644 --- a/operator/hack/addons_dev.yaml +++ b/operator/hack/addons_dev.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: logcli - image: docker.io/grafana/logcli:3.1.0-amd64 + image: docker.io/grafana/logcli:3.1.1-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -73,7 +73,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:3.1.0 + image: docker.io/grafana/promtail:3.1.1 args: - -config.file=/etc/promtail/promtail.yaml - -log.level=info diff --git a/operator/hack/addons_ocp.yaml b/operator/hack/addons_ocp.yaml index 59b942c9a405..6e49cbd847c8 100644 --- a/operator/hack/addons_ocp.yaml +++ b/operator/hack/addons_ocp.yaml @@ -29,7 +29,7 @@ spec: spec: containers: - name: logcli - image: docker.io/grafana/logcli:3.1.0-amd64 + image: docker.io/grafana/logcli:3.1.1-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -70,7 +70,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:3.1.0 + image: docker.io/grafana/promtail:3.1.1 args: - -config.file=/etc/promtail/promtail.yaml - -log.level=info diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index 47060badebf3..f208d67a1d92 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -57,7 +57,7 @@ const ( EnvRelatedImageGateway = "RELATED_IMAGE_GATEWAY" // DefaultContainerImage declares the default fallback for loki image. - DefaultContainerImage = "docker.io/grafana/loki:3.1.0" + DefaultContainerImage = "docker.io/grafana/loki:3.1.1" // DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway. DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"