From 4affa206201a0820d422e65929bc92c56fd0a402 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 4 Apr 2024 14:09:04 +0200 Subject: [PATCH] chore(operator): Update Loki operand to v2.9.6 (#12370) --- operator/CHANGELOG.md | 4 ++++ .../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, 15 insertions(+), 10 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 3e6c30dc33094..feb4d2ba251e5 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,9 @@ ## Main +## Release 5.6.18 + +- [12370](https://github.com/grafana/loki/pull/12370) **periklis**: Update Loki operand to v2.9.6 + ## Release 5.6.17 - [12164](https://github.com/grafana/loki/pull/12164) **periklis**: Use safe bearer token authentication to scrape operator metrics diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index fdfac58a6298b..a8f9965f19a0a 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.4 + value: quay.io/openshift-logging/loki:v2.9.6 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1452,7 +1452,7 @@ spec: provider: name: Grafana.com relatedImages: - - image: quay.io/openshift-logging/loki:v2.9.4 + - image: quay.io/openshift-logging/loki:v2.9.6 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 a9c7cf22f1d1e..65b258b1c41cc 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.4 + value: docker.io/grafana/loki:2.9.6 - 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 28c00163194a7..7b10a721a0b8b 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.4 + value: quay.io/openshift-logging/loki:v2.9.6 - 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 a9c7cf22f1d1e..65b258b1c41cc 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.4 + value: docker.io/grafana/loki:2.9.6 - 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 bf689317a924f..cd1fb45b8d693 100644 --- a/operator/docs/operator/compatibility.md +++ b/operator/docs/operator/compatibility.md @@ -37,3 +37,4 @@ The versions of Loki compatible to be run with the Loki Operator are: * v2.9.2 * v2.9.3 * v2.9.4 +* v2.9.6 diff --git a/operator/hack/addons_dev.yaml b/operator/hack/addons_dev.yaml index f2538cd9f5af1..9021682211a89 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.4-amd64 + image: docker.io/grafana/logcli:2.9.6-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -73,7 +73,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.9.4 + image: docker.io/grafana/promtail:2.9.6 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 5a09cbc0e6aa4..47faa521b5fe6 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.4-amd64 + image: docker.io/grafana/logcli:2.9.6-amd64 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -70,7 +70,7 @@ spec: spec: containers: - name: promtail - image: docker.io/grafana/promtail:2.9.4 + image: docker.io/grafana/promtail:2.9.6 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 e7f69131b8370..d3ec0407c483e 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.4" + DefaultContainerImage = "docker.io/grafana/loki:2.9.6" // DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway. DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"