Skip to content

Commit

Permalink
jaeger-query: upgrade to version 1.62 (#1050)
Browse files Browse the repository at this point in the history
Signed-off-by: Benedikt Bongartz <[email protected]>
  • Loading branch information
frzifus authored Oct 8, 2024
1 parent ff0d0dc commit 5bfe5d8
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
16 changes: 16 additions & 0 deletions .chloggen/bump_jaeger-to-1.62.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# 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: bump jaeger to v1.62

# One or more tracking issues related to the change
issues: [1050]

# (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:
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
OPERATOR_VERSION ?= 0.13.0
TEMPO_VERSION ?= 2.5.0
TEMPO_QUERY_VERSION ?= main-2999520
# TODO change this to a release version. This has https://github.com/jaegertracing/jaeger/commit/d6631f5f2370cfc3a49efce312491031fb387600
JAEGER_QUERY_VERSION ?= d6631f5f2370cfc3a49efce312491031fb387600
JAEGER_QUERY_VERSION ?= 1.62.0
TEMPO_GATEWAY_VERSION ?= main-2024-08-05-11d0d94
TEMPO_GATEWAY_OPA_VERSION ?= main-2024-04-29-914c13f
OAUTH_PROXY_VERSION=4.14
Expand All @@ -12,7 +11,7 @@ MIN_KUBERNETES_VERSION ?= 1.25.0
MIN_OPENSHIFT_VERSION ?= 4.12

TEMPO_IMAGE ?= docker.io/grafana/tempo:$(TEMPO_VERSION)
JAEGER_QUERY_IMAGE ?= docker.io/jaegertracing/jaeger-query-snapshot:$(JAEGER_QUERY_VERSION)
JAEGER_QUERY_IMAGE ?= docker.io/jaegertracing/jaeger-query:$(JAEGER_QUERY_VERSION)
TEMPO_QUERY_IMAGE ?= docker.io/grafana/tempo-query:$(TEMPO_QUERY_VERSION)
TEMPO_GATEWAY_IMAGE ?= quay.io/observatorium/api:$(TEMPO_GATEWAY_VERSION)
TEMPO_GATEWAY_OPA_IMAGE ?= quay.io/observatorium/opa-openshift:$(TEMPO_GATEWAY_OPA_VERSION)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1425,7 +1425,7 @@ spec:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_JAEGER_QUERY
value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600
value: docker.io/jaegertracing/jaeger-query:1.62.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:main-2999520
- name: RELATED_IMAGE_TEMPO_GATEWAY
Expand Down Expand Up @@ -1574,7 +1574,7 @@ spec:
relatedImages:
- image: docker.io/grafana/tempo:2.5.0
name: tempo
- image: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600
- image: docker.io/jaegertracing/jaeger-query:1.62.0
name: jaeger-query
- image: docker.io/grafana/tempo-query:main-2999520
name: tempo-query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ spec:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_JAEGER_QUERY
value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600
value: docker.io/jaegertracing/jaeger-query:1.62.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:main-2999520
- name: RELATED_IMAGE_TEMPO_GATEWAY
Expand Down Expand Up @@ -1595,7 +1595,7 @@ spec:
relatedImages:
- image: docker.io/grafana/tempo:2.5.0
name: tempo
- image: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600
- image: docker.io/jaegertracing/jaeger-query:1.62.0
name: jaeger-query
- image: docker.io/grafana/tempo-query:main-2999520
name: tempo-query
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
- name: RELATED_IMAGE_TEMPO
value: docker.io/grafana/tempo:2.5.0
- name: RELATED_IMAGE_JAEGER_QUERY
value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600
value: docker.io/jaegertracing/jaeger-query:1.62.0
- name: RELATED_IMAGE_TEMPO_QUERY
value: docker.io/grafana/tempo-query:main-2999520
- name: RELATED_IMAGE_TEMPO_GATEWAY
Expand Down

0 comments on commit 5bfe5d8

Please sign in to comment.