diff --git a/.chloggen/bug_1016.yaml b/.chloggen/bug_1016.yaml deleted file mode 100755 index 069fd2710..000000000 --- a/.chloggen/bug_1016.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: operator - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix service account for monitoring-view cluster role binding when using oauth proxy. - -# One or more tracking issues related to the change -issues: [1016] - -# (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/fix-annotations-gateway-route.yaml b/.chloggen/fix-annotations-gateway-route.yaml deleted file mode 100755 index 18f87d262..000000000 --- a/.chloggen/fix-annotations-gateway-route.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 setting annotations for Gateway route - -# One or more tracking issues related to the change -issues: [1014] - -# (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/fix-oauth-reconcile.yaml b/.chloggen/fix-oauth-reconcile.yaml deleted file mode 100755 index 544813337..000000000 --- a/.chloggen/fix-oauth-reconcile.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, tempomonolithic - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fix infinite reconciliation on OpenShift when route for Jaeger UI is enabled. - -# One or more tracking issues related to the change -issues: [1018] - -# (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/metrics-cleanup.yaml b/.chloggen/metrics-cleanup.yaml deleted file mode 100755 index a95da2b80..000000000 --- a/.chloggen/metrics-cleanup.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, tempomonolithic - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Cleanup instance metrics from the operator on instance delete action. - -# One or more tracking issues related to the change -issues: [1019] - -# (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/CHANGELOG.md b/CHANGELOG.md index 5f306c648..f53be2782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ Changes by Version +## 0.13.0 + +### 🧰 Bug fixes 🧰 + +- `operator`: Fix service account for monitoring-view cluster role binding when using oauth proxy. (#1016) +- `tempostack`: Fix setting annotations for Gateway route (#1014) +- `tempostack, tempomonolithic`: Fix infinite reconciliation on OpenShift when route for Jaeger UI is enabled. (#1018) +- `tempostack, tempomonolithic`: Cleanup instance metrics from the operator on instance delete action. (#1019) + +### Components +- Tempo: [v2.5.0](https://github.com/grafana/tempo/releases/tag/v2.5.0) + ## 0.12.0 ### 💡 Enhancements 💡 diff --git a/Makefile b/Makefile index 893685790..3021bbe3f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -OPERATOR_VERSION ?= 0.12.0 +OPERATOR_VERSION ?= 0.13.0 TEMPO_VERSION ?= 2.5.0 TEMPO_QUERY_VERSION ?= 2.5.0 TEMPO_GATEWAY_VERSION ?= main-2024-08-05-11d0d94 diff --git a/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/community/manifests/tempo-operator.clusterserviceversion.yaml index bdbfcae1d..7c85dbec8 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.12.0 - createdAt: "2024-08-27T16:10:18Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 + createdAt: "2024-08-28T09:48:15Z" 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.12.0 + name: tempo-operator.v0.13.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1400,7 +1400,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-04-29-914c13f - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.12 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.12.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 livenessProbe: httpGet: path: /healthz @@ -1548,7 +1548,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.12 name: oauth-proxy - version: 0.12.0 + version: 0.13.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/tempo-operator.clusterserviceversion.yaml index 35f8486f6..fff083555 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.12.0 - createdAt: "2024-08-27T16:10:16Z" + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 + createdAt: "2024-08-28T09:48:13Z" 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.12.0 + name: tempo-operator.v0.13.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1410,7 +1410,7 @@ spec: value: quay.io/observatorium/opa-openshift:main-2024-04-29-914c13f - name: RELATED_IMAGE_OAUTH_PROXY value: quay.io/openshift/origin-oauth-proxy:4.12 - image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.12.0 + image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 livenessProbe: httpGet: path: /healthz @@ -1569,7 +1569,7 @@ spec: name: tempo-gateway-opa - image: quay.io/openshift/origin-oauth-proxy:4.12 name: oauth-proxy - version: 0.12.0 + version: 0.13.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4d9c85d72..d91a4b8a1 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.12.0 + newTag: v0.13.0 diff --git a/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml b/config/manifests/community/bases/tempo-operator.clusterserviceversion.yaml index bf1b1ba8b..a883fe711 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.12.0 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 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 85620452c..098df33f8 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.12.0 + containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.13.0 description: Create and manage deployments of Tempo, a high-scale distributed tracing backend. operatorframework.io/cluster-monitoring: "true"