From 45b75404fbfe49636b0d2b711f3dd49711ba764f Mon Sep 17 00:00:00 2001 From: tempooperatorbot <150731540+tempooperatorbot@users.noreply.github.com> Date: Wed, 6 Nov 2024 11:19:27 -0600 Subject: [PATCH] Prepare release v0.14.1 (#1084) * Prepare Release 0.14.1 * clarify changelog entry Signed-off-by: Andreas Gerstmayr --------- Signed-off-by: Andreas Gerstmayr Co-authored-by: andreasgerstmayr Co-authored-by: Andreas Gerstmayr --- .chloggen/internal_tracing.yaml | 16 ---------------- .chloggen/jaeger_ui_routes.yaml | 17 ----------------- CHANGELOG.md | 12 ++++++++++++ Makefile | 2 +- .../tempo-operator.clusterserviceversion.yaml | 10 +++++----- .../tempo-operator.clusterserviceversion.yaml | 10 +++++----- config/manager/kustomization.yaml | 2 +- .../tempo-operator.clusterserviceversion.yaml | 2 +- .../tempo-operator.clusterserviceversion.yaml | 2 +- 9 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 .chloggen/internal_tracing.yaml delete mode 100644 .chloggen/jaeger_ui_routes.yaml diff --git a/.chloggen/internal_tracing.yaml b/.chloggen/internal_tracing.yaml deleted file mode 100644 index 593628228..000000000 --- a/.chloggen/internal_tracing.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# 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: Fix enabling `.spec.observability.tracing` with multi-tenancy on OpenShift - -# One or more tracking issues related to the change -issues: [1081] - -# (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/.chloggen/jaeger_ui_routes.yaml b/.chloggen/jaeger_ui_routes.yaml deleted file mode 100644 index 27c4fd8db..000000000 --- a/.chloggen/jaeger_ui_routes.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# 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: Register missing Jaeger UI routes - -# One or more tracking issues related to the change -issues: [1082] - -# (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: | - Without these routes, hitting refresh on the trace detail, system architecture or monitor page of Jaeger UI results in a 404. diff --git a/CHANGELOG.md b/CHANGELOG.md index 650179799..58c6e2f61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ Changes by Version +## 0.14.1 + +### 🧰 Bug fixes 🧰 + +- `tempostack`: Fix enabling `.spec.observability.tracing` with multi-tenancy on OpenShift (#1081) +- `tempostack, tempomonolithic`: Register missing Jaeger UI routes (#1082) + Without these routes, hitting refresh on the trace detail, system architecture or monitor page of Jaeger UI results in a 404 when multi-tenancy is enabled. + + +### Components +- Tempo: [v2.6.1](https://github.com/grafana/tempo/releases/tag/v2.6.1) + ## 0.14.0 ### 🛑 Breaking changes 🛑 diff --git a/Makefile b/Makefile index 621e7d238..70464e8cc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -OPERATOR_VERSION ?= 0.14.0 +OPERATOR_VERSION ?= 0.14.1 TEMPO_VERSION ?= 2.6.1 JAEGER_QUERY_VERSION ?= 1.62.0 TEMPO_QUERY_VERSION ?= 2.6.1 diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index b2296cf79..2c9f15a27 100644 --- a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml @@ -73,8 +73,8 @@ metadata: ] capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 - createdAt: "2024-11-06T09:57:13Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + createdAt: "2024-11-06T14:25:14Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -83,7 +83,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.14.0 + name: tempo-operator.v0.14.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -1475,7 +1475,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863 - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.14 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 livenessProbe: httpGet: path: /healthz @@ -1625,7 +1625,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.14 name: oauth-proxy - version: 0.14.0 + version: 0.14.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index 173c11d75..b62e83a47 100644 --- a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml @@ -73,8 +73,8 @@ metadata: ] capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 - createdAt: "2024-11-06T09:57:12Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 + createdAt: "2024-11-06T14:25:12Z" description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" @@ -83,7 +83,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/tempo-operator support: Grafana Tempo Operator SIG - name: tempo-operator.v0.14.0 + name: tempo-operator.v0.14.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -1485,7 +1485,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-10-09-7237863 - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.14 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 livenessProbe: httpGet: path: /healthz @@ -1646,7 +1646,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.14 name: oauth-proxy - version: 0.14.0 + version: 0.14.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 220bacf10..8f2eef0fd 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,4 +9,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/grafana/tempo-operator/tempo-operator - newTag: v0.14.0 + newTag: v0.14.1 diff --git a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml index 5a934c3c8..c717d3c71 100644 --- a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml +++ b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true" diff --git a/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml index 7e6fad297..244cef7a2 100644 --- a/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml +++ b/config/manifests/openshift/bases/tempo-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Deep Insights categories: Logging & Tracing,Monitoring - containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.0 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.14.1 description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true"