Update Tempo to v2.6.1 (#1064)

Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com>
grafana · Oct 16, 2024 · dcaa0fb · dcaa0fb
1 parent 5bc672f
commit dcaa0fb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.chloggen/update_tempo.yaml b/.chloggen/update_tempo.yaml
@@ -5,10 +5,10 @@ change_type: enhancement
 component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Update Tempo to v2.6.0
+note: Update Tempo to v2.6.1
 
 # One or more tracking issues related to the change
-issues: [1044]
+issues: [1044, 1064]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.

diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 # Current Operator version
 OPERATOR_VERSION ?= 0.13.0
-TEMPO_VERSION ?= 2.6.0
+TEMPO_VERSION ?= 2.6.1
 JAEGER_QUERY_VERSION ?= 1.62.0
-TEMPO_QUERY_VERSION ?= main-a2f70c9
+TEMPO_QUERY_VERSION ?= 2.6.1
 TEMPO_GATEWAY_VERSION ?= main-2024-08-05-11d0d94
 TEMPO_GATEWAY_OPA_VERSION ?= main-2024-04-29-914c13f
 OAUTH_PROXY_VERSION=4.14

diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing,Monitoring
     containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0
-    createdAt: "2024-10-14T12:48:35Z"
+    createdAt: "2024-10-15T16:50:15Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -1449,11 +1449,11 @@ spec:
                 - --config=controller_manager_config.yaml
                 env:
                 - name: RELATED_IMAGE_TEMPO
-                  value: docker.io/grafana/tempo:2.6.0
+                  value: docker.io/grafana/tempo:2.6.1
                 - name: RELATED_IMAGE_JAEGER_QUERY
                   value: docker.io/jaegertracing/jaeger-query:1.62.0
                 - name: RELATED_IMAGE_TEMPO_QUERY
-                  value: docker.io/grafana/tempo-query:main-a2f70c9
+                  value: docker.io/grafana/tempo-query:2.6.1
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
                   value: quay.io/observatorium/api:main-2024-08-05-11d0d94
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
@@ -1598,11 +1598,11 @@ spec:
   provider:
     name: Grafana Tempo Operator SIG
   relatedImages:
-  - image: docker.io/grafana/tempo:2.6.0
+  - image: docker.io/grafana/tempo:2.6.1
     name: tempo
   - image: docker.io/jaegertracing/jaeger-query:1.62.0
     name: jaeger-query
-  - image: docker.io/grafana/tempo-query:main-a2f70c9
+  - image: docker.io/grafana/tempo-query:2.6.1
     name: tempo-query
   - image: quay.io/observatorium/api:main-2024-08-05-11d0d94
     name: tempo-gateway

diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml
@@ -74,7 +74,7 @@ metadata:
     capabilities: Deep Insights
     categories: Logging & Tracing,Monitoring
     containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0
-    createdAt: "2024-10-14T12:48:34Z"
+    createdAt: "2024-10-15T16:50:14Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -1459,11 +1459,11 @@ spec:
                 - --config=controller_manager_config.yaml
                 env:
                 - name: RELATED_IMAGE_TEMPO
-                  value: docker.io/grafana/tempo:2.6.0
+                  value: docker.io/grafana/tempo:2.6.1
                 - name: RELATED_IMAGE_JAEGER_QUERY
                   value: docker.io/jaegertracing/jaeger-query:1.62.0
                 - name: RELATED_IMAGE_TEMPO_QUERY
-                  value: docker.io/grafana/tempo-query:main-a2f70c9
+                  value: docker.io/grafana/tempo-query:2.6.1
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
                   value: quay.io/observatorium/api:main-2024-08-05-11d0d94
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
@@ -1619,11 +1619,11 @@ spec:
   provider:
     name: Grafana Tempo Operator SIG
   relatedImages:
-  - image: docker.io/grafana/tempo:2.6.0
+  - image: docker.io/grafana/tempo:2.6.1
     name: tempo
   - image: docker.io/jaegertracing/jaeger-query:1.62.0
     name: jaeger-query
-  - image: docker.io/grafana/tempo-query:main-a2f70c9
+  - image: docker.io/grafana/tempo-query:2.6.1
     name: tempo-query
   - image: quay.io/observatorium/api:main-2024-08-05-11d0d94
     name: tempo-gateway

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -40,11 +40,11 @@ spec:
         - --leader-elect
         env:
         - name: RELATED_IMAGE_TEMPO
-          value: docker.io/grafana/tempo:2.6.0
+          value: docker.io/grafana/tempo:2.6.1
         - name: RELATED_IMAGE_JAEGER_QUERY
           value: docker.io/jaegertracing/jaeger-query:1.62.0
         - name: RELATED_IMAGE_TEMPO_QUERY
-          value: docker.io/grafana/tempo-query:main-a2f70c9
+          value: docker.io/grafana/tempo-query:2.6.1
         - name: RELATED_IMAGE_TEMPO_GATEWAY
           value: quay.io/observatorium/api:main-2024-08-05-11d0d94
         - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA