Merge pull request #897 from andyzhangx/use-canary-windows-hp

chore: use canary-windows-hp image for host process deployment

Author: andyzhangx

charts/README.md

@@ -127,6 +127,7 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
 | `windows.kubelet`                                       | configure kubelet directory path on Windows agent node                                                     | `'C:\var\lib\kubelet'`                                  |
 
 ### Csi Proxy support on windows
+ > if you have set `windows.useHostProcessContainers` as `true`, csi-proxy is not needed by CSI driver.
 
 The helm can setup the host-process deamonset for the csi proxy, by setting windows.csiproxy.enabled to true.
 

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

@@ -159,7 +159,7 @@ windows:
         cpu: 10m
         memory: 40Mi
   csiproxy:
-    enabled: false # required if windows.enabled is true, but may be installed manually also
+    enabled: false # required if windows.enabled is true and useHostProcessContainers is false, but may be installed manually also
     dsName: csi-proxy-win # daemonset name
     tolerations: {}
     affinity: {}

charts/latest/csi-driver-smb/values.yaml

@@ -34,7 +34,7 @@ spec:
       hostNetwork: true
       initContainers:
         - name: init
-          image: mcr.microsoft.com/k8s/csi/smb-csi:latest-windows-hp
+          image: gcr.io/k8s-staging-sig-storage/smbplugin:canary-windows-hp
           imagePullPolicy: IfNotPresent
           command:
             - "powershell.exe"
@@ -69,7 +69,7 @@ spec:
               cpu: 30m
               memory: 40Mi
         - name: smb
-          image: mcr.microsoft.com/k8s/csi/smb-csi:latest-windows-hp
+          image: gcr.io/k8s-staging-sig-storage/smbplugin:canary-windows-hp
           imagePullPolicy: IfNotPresent
           command:
             - "smbplugin.exe"

deploy/csi-smb-node-windows-hostprocess.yaml

@@ -34,23 +34,22 @@ spec:
         "kubernetes.io/os": linux
       containers:
         - name: smb-server
-          image: andyzhangx/samba:win-fix
+          image: dockurr/samba
           env:
-            - name: PERMISSIONS
-              value: "0777"
-            - name: USERNAME
+            - name: NAME
+              value: share
+            - name: USER
               valueFrom:
                 secretKeyRef:
                   name: smbcreds
                   key: username
-            - name: PASSWORD
+            - name: PASS
               valueFrom:
                 secretKeyRef:
                   name: smbcreds
                   key: password
-          args: ["-u", "$(USERNAME);$(PASSWORD)", "-s", "share;/smbshare/;yes;no;no;all;none", "-p"]
           volumeMounts:
-            - mountPath: /smbshare
+            - mountPath: /storage
               name: data-volume
           ports:
             - containerPort: 445

deploy/example/smb-provisioner/smb-server-lb.yaml

@@ -6,6 +6,7 @@
 ## Feature Status: GA
 
 ## Prerequisite
+ > if you have set `windows.useHostProcessContainers` as `true`, csi-proxy is not needed by CSI driver.
 - [Install CSI-Proxy on Windows Node](https://github.com/kubernetes-csi/csi-proxy#installation)
 - install csi-proxy on k8s 1.23+ Windows node using host process daemonset directly
 ```console