Skip to content

Commit 683d4b9

Browse files
Bump gateway image to register missing Jaeger UI routes (#1082)
* Bump gateway image Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com> * fix changelog check Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com> --------- Signed-off-by: Andreas Gerstmayr <agerstmayr@redhat.com>
1 parent 1ac621a commit 683d4b9

File tree

6 files changed

+27
-10
lines changed

6 files changed

+27
-10
lines changed

.chloggen/jaeger_ui_routes.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: bug_fix
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. tempostack, tempomonolithic, github action)
5+
component: tempostack, tempomonolithic
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Register missing Jaeger UI routes
9+
10+
# One or more tracking issues related to the change
11+
issues: [1082]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext: |
17+
Without these routes, hitting refresh on the trace detail, system architecture or monitor page of Jaeger UI results in a 404.

.github/workflows/changelog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
7575
# In order to validate any links in the yaml file, render the config to markdown
7676
- name: Render .chloggen changelog entries
77-
run: make chlog-preview > changelog_preview.md
77+
run: make chlog-preview > changelog_preview.md 2>&1
7878
- name: Install markdown-link-check
7979
run: npm install -g markdown-link-check@3.12.2
8080
- name: Run markdown-link-check

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ OPERATOR_VERSION ?= 0.14.0
33
TEMPO_VERSION ?= 2.6.1
44
JAEGER_QUERY_VERSION ?= 1.62.0
55
TEMPO_QUERY_VERSION ?= 2.6.1
6-
TEMPO_GATEWAY_VERSION ?= main-2024-10-16-43b97ec
6+
TEMPO_GATEWAY_VERSION ?= main-2024-11-05-28e4c83
77
TEMPO_GATEWAY_OPA_VERSION ?= main-2024-10-09-7237863
88
OAUTH_PROXY_VERSION=4.14
99

@@ -497,7 +497,7 @@ FILENAME?=$(shell git branch --show-current)
497497

498498
.PHONY: chloggen
499499
chloggen:
500-
test -s $(CHLOGGEN) || $(call go-get-tool,$(CHLOGGEN),go.opentelemetry.io/build-tools/chloggen,$(CHLOGGEN_VERSION))
500+
@test -s $(CHLOGGEN) || $(call go-get-tool,$(CHLOGGEN),go.opentelemetry.io/build-tools/chloggen,$(CHLOGGEN_VERSION))
501501

502502
.PHONY: chlog-new
503503
chlog-new: chloggen

bundle/community/manifests/tempo-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ metadata:
7474
capabilities: Deep Insights
7575
categories: Logging & Tracing,Monitoring
7676
containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0
77-
createdAt: "2024-10-30T12:08:06Z"
77+
createdAt: "2024-11-06T09:57:13Z"
7878
description: Create and manage deployments of Tempo, a high-scale distributed
7979
tracing backend.
8080
operatorframework.io/cluster-monitoring: "true"
@@ -1470,7 +1470,7 @@ spec:
14701470
- name: RELATED_IMAGE_TEMPO_QUERY
14711471
value: docker.io/grafana/tempo-query:2.6.1
14721472
- name: RELATED_IMAGE_TEMPO_GATEWAY
1473-
value: quay.io/observatorium/api:main-2024-10-16-43b97ec
1473+
value: quay.io/observatorium/api:main-2024-11-05-28e4c83
14741474
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
14751475
value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
14761476
- name: RELATED_IMAGE_OAUTH_PROXY
@@ -1619,7 +1619,7 @@ spec:
16191619
name: jaeger-query
16201620
- image: docker.io/grafana/tempo-query:2.6.1
16211621
name: tempo-query
1622-
- image: quay.io/observatorium/api:main-2024-10-16-43b97ec
1622+
- image: quay.io/observatorium/api:main-2024-11-05-28e4c83
16231623
name: tempo-gateway
16241624
- image: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
16251625
name: tempo-gateway-opa

bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ metadata:
7474
capabilities: Deep Insights
7575
categories: Logging & Tracing,Monitoring
7676
containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0
77-
createdAt: "2024-10-30T12:08:04Z"
77+
createdAt: "2024-11-06T09:57:12Z"
7878
description: Create and manage deployments of Tempo, a high-scale distributed
7979
tracing backend.
8080
operatorframework.io/cluster-monitoring: "true"
@@ -1480,7 +1480,7 @@ spec:
14801480
- name: RELATED_IMAGE_TEMPO_QUERY
14811481
value: docker.io/grafana/tempo-query:2.6.1
14821482
- name: RELATED_IMAGE_TEMPO_GATEWAY
1483-
value: quay.io/observatorium/api:main-2024-10-16-43b97ec
1483+
value: quay.io/observatorium/api:main-2024-11-05-28e4c83
14841484
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
14851485
value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
14861486
- name: RELATED_IMAGE_OAUTH_PROXY
@@ -1640,7 +1640,7 @@ spec:
16401640
name: jaeger-query
16411641
- image: docker.io/grafana/tempo-query:2.6.1
16421642
name: tempo-query
1643-
- image: quay.io/observatorium/api:main-2024-10-16-43b97ec
1643+
- image: quay.io/observatorium/api:main-2024-11-05-28e4c83
16441644
name: tempo-gateway
16451645
- image: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
16461646
name: tempo-gateway-opa

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
- name: RELATED_IMAGE_TEMPO_QUERY
4747
value: docker.io/grafana/tempo-query:2.6.1
4848
- name: RELATED_IMAGE_TEMPO_GATEWAY
49-
value: quay.io/observatorium/api:main-2024-10-16-43b97ec
49+
value: quay.io/observatorium/api:main-2024-11-05-28e4c83
5050
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
5151
value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863
5252
- name: RELATED_IMAGE_OAUTH_PROXY

0 commit comments

Comments
 (0)