From d0493120b7ff5793971b2485132bc01555e4b43a Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Fri, 26 Jan 2024 13:17:04 +0100 Subject: [PATCH] operator: Update Loki operand to v2.9.4 (#11778) --- operator/CHANGELOG.md | 1 + .../bundle/manifests/loki-operator.clusterserviceversion.yaml | 4 ++-- .../overlays/development/manager_related_image_patch.yaml | 2 +- .../overlays/openshift/manager_related_image_patch.yaml | 2 +- .../overlays/production/manager_related_image_patch.yaml | 2 +- operator/docs/operator/compatibility.md | 1 + operator/hack/addons_dev.yaml | 4 ++-- operator/hack/addons_ocp.yaml | 4 ++-- operator/internal/manifests/var.go | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 2ff8b0ae681a..b51e5c7e6a61 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -2,6 +2,7 @@ ## Release 5.6.16 +- [11778](https://github.com/grafana/loki/pull/11778) **periklis**: Update Loki operand to v2.9.4 - [11624](https://github.com/grafana/loki/pull/11624) **xperimental**: React to changes in ConfigMap used for storage CA ## Release 5.6.15 diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index 8cf0efe27c3d..2b4e8217e8c5 100644 --- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml @@ -1330,7 +1330,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v2.9.3 + value: quay.io/openshift-logging/loki:v2.9.4 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1451,7 +1451,7 @@ spec: provider: name: Grafana.com relatedImages: - - image: quay.io/openshift-logging/loki:v2.9.3 + - image: quay.io/openshift-logging/loki:v2.9.4 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 f9a2449bceed..a9c7cf22f1d1 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:2.9.3 + value: docker.io/grafana/loki:2.9.4 - 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 5e64be8752f2..28c00163194a 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:v2.9.3 + value: quay.io/openshift-logging/loki:v2.9.4 - 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 f9a2449bceed..a9c7cf22f1d1 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:2.9.3 + value: docker.io/grafana/loki:2.9.4 - 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 0be6de4ff4ee..bf689317a924 100644 --- a/operator/docs/operator/compatibility.md +++ b/operator/docs/operator/compatibility.md @@ -36,3 +36,4 @@ The versions of Loki compatible to be run with the Loki Operator are: * v2.9.1 * v2.9.2 * v2.9.3 +* v2.9.4 diff --git a/operator/hack/addons_dev.yaml b/operator/hack/addons_dev.yaml index adf6aa053add..f2538cd9f5af 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:2.9.3-amd64 + image: docker.io/grafana/logcli:2.9.4-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -73,7 +73,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.9.3 + image: docker.io/grafana/promtail:2.9.4 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 1a0ff7325a62..5a09cbc0e6aa 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:2.9.3-amd64 + image: docker.io/grafana/logcli:2.9.4-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -70,7 +70,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.9.3 + image: docker.io/grafana/promtail:2.9.4 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 1902c26a0396..e7f69131b837 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:2.9.3" + DefaultContainerImage = "docker.io/grafana/loki:2.9.4" // DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway. DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"