Skip to content

[occm] Fix serviceMonitor labelSelector and remove deprecated bearerTokenFile auth #3039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
claudia-lola wants to merge 5 commits into
base: master
Choose a base branch
from
+5 −5
Open

[occm] Fix serviceMonitor labelSelector and remove deprecated bearerTokenFile auth #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3b9d77
servicemonitor changes
claudia-lola Jan 13, 2026
757ebab
add always allow path "/metrics"
claudia-lola Jan 14, 2026
e2278e4
chart version bump
claudia-lola Jan 14, 2026
cfe671c
Merge branch 'master' into claudia-occm
claudia-lola Jan 26, 2026
708fe19
chart version bump
claudia-lola Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/openstack-cloud-controller-manager/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions charts/openstack-cloud-controller-manager/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 3 additions & 4 deletions charts/openstack-cloud-controller-manager/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -15,14 +15,13 @@ metadata:
{{- end }}
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
- interval: 30s
port: http
scheme: https
tlsConfig:
insecureSkipVerify: true
jobLabel: component
selector:
matchLabels:
{{- include "occm.controllermanager.matchLabels" . | nindent 6 }}
{{- include "common.labels.standard" . | nindent 6 }}
{{- end }}