Update node selector and make it configurable

kubernetes-sigs · Jun 17, 2020 · 0dedd32 · 0dedd32
1 parent 34a978c
commit 0dedd32
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/charts/secrets-store-csi-driver/README.md b/charts/secrets-store-csi-driver/README.md
@@ -28,11 +28,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.image.tag` | Linux image tag | `v0.0.11` |
 | `linux.enabled` | Install secrets store csi driver on linux nodes | true |
 | `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
+| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `kubernetes.io/os: linux` |
 | `windows.image.repository` | Windows image repository | `mcr.microsoft.com/k8s/csi/secrets-store/driver` |
 | `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
 | `windows.image.tag` | Windows image tag | `v0.0.11` |
 | `windows.enabled` | Install secrets store csi driver on windows nodes | false |
 | `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |
+| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `kubernetes.io/os: windows` |
 | `logLevel.debug` | Enable debug logging | true |
 | `livenessProbe.port` | Liveness probe port | `9808` |
 | `rbac.install` | Install default rbac roles and bindings | true |

diff --git a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml
@@ -13,8 +13,6 @@ spec:
     metadata:
 {{ include "sscd.labels" . | indent 6 }}
     spec:
-      nodeSelector:
-        beta.kubernetes.io/os: windows
       serviceAccountName: secrets-store-csi-driver
       containers:
         - name: node-driver-registrar
@@ -116,4 +114,8 @@ spec:
           hostPath:
             path: C:\k\secrets-store-csi-providers\
             type: DirectoryOrCreate
+{{- with .Values.windows.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+{{- end }}
 {{- end -}}
diff --git a/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml b/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml
@@ -13,8 +13,6 @@ spec:
     metadata:
 {{ include "sscd.labels" . | indent 6 }}
     spec:
-      nodeSelector:
-        beta.kubernetes.io/os: linux
       serviceAccountName: secrets-store-csi-driver
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
@@ -118,4 +116,8 @@ spec:
           hostPath:
             path: /etc/kubernetes/secrets-store-csi-providers
             type: DirectoryOrCreate
+{{- with .Values.linux.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+{{- end }}
 {{- end -}}
diff --git a/charts/secrets-store-csi-driver/values.yaml b/charts/secrets-store-csi-driver/values.yaml
@@ -5,6 +5,8 @@ linux:
     tag: v0.0.11
     pullPolicy: Always
   kubeletRootDir: /var/lib/kubelet
+  nodeSelector:
+    kubernetes.io/os: linux
 
 windows:
   enabled: false
@@ -13,6 +15,8 @@ windows:
     tag: v0.0.11
     pullPolicy: IfNotPresent
   kubeletRootDir: C:\var\lib\kubelet
+  nodeSelector:
+    kubernetes.io/os: windows
 
 logLevel:
   debug: true

diff --git a/deploy/secrets-store-csi-driver-windows.yaml b/deploy/secrets-store-csi-driver-windows.yaml
@@ -11,8 +11,6 @@ spec:
       labels:
         app: csi-secrets-store
     spec:
-      nodeSelector:
-        beta.kubernetes.io/os: windows
       serviceAccountName: secrets-store-csi-driver
       containers:
         - name: node-driver-registrar
@@ -107,3 +105,5 @@ spec:
           hostPath:
             path: C:\k\secrets-store-csi-providers\
             type: DirectoryOrCreate
+      nodeSelector:
+        kubernetes.io/os: windows
diff --git a/deploy/secrets-store-csi-driver.yaml b/deploy/secrets-store-csi-driver.yaml
@@ -11,8 +11,6 @@ spec:
       labels:
         app: csi-secrets-store
     spec:
-      nodeSelector:
-        beta.kubernetes.io/os: linux
       serviceAccountName: secrets-store-csi-driver
       hostNetwork: true
       containers:
@@ -108,3 +106,5 @@ spec:
           hostPath:
             path: /etc/kubernetes/secrets-store-csi-providers
             type: DirectoryOrCreate
+      nodeSelector:
+        kubernetes.io/os: linux