temp chart release

charts/cinder-csi-plugin/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.29.0
 description: Cinder CSI Chart for OpenStack
 name: openstack-cinder-csi
-version: 2.29.0
+version: 2.29.1
 home: https://github.com/kubernetes/cloud-provider-openstack
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 maintainers:

charts/cinder-csi-plugin/templates/cinder-csi-driver.yaml

@@ -2,6 +2,10 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
   name: cinder.csi.openstack.org
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   attachRequired: true
   podInfoOnMount: true

charts/cinder-csi-plugin/templates/controllerplugin-deployment.yaml

@@ -25,10 +25,16 @@ spec:
     metadata:
       labels:
         {{- include "cinder-csi.controllerplugin.labels" . | nindent 8 }}
+        {{- with .Values.csi.plugin.controllerPlugin.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- with .Values.commonAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.csi.plugin.controllerPlugin.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccount: csi-cinder-controller-sa
       securityContext:

charts/cinder-csi-plugin/templates/controllerplugin-rbac.yaml

@@ -6,11 +6,19 @@ kind: ServiceAccount
 metadata:
   name: csi-cinder-controller-sa
   namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-attacher-role
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -32,6 +40,10 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-attacher-binding
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -46,6 +58,10 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-provisioner-role
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -79,6 +95,10 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-provisioner-binding
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -93,6 +113,10 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-snapshotter-role
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -121,6 +145,10 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-snapshotter-binding
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa
@@ -134,6 +162,10 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-resizer-role
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   # The following rule should be uncommented for plugins that require secrets
   # for provisioning.
@@ -163,6 +195,10 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-resizer-binding
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-controller-sa

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

@@ -17,10 +17,16 @@ spec:
     metadata:
       labels:
         {{- include "cinder-csi.nodeplugin.labels" . | nindent 8 }}
+        {{- with .Values.csi.plugin.nodePlugin.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         {{- with .Values.commonAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.csi.plugin.nodePlugin.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccount: csi-cinder-node-sa
       hostNetwork: true

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

@@ -3,11 +3,19 @@ kind: ServiceAccount
 metadata:
   name: csi-cinder-node-sa
   namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-nodeplugin-role
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -18,6 +26,10 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-nodeplugin-binding
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 subjects:
   - kind: ServiceAccount
     name: csi-cinder-node-sa

charts/cinder-csi-plugin/templates/secret.yaml

@@ -4,6 +4,10 @@ kind: Secret
 metadata:
   name: {{ .Values.secret.name }}
   namespace: {{ .Release.Namespace }}
+  annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 type: Opaque
 stringData:
   {{ .Values.secret.data | toYaml | trimSuffix "\n" | nindent 2 }}

charts/cinder-csi-plugin/templates/storageclass.yaml

@@ -3,10 +3,13 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: csi-cinder-sc-delete
-  {{- if .Values.storageClass.delete.isDefault }}
   annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.storageClass.delete.isDefault }}
     storageclass.kubernetes.io/is-default-class: "true"
-  {{- end }}
+    {{- end }}
 provisioner: cinder.csi.openstack.org
 reclaimPolicy: Delete
 allowVolumeExpansion: {{ .Values.storageClass.delete.allowVolumeExpansion }}
@@ -15,10 +18,13 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: csi-cinder-sc-retain
-  {{- if .Values.storageClass.retain.isDefault }}
   annotations:
+    {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- if .Values.storageClass.retain.isDefault }}
     storageclass.kubernetes.io/is-default-class: "true"
-  {{- end }}
+    {{- end }}
 provisioner: cinder.csi.openstack.org
 reclaimPolicy: Retain
 allowVolumeExpansion: {{ .Values.storageClass.retain.allowVolumeExpansion }}

charts/cinder-csi-plugin/values.yaml

@@ -70,6 +70,10 @@ csi:
         readOnly: true
     nodePlugin:
       dnsPolicy: ClusterFirstWithHostNet
+      # Optional additional annotations to add to the nodePlugin Pods.
+      podAnnotations: {}
+      # Optional additional labels to add to the nodePlugin Pods.
+      podLabels: {}
       podSecurityContext: {}
       securityContext: {}
         # capabilities:
@@ -100,6 +104,10 @@ csi:
           # maxSurge is the maximum number of pods that can be
           # created over the desired number of pods.
           maxSurge: 1
+      # Optional additional annotations to add to the controllerPlugin Pods.
+      podAnnotations: {}
+      # Optional additional labels to add to the controllerPlugin Pods.
+      podLabels: {}
       podSecurityContext: {}
         # runAsNonRoot: true
         # runAsUser: 65532
@@ -196,5 +204,5 @@ priorityClassName: ""
 imagePullSecrets: []
 # - name: my-imagepull-secret
 
-# add annotations to all pods
+## Annotations to apply to all resources
 commonAnnotations: {}

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.29.0
+version: 2.29.1
 maintainers:
   - name: eumel8
     email: [email protected]

charts/openstack-cloud-controller-manager/templates/_helpers.tpl

@@ -43,6 +43,9 @@ component: controllermanager
 {{- define "occm.controllermanager.labels" -}}
 {{ include "occm.controllermanager.matchLabels" . }}
 {{ include "occm.common.metaLabels" . }}
+{{- range $key, $val := .Values.podLabels }}
+{{ $key }}: {{ $val }}
+{{- end }}
 {{- end -}}
 
 {{/*

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

@@ -22,6 +22,9 @@ spec:
         {{- with .Values.commonAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
+        {{- with .Values.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       labels:
         {{- include "occm.controllermanager.labels" . | nindent 8 }}
     spec:

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

@@ -59,6 +59,12 @@ tolerations:
   - key: node-role.kubernetes.io/control-plane
     effect: NoSchedule
 
+# Optional additional annotations to add to the controller Pods.
+podAnnotations: {}
+
+# Optional additional labels to add to the controller Pods.
+podLabels: {}
+
 # Set security settings for the controller pods
 # For all available options, see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#podsecuritycontext-v1-core
 podSecurityContext: