Skip to content

Commit cfe671c

Browse files
authored
Merge branch 'master' into claudia-occm
2 parents e2278e4 + a031201 commit cfe671c

32 files changed

Lines changed: 268 additions & 121 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.5-bookw
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images
29-
ARG ALPINE_IMAGE=alpine:3.22.1
29+
ARG ALPINE_IMAGE=alpine:3.23.2
3030

3131
# cinder-csi-plugin uses Debian as a base image
3232
ARG DEBIAN_IMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.6

charts/cinder-csi-plugin/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
2-
appVersion: v1.34.1
2+
appVersion: v1.35.0
33
description: Cinder CSI Chart for OpenStack
44
name: openstack-cinder-csi
5-
version: 2.34.1
5+
version: 2.35.0
66
home: https://github.com/kubernetes/cloud-provider-openstack
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
88
maintainers:

charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ spec:
2323
serviceAccount: csi-cinder-node-sa
2424
hostNetwork: true
2525
dnsPolicy: {{ .Values.csi.plugin.nodePlugin.dnsPolicy }}
26+
securityContext:
27+
{{- toYaml .Values.csi.plugin.nodePlugin.podSecurityContext | nindent 8 }}
2628
containers:
2729
- name: node-driver-registrar
2830
securityContext:

charts/cinder-csi-plugin/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ csi:
2525
snapshotter:
2626
image:
2727
repository: registry.k8s.io/sig-storage/csi-snapshotter
28-
tag: v8.3.0
28+
tag: v8.4.0
2929
pullPolicy: IfNotPresent
3030
resources: {}
3131
extraArgs: {}

charts/manila-csi-plugin/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
2-
appVersion: v1.34.1
2+
appVersion: v1.35.0
33
description: Manila CSI Chart for OpenStack
44
name: openstack-manila-csi
5-
version: 2.34.1
5+
version: 2.35.0
66
home: http://github.com/kubernetes/cloud-provider-openstack
77
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
88
maintainers:

charts/manila-csi-plugin/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ controllerplugin:
100100
snapshotter:
101101
image:
102102
repository: registry.k8s.io/sig-storage/csi-snapshotter
103-
tag: v8.3.0
103+
tag: v8.4.0
104104
pullPolicy: IfNotPresent
105105
resources: {}
106106
extraEnv: []

charts/openstack-cloud-controller-manager/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: v2
2-
appVersion: v1.34.1
2+
appVersion: v1.35.0
33
description: Openstack Cloud Controller Manager Helm Chart
44
icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
55
home: https://github.com/kubernetes/cloud-provider-openstack
66
name: openstack-cloud-controller-manager
7-
version: 2.34.2
7+
version: 2.35.0
88
maintainers:
99
- name: eumel8
1010
email: f.kloeker@telekom.de

charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
{{- end }}
1111
subjects:
1212
- kind: User
13-
name: system:serviceaccount:{{ .Release.Namespace }}:{{ include "occm.name" . }}
13+
name: system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccountName }}
1414
apiGroup: rbac.authorization.k8s.io
1515
roleRef:
1616
kind: ClusterRole

charts/openstack-cloud-controller-manager/templates/daemonset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ spec:
4646
containers:
4747
- name: openstack-cloud-controller-manager
4848
image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
49+
{{- with .Values.securityContext }}
50+
securityContext:
51+
{{- toYaml . | nindent 12 }}
52+
{{- end }}
4953
args:
5054
- /bin/openstack-cloud-controller-manager
5155
- --v={{ .Values.logVerbosityLevel }}

charts/openstack-cloud-controller-manager/values.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ podSecurityContext:
7474
# seccompProfile:
7575
# type: RuntimeDefault
7676

77+
# Set security settings for the controller container
78+
# For all available options, see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core
79+
securityContext: {}
80+
# securityContext:
81+
# capabilities:
82+
# drop:
83+
# - ALL
84+
# readOnlyRootFilesystem: true
85+
# allowPrivilegeEscalation: false
86+
7787
# List of controllers should be enabled.
7888
# Use '*' to enable all controllers.
7989
# Prefix a controller with '-' to disable it.

0 commit comments

Comments
 (0)