From 683d4b96685dbb93ad49ab9b26d95e45f1e5f9cb Mon Sep 17 00:00:00 2001 From: Andreas Gerstmayr Date: Wed, 6 Nov 2024 15:21:15 +0100 Subject: [PATCH] Bump gateway image to register missing Jaeger UI routes (#1082) * Bump gateway image Signed-off-by: Andreas Gerstmayr * fix changelog check Signed-off-by: Andreas Gerstmayr --------- Signed-off-by: Andreas Gerstmayr --- .chloggen/jaeger_ui_routes.yaml | 17 +++++++++++++++++ .github/workflows/changelog.yaml | 2 +- Makefile | 4 ++-- .../tempo-operator.clusterserviceversion.yaml | 6 +++--- .../tempo-operator.clusterserviceversion.yaml | 6 +++--- config/manager/manager.yaml | 2 +- 6 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 .chloggen/jaeger_ui_routes.yaml diff --git a/.chloggen/jaeger_ui_routes.yaml b/.chloggen/jaeger_ui_routes.yaml new file mode 100644 index 000000000..27c4fd8db --- /dev/null +++ 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 index 0bfd7ab00..e937f8358 100644 --- 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 markdown-link-check@3.12.2 - name: Run markdown-link-check diff --git a/Makefile b/Makefile index bbdea9450..621e7d238 100644 --- 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 index ed99cc042..b2296cf79 100644 --- 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 index 20a0dc3fd..173c11d75 100644 --- 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 index c455962ba..2bed8bb3f 100644 --- 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