Prepare Release 0.11.1 (#974)

Co-authored-by: pavolloffay <[email protected]>
grafana · Jul 8, 2024 · e122de4 · e122de4
1 parent 406ae75
commit e122de4
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 55 deletions.
diff --git a/.chloggen/client-auth.yaml b/.chloggen/client-auth.yaml
diff --git a/.chloggen/sa_fix.yaml b/.chloggen/sa_fix.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,26 @@ Changes by Version
 
 <!-- next version -->
 
+## 0.11.1
+
+### 🧰 Bug fixes 🧰
+
+- `operator`: Avoid certificate prompt when accessing UI via gateway (#967)
+- `operator`: Modify SA annotations managed by the operator, preserve others. (#970)
+  This prevents other controllers that modified the SA from create an infinite loop where the other controller modifies something,
+  and tempo-operator removes it, the other controller detect the changes and add its and so on and so on.
+
+  This is specific for OpenShift case, where the openshift-controller-manager annotates the SA with
+  openshift.io/internal-registry-pull-secret-ref.
+
+  See https://github.com/openshift/openshift-controller-manager/pull/288/ and 
+  https://docs.openshift.com/container-platform/4.16/release_notes/ocp-4-16-release-notes.html section about 
+  "Legacy service account API token secrets are no longer generated for each service account"
+
+
+### Components
+- Tempo: [v2.5.0](https://github.com/grafana/tempo/releases/tag/v2.5.0)
+
 ## 0.11.0
 
 ### 🛑 Breaking changes 🛑

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # Current Operator version
-OPERATOR_VERSION ?= 0.11.0
+OPERATOR_VERSION ?= 0.11.1
 TEMPO_VERSION ?= 2.5.0
 TEMPO_QUERY_VERSION ?= 2.5.0
 TEMPO_GATEWAY_VERSION ?= main-2024-05-29-ca8d2de

diff --git 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.11.0
-    createdAt: "2024-07-04T13:04:01Z"
+    containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
+    createdAt: "2024-07-08T10:12:34Z"
     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.11.0
+  name: tempo-operator.v0.11.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1391,7 +1391,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.11.0
+                image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1539,7 +1539,7 @@ spec:
     name: tempo-gateway-opa
   - image: quay.io/openshift/origin-oauth-proxy:4.12
     name: oauth-proxy
-  version: 0.11.0
+  version: 0.11.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git 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.11.0
-    createdAt: "2024-07-04T13:03:59Z"
+    containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
+    createdAt: "2024-07-08T10:12:32Z"
     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.11.0
+  name: tempo-operator.v0.11.1
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -1401,7 +1401,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.11.0
+                image: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -1560,7 +1560,7 @@ spec:
     name: tempo-gateway-opa
   - image: quay.io/openshift/origin-oauth-proxy:4.12
     name: oauth-proxy
-  version: 0.11.0
+  version: 0.11.1
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git 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.11.0
+  newTag: v0.11.1
diff --git 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.11.0
+    containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.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
@@ -5,7 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Deep Insights
     categories: Logging & Tracing,Monitoring
-    containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.0
+    containerImage: ghcr.io/grafana/tempo-operator/tempo-operator:v0.11.1
     description: Create and manage deployments of Tempo, a high-scale distributed
       tracing backend.
     operatorframework.io/cluster-monitoring: "true"