Bump gateway image to register missing Jaeger UI routes (#1082)

* Bump gateway image Signed-off-by: Andreas Gerstmayr <[email protected]> * fix changelog check Signed-off-by: Andreas Gerstmayr <[email protected]> --------- Signed-off-by: Andreas Gerstmayr <[email protected]>
grafana · Nov 6, 2024 · 683d4b9 · 683d4b9
1 parent 1ac621a
commit 683d4b9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/.chloggen/jaeger_ui_routes.yaml b/.chloggen/jaeger_ui_routes.yaml
@@ -0,0 +1,17 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. tempostack, tempomonolithic, github action)
+component: tempostack, tempomonolithic
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Register missing Jaeger UI routes
+
+# One or more tracking issues related to the change
+issues: [1082]
+
+# (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.
+# Use pipe (|) for multiline entries.
+subtext: |
+  Without these routes, hitting refresh on the trace detail, system architecture or monitor page of Jaeger UI results in a 404.
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
@@ -74,7 +74,7 @@ jobs:
 
       # In order to validate any links in the yaml file, render the config to markdown
       - name: Render .chloggen changelog entries
-        run: make chlog-preview > changelog_preview.md
+        run: make chlog-preview > changelog_preview.md 2>&1
       - name: Install markdown-link-check
         run: npm install -g [email protected]
       - name: Run markdown-link-check

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ OPERATOR_VERSION ?= 0.14.0
 TEMPO_VERSION ?= 2.6.1
 JAEGER_QUERY_VERSION ?= 1.62.0
 TEMPO_QUERY_VERSION ?= 2.6.1
-TEMPO_GATEWAY_VERSION ?= main-2024-10-16-43b97ec
+TEMPO_GATEWAY_VERSION ?= main-2024-11-05-28e4c83
 TEMPO_GATEWAY_OPA_VERSION ?= main-2024-10-09-7237863
 OAUTH_PROXY_VERSION=4.14
 
@@ -497,7 +497,7 @@ FILENAME?=$(shell git branch --show-current)
 
 .PHONY: chloggen
 chloggen:
-	test -s $(CHLOGGEN) || $(call go-get-tool,$(CHLOGGEN),go.opentelemetry.io/build-tools/chloggen,$(CHLOGGEN_VERSION))
+	@test -s $(CHLOGGEN) || $(call go-get-tool,$(CHLOGGEN),go.opentelemetry.io/build-tools/chloggen,$(CHLOGGEN_VERSION))
 
 .PHONY: chlog-new
 chlog-new: chloggen

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.14.0
-    createdAt: "2024-10-30T12:08:06Z"
+    createdAt: "2024-11-06T09:57:13Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -1470,7 +1470,7 @@ spec:
                 - name: RELATED_IMAGE_TEMPO_QUERY
                   value: docker.io/grafana/tempo-query:2.6.1
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
-                  value: quay.io/observatorium/api:main-2024-10-16-43b97ec
+                  value: quay.io/observatorium/api:main-2024-11-05-28e4c83
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
                   value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
                 - name: RELATED_IMAGE_OAUTH_PROXY
@@ -1619,7 +1619,7 @@ spec:
     name: jaeger-query
   - image: docker.io/grafana/tempo-query:2.6.1
     name: tempo-query
-  - image: quay.io/observatorium/api:main-2024-10-16-43b97ec
+  - image: quay.io/observatorium/api:main-2024-11-05-28e4c83
     name: tempo-gateway
   - image: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
     name: tempo-gateway-opa

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.14.0
-    createdAt: "2024-10-30T12:08:04Z"
+    createdAt: "2024-11-06T09:57:12Z"
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"
@@ -1480,7 +1480,7 @@ spec:
                 - name: RELATED_IMAGE_TEMPO_QUERY
                   value: docker.io/grafana/tempo-query:2.6.1
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
-                  value: quay.io/observatorium/api:main-2024-10-16-43b97ec
+                  value: quay.io/observatorium/api:main-2024-11-05-28e4c83
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
                   value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
                 - name: RELATED_IMAGE_OAUTH_PROXY
@@ -1640,7 +1640,7 @@ spec:
     name: jaeger-query
   - image: docker.io/grafana/tempo-query:2.6.1
     name: tempo-query
-  - image: quay.io/observatorium/api:main-2024-10-16-43b97ec
+  - image: quay.io/observatorium/api:main-2024-11-05-28e4c83
     name: tempo-gateway
   - image: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
     name: tempo-gateway-opa

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -46,7 +46,7 @@ spec:
         - name: RELATED_IMAGE_TEMPO_QUERY
           value: docker.io/grafana/tempo-query:2.6.1
         - name: RELATED_IMAGE_TEMPO_GATEWAY
-          value: quay.io/observatorium/api:main-2024-10-16-43b97ec
+          value: quay.io/observatorium/api:main-2024-11-05-28e4c83
         - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
           value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
         - name: RELATED_IMAGE_OAUTH_PROXY