From 85f3258127d245df42fd81e9bd2314771291b575 Mon Sep 17 00:00:00 2001 From: Benedikt Bongartz Date: Mon, 14 Oct 2024 22:35:48 +0200 Subject: [PATCH] switch to grafana tempo-query image Signed-off-by: Benedikt Bongartz --- Makefile | 4 ++-- .../manifests/tempo-operator.clusterserviceversion.yaml | 4 ++-- .../manifests/tempo-operator.clusterserviceversion.yaml | 4 ++-- config/manager/manager.yaml | 2 +- internal/manifests/config/tempo-query.yaml | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5a6c443e8..f31e41edf 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ OPERATOR_VERSION ?= 0.13.0 TEMPO_VERSION ?= 2.6.0 JAEGER_QUERY_VERSION ?= 1.62.0 -TEMPO_QUERY_VERSION ?= tempo-query-server-tls-1ef95ac +TEMPO_QUERY_VERSION ?= main-a2f70c9 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 ?= ghcr.io/frzifus/tempo-query:$(TEMPO_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) 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 index fd29d8c33..85f528cdc 100644 --- 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: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac + value: docker.io/grafana/tempo-query:main-a2f70c9 - 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: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac + - image: docker.io/grafana/tempo-query:main-a2f70c9 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 index 4799337f1..0f002d0b4 100644 --- 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: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac + value: docker.io/grafana/tempo-query:main-a2f70c9 - 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: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac + - image: docker.io/grafana/tempo-query:main-a2f70c9 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 index 47d4c610f..e077f8de6 100644 --- 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: ghcr.io/frzifus/tempo-query:tempo-query-server-tls-1ef95ac + value: docker.io/grafana/tempo-query:main-a2f70c9 - 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 index 5fc80b2eb..924007a77 100644 --- a/internal/manifests/config/tempo-query.yaml +++ b/internal/manifests/config/tempo-query.yaml @@ -1,3 +1,4 @@ +# bind to 0.0.0.0 to support healthchecks using $POD_IP. address: 0.0.0.0:7777 backend: localhost:{{ .HTTPPort }} tenant_header_key: {{ .TenantHeader }}