Skip to content

Commit 6660126

Browse files
andreasgerstmayrandreasgerstmayr
authored
Update Tempo to v2.8.1, and update gateway and opa images (#1238)
* Update Tempo to v2.8.1, and update gateway and opa images Signed-off-by: Andreas Gerstmayr <[email protected]> * update changelog Signed-off-by: Andreas Gerstmayr <[email protected]> * remove deprecated external_hedge_requests_at and external_hedge_requests_up_to config Signed-off-by: Andreas Gerstmayr <[email protected]> * fix config Signed-off-by: Andreas Gerstmayr <[email protected]> --------- Signed-off-by: Andreas Gerstmayr <[email protected]>
1 parent 3969e99 commit 6660126

File tree

12 files changed

+57
-135
lines changed

12 files changed

+57
-135
lines changed

‎.chloggen/tempo_2.8.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
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: Update Tempo to 2.8.1
9+
10+
# One or more tracking issues related to the change
11+
issues: [1238]
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+
Update Tempo to 2.8.1.
18+
Changelog: https://github.com/grafana/tempo/releases/tag/v2.8.0 and https://github.com/grafana/tempo/releases/tag/v2.8.1

‎Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Current Operator version
22
OPERATOR_VERSION ?= 0.16.0
3-
TEMPO_VERSION ?= 2.7.2
3+
TEMPO_VERSION ?= 2.8.1
44
JAEGER_QUERY_VERSION ?= 1.68.0
55
TEMPO_QUERY_VERSION ?= $(TEMPO_VERSION)
6-
TEMPO_GATEWAY_VERSION ?= main-2025-05-28-ebbaf26
7-
TEMPO_GATEWAY_OPA_VERSION ?= main-2025-05-26-4860be8
6+
# https://quay.io/repository/observatorium/api
7+
TEMPO_GATEWAY_VERSION ?= main-2025-06-16-5265085
8+
# https://quay.io/repository/observatorium/opa-openshift
9+
TEMPO_GATEWAY_OPA_VERSION ?= main-2025-06-16-ecdeca0
810
OAUTH_PROXY_VERSION=4.14
911

1012
MIN_KUBERNETES_VERSION ?= 1.25.0

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

Lines changed: 9 additions & 9 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.16.0
77-
createdAt: "2025-06-26T09:20:27Z"
77+
createdAt: "2025-07-01T15:55:31Z"
7878
description: Create and manage deployments of Tempo, a high-scale distributed
7979
tracing backend.
8080
operatorframework.io/cluster-monitoring: "true"
@@ -1555,15 +1555,15 @@ spec:
15551555
- --config=controller_manager_config.yaml
15561556
env:
15571557
- name: RELATED_IMAGE_TEMPO
1558-
value: docker.io/grafana/tempo:2.7.2
1558+
value: docker.io/grafana/tempo:2.8.1
15591559
- name: RELATED_IMAGE_JAEGER_QUERY
15601560
value: docker.io/jaegertracing/jaeger-query:1.68.0
15611561
- name: RELATED_IMAGE_TEMPO_QUERY
1562-
value: docker.io/grafana/tempo-query:2.7.2
1562+
value: docker.io/grafana/tempo-query:2.8.1
15631563
- name: RELATED_IMAGE_TEMPO_GATEWAY
1564-
value: quay.io/observatorium/api:main-2025-05-28-ebbaf26
1564+
value: quay.io/observatorium/api:main-2025-06-16-5265085
15651565
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
1566-
value: quay.io/observatorium/opa-openshift:main-2025-05-26-4860be8
1566+
value: quay.io/observatorium/opa-openshift:main-2025-06-16-ecdeca0
15671567
- name: RELATED_IMAGE_OAUTH_PROXY
15681568
value: quay.io/openshift/origin-oauth-proxy:4.14
15691569
image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.16.0
@@ -1684,15 +1684,15 @@ spec:
16841684
provider:
16851685
name: Grafana Tempo Operator SIG
16861686
relatedImages:
1687-
- image: docker.io/grafana/tempo:2.7.2
1687+
- image: docker.io/grafana/tempo:2.8.1
16881688
name: tempo
16891689
- image: docker.io/jaegertracing/jaeger-query:1.68.0
16901690
name: jaeger-query
1691-
- image: docker.io/grafana/tempo-query:2.7.2
1691+
- image: docker.io/grafana/tempo-query:2.8.1
16921692
name: tempo-query
1693-
- image: quay.io/observatorium/api:main-2025-05-28-ebbaf26
1693+
- image: quay.io/observatorium/api:main-2025-06-16-5265085
16941694
name: tempo-gateway
1695-
- image: quay.io/observatorium/opa-openshift:main-2025-05-26-4860be8
1695+
- image: quay.io/observatorium/opa-openshift:main-2025-06-16-ecdeca0
16961696
name: tempo-gateway-opa
16971697
- image: quay.io/openshift/origin-oauth-proxy:4.14
16981698
name: oauth-proxy

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

Lines changed: 9 additions & 9 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.16.0
77-
createdAt: "2025-06-26T09:20:26Z"
77+
createdAt: "2025-07-01T15:55:30Z"
7878
description: Create and manage deployments of Tempo, a high-scale distributed
7979
tracing backend.
8080
operatorframework.io/cluster-monitoring: "true"
@@ -1566,15 +1566,15 @@ spec:
15661566
- --metrics-tls-cert-dir=/var/run/tls/server/
15671567
env:
15681568
- name: RELATED_IMAGE_TEMPO
1569-
value: docker.io/grafana/tempo:2.7.2
1569+
value: docker.io/grafana/tempo:2.8.1
15701570
- name: RELATED_IMAGE_JAEGER_QUERY
15711571
value: docker.io/jaegertracing/jaeger-query:1.68.0
15721572
- name: RELATED_IMAGE_TEMPO_QUERY
1573-
value: docker.io/grafana/tempo-query:2.7.2
1573+
value: docker.io/grafana/tempo-query:2.8.1
15741574
- name: RELATED_IMAGE_TEMPO_GATEWAY
1575-
value: quay.io/observatorium/api:main-2025-05-28-ebbaf26
1575+
value: quay.io/observatorium/api:main-2025-06-16-5265085
15761576
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
1577-
value: quay.io/observatorium/opa-openshift:main-2025-05-26-4860be8
1577+
value: quay.io/observatorium/opa-openshift:main-2025-06-16-ecdeca0
15781578
- name: RELATED_IMAGE_OAUTH_PROXY
15791579
value: quay.io/openshift/origin-oauth-proxy:4.14
15801580
image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.16.0
@@ -1701,15 +1701,15 @@ spec:
17011701
provider:
17021702
name: Grafana Tempo Operator SIG
17031703
relatedImages:
1704-
- image: docker.io/grafana/tempo:2.7.2
1704+
- image: docker.io/grafana/tempo:2.8.1
17051705
name: tempo
17061706
- image: docker.io/jaegertracing/jaeger-query:1.68.0
17071707
name: jaeger-query
1708-
- image: docker.io/grafana/tempo-query:2.7.2
1708+
- image: docker.io/grafana/tempo-query:2.8.1
17091709
name: tempo-query
1710-
- image: quay.io/observatorium/api:main-2025-05-28-ebbaf26
1710+
- image: quay.io/observatorium/api:main-2025-06-16-5265085
17111711
name: tempo-gateway
1712-
- image: quay.io/observatorium/opa-openshift:main-2025-05-26-4860be8
1712+
- image: quay.io/observatorium/opa-openshift:main-2025-06-16-ecdeca0
17131713
name: tempo-gateway-opa
17141714
- image: quay.io/openshift/origin-oauth-proxy:4.14
17151715
name: oauth-proxy

‎config/manager/manager.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ spec:
4040
- --leader-elect
4141
env:
4242
- name: RELATED_IMAGE_TEMPO
43-
value: docker.io/grafana/tempo:2.7.2
43+
value: docker.io/grafana/tempo:2.8.1
4444
- name: RELATED_IMAGE_JAEGER_QUERY
4545
value: docker.io/jaegertracing/jaeger-query:1.68.0
4646
- name: RELATED_IMAGE_TEMPO_QUERY
47-
value: docker.io/grafana/tempo-query:2.7.2
47+
value: docker.io/grafana/tempo-query:2.8.1
4848
- name: RELATED_IMAGE_TEMPO_GATEWAY
49-
value: quay.io/observatorium/api:main-2025-05-28-ebbaf26
49+
value: quay.io/observatorium/api:main-2025-06-16-5265085
5050
- name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
51-
value: quay.io/observatorium/opa-openshift:main-2025-05-26-4860be8
51+
value: quay.io/observatorium/opa-openshift:main-2025-06-16-ecdeca0
5252
- name: RELATED_IMAGE_OAUTH_PROXY
5353
value: quay.io/openshift/origin-oauth-proxy:4.14
5454
securityContext:

‎internal/manifests/config/build.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,9 @@ func fromSearchSpecToOptions(spec v1alpha1.SearchSpec) searchOptions {
240240
options := searchOptions{
241241
// Those are recommended defaults taken from: https://grafana.com/docs/tempo/latest/operations/backend_search/
242242
// some of them could depend on the volumen and retention of the data, need to figure out how to set it.
243-
ExternalHedgeRequestsUpTo: 2,
244-
ConcurrentJobs: 2000,
245-
MaxConcurrentQueries: 20,
246-
ExternalHedgeRequestsAt: "8s",
247-
MaxResultLimit: spec.MaxResultLimit,
243+
ConcurrentJobs: 2000,
244+
MaxConcurrentQueries: 20,
245+
MaxResultLimit: spec.MaxResultLimit,
248246
// If not specified, will be zero, means disable limit by default
249247
MaxDuration: spec.MaxDuration.Duration.String(),
250248
}

0 commit comments

Comments
 (0)