Merge pull request #339 from andyzhangx/remove-windows-image-chart

cleanup: remove windows image config in chart

Author: andyzhangx

charts/README.md

@@ -31,10 +31,10 @@ spec:
           volumeMounts:
             - mountPath: C:\csi
               name: plugin-dir
-{{- if hasPrefix "/" .Values.windows.image.livenessProbe.repository }}
-          image: "{{ .Values.image.baseRepo }}{{ .Values.windows.image.livenessProbe.repository }}:{{ .Values.windows.image.livenessProbe.tag }}"
+{{- if hasPrefix "/" .Values.image.livenessProbe.repository }}
+          image: "{{ .Values.image.baseRepo }}{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
 {{- else }}
-          image: "{{ .Values.windows.image.livenessProbe.repository }}:{{ .Values.windows.image.livenessProbe.tag }}"
+          image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"
 {{- end }}
           args:
             - --csi-address=$(CSI_ENDPOINT)
@@ -44,7 +44,7 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock
-          imagePullPolicy: {{ .Values.windows.image.livenessProbe.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           resources:
             limits:
               cpu: 200m
@@ -53,10 +53,10 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-{{- if hasPrefix "/" .Values.windows.image.nodeDriverRegistrar.repository }}
-          image: "{{ .Values.image.baseRepo }}{{ .Values.windows.image.nodeDriverRegistrar.repository }}:{{ .Values.windows.image.nodeDriverRegistrar.tag }}"
+{{- if hasPrefix "/" .Values.image.nodeDriverRegistrar.repository }}
+          image: "{{ .Values.image.baseRepo }}{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
 {{- else }}
-          image: "{{ .Values.windows.image.nodeDriverRegistrar.repository }}:{{ .Values.windows.image.nodeDriverRegistrar.tag }}"
+          image: "{{ .Values.image.nodeDriverRegistrar.repository }}:{{ .Values.image.nodeDriverRegistrar.tag }}"
 {{- end }}
           args:
             - --v=2
@@ -78,7 +78,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          imagePullPolicy: {{ .Values.windows.image.nodeDriverRegistrar.pullPolicy }}
+          imagePullPolicy: {{ .Values.image.nodeDriverRegistrar.pullPolicy }}
           volumeMounts:
             - name: plugin-dir
               mountPath: C:\csi

charts/latest/csi-driver-smb-v1.3.0.tgz

@@ -5,15 +5,15 @@ image:
     tag: latest
     pullPolicy: IfNotPresent
   csiProvisioner:
-    repository: k8s.gcr.io/sig-storage/csi-provisioner
+    repository: /oss/kubernetes-csi/csi-provisioner
     tag: v2.1.0
     pullPolicy: IfNotPresent
   livenessProbe:
-    repository: k8s.gcr.io/sig-storage/livenessprobe
+    repository: /oss/kubernetes-csi/livenessprobe
     tag: v2.3.0
     pullPolicy: IfNotPresent
   nodeDriverRegistrar:
-    repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+    repository: /oss/kubernetes-csi/csi-node-driver-registrar
     tag: v2.3.0
     pullPolicy: IfNotPresent
 
@@ -110,15 +110,6 @@ windows:
   enabled: false
   dsName: csi-smb-node-win # daemonset name
   kubelet: 'C:\var\lib\kubelet'
-  image:
-    livenessProbe:
-      repository: /oss/kubernetes-csi/livenessprobe
-      tag: v2.3.0
-      pullPolicy: IfNotPresent
-    nodeDriverRegistrar:
-      repository: /oss/kubernetes-csi/csi-node-driver-registrar
-      tag: v2.3.0
-      pullPolicy: IfNotPresent
   tolerations:
     - key: "node.kubernetes.io/os"
       operator: "Exists"

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

@@ -28,7 +28,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v2.1.0
           args:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
@@ -47,7 +47,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.3.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s

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

@@ -29,7 +29,7 @@ spec:
           volumeMounts:
             - mountPath: /csi
               name: socket-dir
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.3.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -43,7 +43,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+          image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.3.0
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

deploy/csi-smb-controller.yaml

@@ -49,6 +49,11 @@ kubectl get pods -n${NS} -l${LABEL} \
     | awk 'NR>1 {print $1}' \
     | xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}
 
+echo "print out csi-$DRIVER-node-win events ..."
+echo "======================================================================================"
+LABEL="app=csi-$DRIVER-node-win"
+kubectl describe pods -n${NS} -l${LABEL}
+
 echo "print out csi-$DRIVER-node-win logs ..."
 echo "======================================================================================"
 LABEL="app=csi-$DRIVER-node-win"