Merge pull request #317 from periklis/operand-loki-v3.1.0-5.6

[release-5.6] Backport PR grafana#13422
openshift · Jul 5, 2024 · 482be2e · 482be2e
2 parents e8f2b47 + 455e6c6
commit 482be2e
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 54 deletions.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.6.21
 
+- [13422](https://github.com/grafana/loki/pull/13422) **periklis** feat(operator): Update Loki operand to v3.1.0
 - [13369](https://github.com/grafana/loki/pull/13369) **jatinsu**: feat(operator): Add support for the volume API
 
 ## Release 5.6.20

diff --git 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:v2.9.8
+                  value: quay.io/openshift-logging/loki:v3.1.0
                 - 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:v2.9.8
+  - image: quay.io/openshift-logging/loki:v3.1.0
     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
@@ -9,6 +9,6 @@ spec:
         - name: manager
           env:
           - name: RELATED_IMAGE_LOKI
-            value: docker.io/grafana/loki:2.9.8
+            value: docker.io/grafana/loki:3.1.0
           - 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
@@ -9,7 +9,7 @@ spec:
         - name: manager
           env:
           - name: RELATED_IMAGE_LOKI
-            value: quay.io/openshift-logging/loki:v2.9.8
+            value: quay.io/openshift-logging/loki:v3.1.0
           - 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
@@ -9,6 +9,6 @@ spec:
         - name: manager
           env:
           - name: RELATED_IMAGE_LOKI
-            value: docker.io/grafana/loki:2.9.8
+            value: docker.io/grafana/loki:3.1.0
           - name: RELATED_IMAGE_GATEWAY
             value: quay.io/observatorium/api:latest
diff --git a/operator/docs/operator/compatibility.md b/operator/docs/operator/compatibility.md
@@ -39,3 +39,4 @@ The versions of Loki compatible to be run with the Loki Operator are:
 * v2.9.4
 * v2.9.6
 * v2.9.8
+* v3.1.0
diff --git 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.8-amd64
+          image: docker.io/grafana/logcli:3.1.0-amd64
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -73,7 +73,7 @@ spec:
     spec:
       containers:
         - name: promtail
-          image: docker.io/grafana/promtail:2.9.8
+          image: docker.io/grafana/promtail:3.1.0
           args:
             - -config.file=/etc/promtail/promtail.yaml
             - -log.level=info

diff --git 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.8-amd64
+          image: docker.io/grafana/logcli:3.1.0-amd64
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
@@ -70,7 +70,7 @@ spec:
     spec:
       containers:
         - name: promtail
-          image: docker.io/grafana/promtail:2.9.8
+          image: docker.io/grafana/promtail:3.1.0
           args:
             - -config.file=/etc/promtail/promtail.yaml
             - -log.level=info