feat: scheduler constraints for controller pods

Author: bsctl

README.md

@@ -32,23 +32,22 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: vmware-system-csi
+  name: vsphere-csi-config-secret
 stringData:
   csi-vsphere.conf: |
     [Global]
-    cluster-id = "<cluster-id>"
-    user = "<username>"
-    password = "<password>"
-    port = "<port>"
-    insecure-flag = "<insecure-flag>"
-    [VirtualCenter "<host>"]
-    datacenters = "<dc-1>, <dc-2>, ..."
+    cluster-id = "cluster-namespace/cluster-name"
+    user = "administrator@vsphere.local"
+    password = "password"
+    port = 443
+    [VirtualCenter "vcenter.local"]
+    datacenters = "datacenter-name"
+    insecure-flag = false
 EOF
 ```
 
 Install the chart using Helm. You can customize the installation by providing a `my-values.yaml` file with your specific configuration.
 
-
 ```bash
 # Add repository (if published)
 helm repo add clastix https://clastix.github.io/charts

charts/vsphere-csi/README.md

@@ -23,6 +23,8 @@ vSphere Container Storage Interface (CSI) for Kamaji Tenant Clusters
 |-----|------|---------|-------------|
 | cluster.name | string | `"roma"` | Name of the Tenant Cluster |
 | cluster.targetNamespace | string | `"vmware-system-csi"` | Target namespace in the Tenant Cluster where the CSI driver will be installed |
+| controller.additionalMetadata | object | `{"annotations":{},"labels":{}}` | Additional metadata as labels and annotations |
+| controller.affinity | object | `{}` | Affinity scheduling rules |
 | controller.csiAttacher.imagePullPolicy | string | `"IfNotPresent"` | CSI Attacher image pull policy |
 | controller.csiAttacher.repository | string | `"registry.k8s.io/sig-storage/csi-attacher"` | CSI Attacher image |
 | controller.csiAttacher.resources | object | `{}` | CSI Attacher resources |
@@ -46,10 +48,12 @@ vSphere Container Storage Interface (CSI) for Kamaji Tenant Clusters
 | controller.livenessProbe.repository | string | `"registry.k8s.io/sig-storage/livenessprobe"` | CSI liveness probe image |
 | controller.livenessProbe.resources | object | `{}` | CSI liveness probe resources |
 | controller.livenessProbe.tag | string | `"v2.15.0"` | CSI liveness probe image tag |
-| controller.nodeSelector | object | `{}` | CSI Controller Node Selector |
+| controller.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector for scheduling |
+| controller.podAdditionalMetadata | object | `{"annotations":{},"labels":{}}` | Pods Additional metadata as labels and annotations |
 | controller.resources | object | `{}` | CSI Controller resources |
-| controller.tolerations | list | `[]` | CSI Controller Tolerations |
+| controller.tolerations | list | `[]` | Tolerations for scheduling |
 | controller.topology.enabled | bool | `false` | Enable topology feature |
+| controller.topologySpreadConstraints | list | `[]` | TopologySpreadConstraints for scheduling |
 | controller.vsphereSyncer.imagePullPolicy | string | `"IfNotPresent"` | CSI Syncer image pull policy |
 | controller.vsphereSyncer.repository | string | `"registry.k8s.io/csi-vsphere/syncer"` | CSI Syncer image |
 | controller.vsphereSyncer.resources | object | `{}` | CSI Syncer resources |

charts/vsphere-csi/templates/csi-controller-manifests.yaml

@@ -24,6 +24,13 @@ metadata:
   labels:
     component: csi-controller-manager
     cluster.x-k8s.io/cluster-name: {{ include "cluster-name" . | quote }}
+    {{- with .Values.controller.additionalMetadata.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- with .Values.controller.additionalMetadata.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ include "cluster-name" . }}-vsphere-csi-controller
   namespace: {{ .Release.Namespace }}
 spec:
@@ -42,6 +49,13 @@ spec:
         component: csi-controller-manager
         app: {{ include "cluster-name" . }}-vsphere-csi-controller
         role: vsphere-csi
+        {{- with .Values.controller.podAdditionalMetadata.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      annotations:
+        {{- with .Values.controller.podAdditionalMetadata.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       containers:
       - name: vsphere-csi-controller
@@ -289,6 +303,22 @@ spec:
           subPath: admin.svc
       dnsPolicy: ClusterFirst
       serviceAccountName: {{ include "cluster-name" . }}-vsphere-csi-controller
+      affinity:
+        {{- with .Values.controller.affinity }}
+        {{- toYaml . | nindent 6 }}
+        {{- end }}
+      tolerations:
+        {{- with .Values.controller.tolerations }}
+        {{- toYaml . | nindent 6 }}
+        {{- end }}
+      nodeSelector:
+        {{- with .Values.controller.nodeSelector }}
+        {{- toYaml . | nindent 6 }}
+        {{- end }}
+      topologySpreadConstraints:
+        {{- with .Values.controller.topologySpreadConstraints }}
+        {{- toYaml . | nindent 6 }}
+        {{- end }}
       volumes:
       - emptyDir: {}
         name: socket-dir

charts/vsphere-csi/values.yaml

@@ -76,10 +76,23 @@ controller:
   topology:
     # -- Enable topology feature
     enabled: false
-  # -- CSI Controller Node Selector
-  nodeSelector: {}
-  # -- CSI Controller Tolerations
+  # -- Additional metadata as labels and annotations
+  additionalMetadata: 
+    labels: {}
+    annotations: {}
+  # -- Pods Additional metadata as labels and annotations
+  podAdditionalMetadata:
+    labels: {}
+    annotations: {}
+  # -- Affinity scheduling rules
+  affinity: {}
+  # -- Tolerations for scheduling
   tolerations: []
+  # -- NodeSelector for scheduling
+  nodeSelector:
+    kubernetes.io/os: linux
+  # -- TopologySpreadConstraints for scheduling
+  topologySpreadConstraints: []
 
 driver:
   image: