diff --git a/Makefile b/Makefile index 81511b88e..fe152e9c0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ OPERATOR_VERSION ?= 0.13.0 TEMPO_VERSION ?= 2.5.0 TEMPO_QUERY_VERSION ?= main-2999520 -JAEGER_QUERY_VERSION ?= 1.60 +# TODO change this to a release version. This has https://github.com/jaegertracing/jaeger/commit/d6631f5f2370cfc3a49efce312491031fb387600 +JAEGER_QUERY_VERSION ?= d6631f5f2370cfc3a49efce312491031fb387600 TEMPO_GATEWAY_VERSION ?= main-2024-08-05-11d0d94 TEMPO_GATEWAY_OPA_VERSION ?= main-2024-04-29-914c13f OAUTH_PROXY_VERSION=4.12 @@ -11,7 +12,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:$(JAEGER_QUERY_VERSION) +JAEGER_QUERY_IMAGE ?= docker.io/jaegertracing/jaeger-query-snapshot:$(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) diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index bd74cacaf..b623f6b16 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,7 +74,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 - createdAt: "2024-10-03T09:33:24Z" + createdAt: "2024-10-04T12:51:28Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -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:1.60 + value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600 - name: RELATED_IMAGE_TEMPO_QUERY value: docker.io/grafana/tempo-query:main-2999520 - name: RELATED_IMAGE_TEMPO_GATEWAY @@ -1574,7 +1574,7 @@ spec: relatedImages: - image: docker.io/grafana/tempo:2.5.0 name: tempo - - image: docker.io/jaegertracing/jaeger-query:1.60 + - image: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600 name: jaeger-query - image: docker.io/grafana/tempo-query:main-2999520 name: tempo-query diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index 9406e26b4..1d9f1007e 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -74,7 +74,7 @@ metadata: capabilities: Deep Insights categories: Logging & Tracing,Monitoring containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 - createdAt: "2024-10-03T09:33:23Z" + createdAt: "2024-10-04T12:51:27Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -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:1.60 + value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600 - name: RELATED_IMAGE_TEMPO_QUERY value: docker.io/grafana/tempo-query:main-2999520 - name: RELATED_IMAGE_TEMPO_GATEWAY @@ -1595,7 +1595,7 @@ spec: relatedImages: - image: docker.io/grafana/tempo:2.5.0 name: tempo - - image: docker.io/jaegertracing/jaeger-query:1.60 + - image: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600 name: jaeger-query - image: docker.io/grafana/tempo-query:main-2999520 name: tempo-query diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 2131d8461..ac0263dd1 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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:1.60 + value: docker.io/jaegertracing/jaeger-query-snapshot:d6631f5f2370cfc3a49efce312491031fb387600 - name: RELATED_IMAGE_TEMPO_QUERY value: docker.io/grafana/tempo-query:main-2999520 - name: RELATED_IMAGE_TEMPO_GATEWAY