From 27755044c3b7856cd6792cf68e4fe57c033547a7 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Mon, 30 Jan 2023 18:39:44 +0100 Subject: [PATCH] operator: Update operand Loki to v2.7.2 (#8336) --- 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/internal/manifests/var.go | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 31120f25394e..af01e2af9c2f 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [8336](https://github.com/grafana/loki/pull/8336) **periklis**: Update Loki operand to v2.7.2 - [8265](https://github.com/grafana/loki/pull/8265) **Red-GV**: Use gRPC compactor service instead of http for retention - [8087](https://github.com/grafana/loki/pull/8087) **xperimental**: Fix status not updating when state of pods changes - [8173](https://github.com/grafana/loki/pull/8173) **periklis**: Remove custom webhook cert mounts for OLM-based deployment (OpenShift) diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index a5fc184e5e49..fb59bad7db8b 100644 --- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml @@ -1260,7 +1260,7 @@ spec: - /manager env: - name: RELATED_IMAGE_LOKI - value: quay.io/openshift-logging/loki:v2.7.1 + value: quay.io/openshift-logging/loki:v2.7.2 - name: RELATED_IMAGE_GATEWAY value: quay.io/observatorium/api:latest - name: RELATED_IMAGE_OPA @@ -1381,7 +1381,7 @@ spec: provider: name: Grafana.com relatedImages: - - image: quay.io/openshift-logging/loki:v2.7.1 + - image: quay.io/openshift-logging/loki:v2.7.2 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 bd3aba988aa5..bd48d13ab2f2 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.7.1 + value: docker.io/grafana/loki:2.7.2 - 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 600888f6f2df..7d266c680402 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.7.1 + value: quay.io/openshift-logging/loki:v2.7.2 - 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 bd3aba988aa5..bd48d13ab2f2 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.7.1 + value: docker.io/grafana/loki:2.7.2 - 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 8ff3837e25c4..0adb3df640ef 100644 --- a/operator/docs/operator/compatibility.md +++ b/operator/docs/operator/compatibility.md @@ -28,3 +28,4 @@ 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 diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index cfd5bb346811..3010fb893bf5 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -52,7 +52,7 @@ const ( EnvRelatedImageGateway = "RELATED_IMAGE_GATEWAY" // DefaultContainerImage declares the default fallback for loki image. - DefaultContainerImage = "docker.io/grafana/loki:2.7.1" + DefaultContainerImage = "docker.io/grafana/loki:2.7.2" // DefaultLokiStackGatewayImage declares the default image for lokiStack-gateway. DefaultLokiStackGatewayImage = "quay.io/observatorium/api:latest"