Merge pull request #635 from davhdavh/master

feat: csi-proxy support in helm

Author: k8s-ci-robot

charts/README.md

@@ -125,6 +125,24 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `windows.resources.smb.requests.memory`                 | smb-csi-driver memory requests limits                                                                      | `20Mi`                                                  |
 | `windows.kubelet`                                       | configure kubelet directory path on Windows agent node                                                     | `'C:\var\lib\kubelet'`                                  |
 
+### Csi Proxy support on windows
+
+The helm can setup the host-process deamonset for the csi proxy, by setting windows.csiproxy.enabled to true.
+
+The following table lists the configurable parameters of the latest CSI-proxy Driver chart and default values.
+
+| Parameter                                               | Description                                                                                                | Default                                                 |
+|---------------------------------------------------------|------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|
+| `windows.csiproxy.enabled`                              | whether enable csi-proxy daemonset                                                                         | `false`                                                 |
+| `windows.csiproxy.dsName`                               | name of driver csi-proxy daemonset on windows                                                              | `csi-proxy-win`                                         |
+| `windows.csiproxy.username`                             | name of windows user on the host machine to run the proxy as                                               | `NT AUTHORITY\\SYSTEM`                                      |
+| `windows.csiproxy.affinity`                             | controller pod affinity                                                                                    | `{}`                                                       |
+| `windows.csiproxy.nodeSelector`                         | controller pod node selector                                                                               | `{"kubernetes.io/os": windows}`                                                       |
+| `windows.csiproxy.tolerations`                          | controller pod tolerations                                                                                 | `[]`                                                       |
+| `image.csiproxy.repository`                             | csiproxy docker image                                                                                      | `ghcr.io/kubernetes-sigs/sig-windows/csi-provisioner`                            |
+| `image.csiproxy.tag`                                    | csiproxy docker image tag                                                                                  | `v1.1.2`                                                      |
+| `image.csiproxy.pullPolicy`                             | csiproxy image pull policy                                                                                 | `IfNotPresent`                                          |
+
 ## troubleshooting
 
 - Add `--wait -v=5 --debug` in `helm install` command to get detailed error

charts/latest/csi-driver-smb-v0.0.0.tgz

@@ -0,0 +1,48 @@
+{{- if .Values.windows.csiproxy.enabled}}
+kind: DaemonSet
+apiVersion: apps/v1
+metadata:
+  name: {{ .Values.windows.csiproxy.dsName }}
+  namespace: {{ .Release.Namespace }}
+{{ include "smb.labels" . | indent 2 }}
+spec:
+  updateStrategy:
+    rollingUpdate:
+      maxUnavailable: {{ .Values.node.maxUnavailable }}
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: {{ .Values.windows.csiproxy.dsName }}
+  template:
+    metadata:
+{{ include "smb.labels" . | indent 6 }}
+        app: {{ .Values.windows.csiproxy.dsName }}
+    spec:
+{{- with .Values.windows.csiproxy.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      securityContext:
+        windowsOptions:
+          hostProcess: true
+          runAsUserName: {{ .Values.windows.csiproxy.username | quote }} 
+      hostNetwork: true
+      nodeSelector:
+{{- with .Values.windows.csiproxy.nodeSelector }}
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.node.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+{{- end }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
+      {{- include "smb.pullSecrets" . | indent 6 }}
+      containers:
+        - name: csi-proxy
+{{- if hasPrefix "/" .Values.image.csiproxy.repository }}
+          image: "{{ .Values.image.baseRepo }}{{ .Values.image.csiproxy.repository }}:{{ .Values.image.csiproxy.tag }}"
+{{- else }}
+          image: "{{ .Values.image.csiproxy.repository }}:{{ .Values.image.csiproxy.tag }}"
+{{- end }}
+          imagePullPolicy: {{ .Values.image.csiproxy.pullPolicy }}
+{{- end -}}

charts/latest/csi-driver-smb/templates/csi-proxy-windows.yaml

@@ -16,6 +16,10 @@ image:
     repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
     tag: v2.8.0
     pullPolicy: IfNotPresent
+  csiproxy:
+    repository: ghcr.io/kubernetes-sigs/sig-windows/csi-provisioner
+    tag: v1.1.2
+    pullPolicy: IfNotPresent
 
 serviceAccount:
   create: true # When true, service accounts will be created for you. Set to false if you want to use your own.
@@ -111,7 +115,7 @@ linux:
         memory: 20Mi
 
 windows:
-  enabled: false
+  enabled: false # Unless you already had csi proxy installed, windows.csiproxy.enabled=true is required
   dsName: csi-smb-node-win # daemonset name
   kubelet: 'C:\var\lib\kubelet'
   removeSMBMappingDuringUnmount: true
@@ -138,6 +142,13 @@ windows:
       requests:
         cpu: 10m
         memory: 40Mi
+  csiproxy:
+    enabled: false # required if windows.enabled is true, but may be installed manually also
+    dsName: csi-proxy-win # daemonset name
+    tolerations: {}
+    affinity: {}
+    nodeSelector:
+      "kubernetes.io/os": windows
 
 customLabels: {}
 ## Collection of annotations to add to all the pods