From a3b9d774874daf9a6ea096698496797761659014 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Tue, 13 Jan 2026 11:59:58 +0000 Subject: [PATCH 1/4] 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 757ebabcc97a88244263d84dff4ca21b8e19f784 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Wed, 14 Jan 2026 08:45:43 +0000 Subject: [PATCH 2/4] 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 3f0441cc23..0286aa718c 100644 --- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml +++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml @@ -54,6 +54,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 e2278e48b1d2e7131f49245229e0afb9c6fd8b90 Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Wed, 14 Jan 2026 11:29:31 +0000 Subject: [PATCH 3/4] 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 b33f0d1be2..00782c7123 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.1 +version: 2.34.2 maintainers: - name: eumel8 email: f.kloeker@telekom.de From 708fe19c9671987a6c5475639a8f1682daebf75f Mon Sep 17 00:00:00 2001 From: Claudia Watson Date: Mon, 26 Jan 2026 09:46:05 +0000 Subject: [PATCH 4/4] 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..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.35.0 +version: 2.35.1 maintainers: - name: eumel8 email: f.kloeker@telekom.de