From 596b5dcb990f21be6ac6fe537ebf89e0f8370342 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 13 Jan 2026 11:59:58 +0000 Subject: [PATCH 1/9] servicemonitor changes --- .../templates/servicemonitor.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml b/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml index c1d80f127c..0e5820b770 100644 --- a/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml +++ b/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml @@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "occm.name" . }} - labels: + labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.serviceMonitor.additionalLabels }} {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }} @@ -15,8 +15,7 @@ metadata: {{- end }} spec: endpoints: - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - interval: 30s + - interval: 30s port: http scheme: https tlsConfig: @@ -24,5 +23,5 @@ spec: jobLabel: component selector: matchLabels: - {{- include "occm.controllermanager.matchLabels" . | nindent 6 }} + {{- include "common.labels.standard" . | nindent 6 }} {{- end }} From 57d51dae15454e4d1f336f64bee9cbba59116119 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Wed, 14 Jan 2026 08:45:43 +0000 Subject: [PATCH 2/9] add always allow path "/metrics" --- .../openstack-cloud-controller-manager/templates/daemonset.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml index 40f98ea3f8..0057906376 100644 --- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml +++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml @@ -58,6 +58,7 @@ spec: - --cloud-provider=openstack - --use-service-account-credentials=false - --controllers={{- trimAll "," (include "occm.enabledControllers" . ) -}} + - --authorization-always-allow-paths="/metrics" {{- if .Values.serviceMonitor.enabled }} - --bind-address=0.0.0.0 {{- else }} From 8f365839b39f6dbb65a08a69a9e498745694585a Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Wed, 14 Jan 2026 11:29:31 +0000 Subject: [PATCH 3/9] chart version bump --- charts/openstack-cloud-controller-manager/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml index 3f083bf687..7340802408 100644 --- a/charts/openstack-cloud-controller-manager/Chart.yaml +++ b/charts/openstack-cloud-controller-manager/Chart.yaml @@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png home: https://github.com/kubernetes/cloud-provider-openstack name: openstack-cloud-controller-manager -version: 2.35.0 +version: 2.34.2 maintainers: - name: eumel8 email: f.kloeker@telekom.de From e6d88429df975523402553ece11a5f06421f6ae4 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Mon, 26 Jan 2026 09:46:05 +0000 Subject: [PATCH 4/9] chart version bump --- charts/openstack-cloud-controller-manager/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml index 7340802408..95ed5a8e4c 100644 --- a/charts/openstack-cloud-controller-manager/Chart.yaml +++ b/charts/openstack-cloud-controller-manager/Chart.yaml @@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png home: https://github.com/kubernetes/cloud-provider-openstack name: openstack-cloud-controller-manager -version: 2.34.2 +version: 2.35.1 maintainers: - name: eumel8 email: f.kloeker@telekom.de From f2ff5089668664880679becfb49577627b8c9973 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 21 Jul 2026 08:37:49 +0100 Subject: [PATCH 5/9] Fix indentation for labels in servicemonitor.yaml --- .../templates/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml b/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml index 0e5820b770..19c2b8dcb3 100644 --- a/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml +++ b/charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml @@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "occm.name" . }} - labels: + labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.serviceMonitor.additionalLabels }} {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }} From 0f9e1d50f453ba7c92806c5aa813f51ec324d2ab Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 21 Jul 2026 08:40:38 +0100 Subject: [PATCH 6/9] Move flag placement to inside serviceMonitor.enabled block Co-authored-by: Jihyun Hur --- .../templates/daemonset.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml index 0057906376..9aa6df011a 100644 --- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml +++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml @@ -58,7 +58,12 @@ spec: - --cloud-provider=openstack - --use-service-account-credentials=false - --controllers={{- trimAll "," (include "occm.enabledControllers" . ) -}} - - --authorization-always-allow-paths="/metrics" +{{- if .Values.serviceMonitor.enabled }} +- --authorization-always-allow-paths=/metrics +- --bind-address=0.0.0.0 +{{- else }} +- --bind-address=127.0.0.1 +{{- end }} {{- if .Values.serviceMonitor.enabled }} - --bind-address=0.0.0.0 {{- else }} From 14dae442016ce444884cd665f1539ae175486a19 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 21 Jul 2026 13:45:03 +0100 Subject: [PATCH 7/9] Fix indentation and duplication --- .../templates/daemonset.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml index 9aa6df011a..37cc0158fd 100644 --- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml +++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml @@ -58,13 +58,8 @@ spec: - --cloud-provider=openstack - --use-service-account-credentials=false - --controllers={{- trimAll "," (include "occm.enabledControllers" . ) -}} -{{- if .Values.serviceMonitor.enabled }} -- --authorization-always-allow-paths=/metrics -- --bind-address=0.0.0.0 -{{- else }} -- --bind-address=127.0.0.1 -{{- end }} {{- if .Values.serviceMonitor.enabled }} + - --authorization-always-allow-paths=/metrics - --bind-address=0.0.0.0 {{- else }} - --bind-address=127.0.0.1 From 857b6810cb97359d8f5ed3903d03577ae540fa88 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 28 Jul 2026 13:25:45 +0100 Subject: [PATCH 8/9] Chart version bump and rebase --- charts/openstack-cloud-controller-manager/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml index cb52ebcfdb..181a21b8dd 100644 --- a/charts/openstack-cloud-controller-manager/Chart.yaml +++ b/charts/openstack-cloud-controller-manager/Chart.yaml @@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png home: https://github.com/kubernetes/cloud-provider-openstack name: openstack-cloud-controller-manager -version: 2.36.1 +version: 2.36.2 maintainers: - name: eumel8 email: f.kloeker@telekom.de From 6564b35b2c20f14cbe94a4a61984d14960f34f12 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Fri, 28 Aug 2026 09:33:00 +0100 Subject: [PATCH 9/9] Chart version bump --- charts/openstack-cloud-controller-manager/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml index 181a21b8dd..ee3ea8c9ce 100644 --- a/charts/openstack-cloud-controller-manager/Chart.yaml +++ b/charts/openstack-cloud-controller-manager/Chart.yaml @@ -4,7 +4,7 @@ description: Openstack Cloud Controller Manager Helm Chart icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png home: https://github.com/kubernetes/cloud-provider-openstack name: openstack-cloud-controller-manager -version: 2.36.2 +version: 2.36.3 maintainers: - name: eumel8 email: f.kloeker@telekom.de