tempo-query: bump to version with separate tls settings

Signed-off-by: Benedikt Bongartz <[email protected]>
grafana · Oct 11, 2024 · d5780d9 · d5780d9
1 parent 5238c4c
commit d5780d9
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 17 deletions.
diff --git a/.chloggen/tempo-query_server-tls.yaml b/.chloggen/tempo-query_server-tls.yaml
@@ -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
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: bump tempo-query to version with separate tls settings for server and client
+
+# One or more tracking issues related to the change
+issues: [1057]
+
+# (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:
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 OPERATOR_VERSION ?= 0.13.0
 TEMPO_VERSION ?= 2.5.0
 JAEGER_QUERY_VERSION ?= 1.62.0
-TEMPO_QUERY_VERSION ?= main-1de25ca
+TEMPO_QUERY_VERSION ?= tempo-query-server-tls-1ef95ac
 TEMPO_GATEWAY_VERSION ?= main-2024-08-05-11d0d94
 TEMPO_GATEWAY_OPA_VERSION ?= main-2024-04-29-914c13f
 OAUTH_PROXY_VERSION=4.14
@@ -12,7 +12,7 @@ MIN_OPENSHIFT_VERSION ?= 4.12
 
 TEMPO_IMAGE ?= docker.io/grafana/tempo:$(TEMPO_VERSION)
 JAEGER_QUERY_IMAGE ?= docker.io/jaegertracing/jaeger-query:$(JAEGER_QUERY_VERSION)
-TEMPO_QUERY_IMAGE ?= docker.io/grafana/tempo-query:$(TEMPO_QUERY_VERSION)
+TEMPO_QUERY_IMAGE ?= ghcr.io/frzifus/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)
 MUSTGATHER_IMAGE ?= ${IMG_PREFIX}/must-gather:$(OPERATOR_VERSION)

diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml
@@ -1453,7 +1453,7 @@ spec:
                 - name: RELATED_IMAGE_JAEGER_QUERY
                   value: docker.io/jaegertracing/jaeger-query:1.62.0
                 - name: RELATED_IMAGE_TEMPO_QUERY
-                  value: docker.io/grafana/tempo-query:main-1de25ca
+                  value: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
                   value: quay.io/observatorium/api:main-2024-08-05-11d0d94
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
@@ -1602,7 +1602,7 @@ spec:
     name: tempo
   - image: docker.io/jaegertracing/jaeger-query:1.62.0
     name: jaeger-query
-  - image: docker.io/grafana/tempo-query:main-1de25ca
+  - image: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac
     name: tempo-query
   - image: quay.io/observatorium/api:main-2024-08-05-11d0d94
     name: tempo-gateway

diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml
@@ -1463,7 +1463,7 @@ spec:
                 - name: RELATED_IMAGE_JAEGER_QUERY
                   value: docker.io/jaegertracing/jaeger-query:1.62.0
                 - name: RELATED_IMAGE_TEMPO_QUERY
-                  value: docker.io/grafana/tempo-query:main-1de25ca
+                  value: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac
                 - name: RELATED_IMAGE_TEMPO_GATEWAY
                   value: quay.io/observatorium/api:main-2024-08-05-11d0d94
                 - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA
@@ -1623,7 +1623,7 @@ spec:
     name: tempo
   - image: docker.io/jaegertracing/jaeger-query:1.62.0
     name: jaeger-query
-  - image: docker.io/grafana/tempo-query:main-1de25ca
+  - image: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac
     name: tempo-query
   - image: quay.io/observatorium/api:main-2024-08-05-11d0d94
     name: tempo-gateway

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -44,7 +44,7 @@ spec:
         - name: RELATED_IMAGE_JAEGER_QUERY
           value: docker.io/jaegertracing/jaeger-query:1.62.0
         - name: RELATED_IMAGE_TEMPO_QUERY
-          value: docker.io/grafana/tempo-query:main-1de25ca
+          value: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac
         - name: RELATED_IMAGE_TEMPO_GATEWAY
           value: quay.io/observatorium/api:main-2024-08-05-11d0d94
         - name: RELATED_IMAGE_TEMPO_GATEWAY_OPA

diff --git a/internal/manifests/config/tempo-query.yaml b/internal/manifests/config/tempo-query.yaml
@@ -1,5 +1,5 @@
-address: 127.0.0.1:7777
-backend: 127.0.0.1:{{ .HTTPPort }}
+address: 0.0.0.0:7777
+backend: localhost:{{ .HTTPPort }}
 tenant_header_key: {{ .TenantHeader }}
 {{- if and .Gates.HTTPEncryption .Gateway }}
 tls_enabled: true

diff --git a/internal/manifests/monolithic/configmap.go b/internal/manifests/monolithic/configmap.go
@@ -291,8 +291,8 @@ func buildTempoConfig(opts Options) ([]byte, error) {
 
 func buildTempoQueryConfig(jaegerUISpec *v1alpha1.MonolithicJaegerUISpec) ([]byte, error) {
 	config := tempoQueryConfig{}
-	config.Address = fmt.Sprintf("127.0.0.1:%d", manifestutils.PortTempoGRPCQuery)
-	config.Backend = fmt.Sprintf("127.0.0.1:%d", manifestutils.PortHTTPServer)
+	config.Address = fmt.Sprintf("0.0.0.0:%d", manifestutils.PortTempoGRPCQuery)
+	config.Backend = fmt.Sprintf("localhost:%d", manifestutils.PortHTTPServer)
 	config.TenantHeaderKey = manifestutils.TenantHeader
 	config.ServicesQueryDuration = jaegerUISpec.ServicesQueryDuration.Duration
 	config.FindTracesConcurrentRequests = jaegerUISpec.FindTracesConcurrentRequests

diff --git a/internal/manifests/monolithic/configmap_test.go b/internal/manifests/monolithic/configmap_test.go
@@ -60,8 +60,8 @@ func TestBuildConfigMap(t *testing.T) {
 
 	require.NotNil(t, cm.Data["tempo-query.yaml"])
 	tempoQueryCfg := `
-address: 127.0.0.1:7777
-backend: 127.0.0.1:3200
+address: 0.0.0.0:7777
+backend: localhost:3200
 tenant_header_key: x-scope-orgid
 services_query_duration: 72h0m0s
 find_traces_concurrent_requests: 22

diff --git a/tests/e2e/monolithic-extraconfig/install-tempo-assert.yaml b/tests/e2e/monolithic-extraconfig/install-tempo-assert.yaml
@@ -77,8 +77,8 @@ spec:
 apiVersion: v1
 data:
   tempo-query.yaml: |
-    address: 127.0.0.1:7777
-    backend: 127.0.0.1:3200
+    address: 0.0.0.0:7777
+    backend: localhost:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
     find_traces_concurrent_requests: 2

diff --git a/tests/e2e/tempostack-extraconfig/install-tempostack-assert.yaml b/tests/e2e/tempostack-extraconfig/install-tempostack-assert.yaml
@@ -476,8 +476,8 @@ data:
     usage_report:
         reporting_enabled: false
   tempo-query.yaml: |
-    address: 127.0.0.1:7777
-    backend: 127.0.0.1:3200
+    address: 0.0.0.0:7777
+    backend: localhost:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
     find_traces_concurrent_requests: 2