Merge pull request #281 from RaunakShah/2.0_yamls

Update release-2.0 YAMLs
kubernetes-sigs · Jul 23, 2020 · 93bd408 · 93bd408
2 parents a370f74 + d70d653
commit 93bd408
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -17,12 +17,11 @@ Documentation for vSphere CSI Driver is available here:
 Please use appropriate deployment yaml files available here - <https://github.com/kubernetes-sigs/vsphere-csi-driver/tree/master/manifests>
 
 Note: `v1.0.2`, deployment yamls files are compatible with `v1.0.1`.
-For `v2.0.0-rc.1` and above use `v2.0.0` deployment yamls.
 
-### v2.0.0-rc-1
+### v2.0.0
 
-* gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0-rc.1
-* gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0-rc.1
+* gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0
+* gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0
 
 ### v1.0.2
 

diff --git a/manifests/v1.0.2/deploy/vsphere-csi-node-ds.yaml b/manifests/v1.0.2/deploy/vsphere-csi-node-ds.yaml
@@ -22,7 +22,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com-reg.sock"]
+                command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com-reg.sock /csi/csi.sock"]
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
@@ -31,7 +31,7 @@ spec:
             - name: ADDRESS
               value: /csi/csi.sock
             - name: DRIVER_REG_SOCK_PATH
-              value: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com/csi.sock
+              value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
           securityContext:
             privileged: true
           volumeMounts:
@@ -92,10 +92,7 @@ spec:
         - name: liveness-probe
           image: quay.io/k8scsi/livenessprobe:v1.1.0
           args:
-            - "--csi-address=$(ADDRESS)"
-          env:
-            - name: ADDRESS
-              value: /csi/csi.sock
+          - --csi-address=/csi/csi.sock
           volumeMounts:
             - name: plugin-dir
               mountPath: /csi
@@ -107,10 +104,10 @@ spec:
         - name: registration-dir
           hostPath:
             path: /var/lib/kubelet/plugins_registry
-            type: DirectoryOrCreate
+            type: Directory
         - name: plugin-dir
           hostPath:
-            path: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com
+            path: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/
             type: DirectoryOrCreate
         - name: pods-mount-dir
           hostPath:
@@ -119,3 +116,8 @@ spec:
         - name: device-dir
           hostPath:
             path: /dev
+      tolerations:
+        - effect: NoExecute
+          operator: Exists
+        - effect: NoSchedule
+          operator: Exists
diff --git a/manifests/v2.0.0/vsphere-67u3/vanilla/deploy/vsphere-csi-controller-deployment.yaml b/manifests/v2.0.0/vsphere-67u3/vanilla/deploy/vsphere-csi-controller-deployment.yaml
@@ -45,7 +45,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: vsphere-csi-controller
-          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0-rc.1
+          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0
           lifecycle:
             preStop:
               exec:
@@ -89,7 +89,7 @@ spec:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
         - name: vsphere-syncer
-          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0-rc.1
+          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0
           args:
             - "--leader-election"
           imagePullPolicy: "Always"

diff --git a/manifests/v2.0.0/vsphere-67u3/vanilla/deploy/vsphere-csi-node-ds.yaml b/manifests/v2.0.0/vsphere-67u3/vanilla/deploy/vsphere-csi-node-ds.yaml
@@ -24,7 +24,7 @@ spec:
         lifecycle:
           preStop:
             exec:
-              command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com-reg.sock"]
+              command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com-reg.sock /csi/csi.sock"]
         args:
         - "--v=5"
         - "--csi-address=$(ADDRESS)"
@@ -33,7 +33,7 @@ spec:
         - name: ADDRESS
           value: /csi/csi.sock
         - name: DRIVER_REG_SOCK_PATH
-          value: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com/csi.sock
+          value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
         securityContext:
           privileged: true
         volumeMounts:
@@ -42,7 +42,7 @@ spec:
         - name: registration-dir
           mountPath: /registration
       - name: vsphere-csi-node
-        image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0-rc.1
+        image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0
         imagePullPolicy: "Always"
         env:
         - name: NODE_NAME
@@ -96,10 +96,7 @@ spec:
       - name: liveness-probe
         image: quay.io/k8scsi/livenessprobe:v1.1.0
         args:
-        - "--csi-address=$(ADDRESS)"
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
+        - --csi-address=/csi/csi.sock
         volumeMounts:
         - name: plugin-dir
           mountPath: /csi
@@ -111,10 +108,10 @@ spec:
       - name: registration-dir
         hostPath:
           path: /var/lib/kubelet/plugins_registry
-          type: DirectoryOrCreate
+          type: Directory
       - name: plugin-dir
         hostPath:
-          path: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com
+          path: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/
           type: DirectoryOrCreate
       - name: pods-mount-dir
         hostPath:

diff --git a/manifests/v2.0.0/vsphere-67u3/vanilla/rbac/vsphere-csi-controller-rbac.yaml b/manifests/v2.0.0/vsphere-67u3/vanilla/rbac/vsphere-csi-controller-rbac.yaml
@@ -14,7 +14,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "update", "delete"]
+    verbs: ["get", "list", "watch", "create", "update", "delete", "patch"]
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["get", "list", "watch", "create", "update", "patch"]

diff --git a/manifests/v2.0.0/vsphere-7.0/vanilla/deploy/vsphere-csi-controller-deployment.yaml b/manifests/v2.0.0/vsphere-7.0/vanilla/deploy/vsphere-csi-controller-deployment.yaml
@@ -58,7 +58,7 @@ spec:
             - mountPath: /csi
               name: socket-dir
         - name: vsphere-csi-controller
-          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0-rc.1
+          image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0
           lifecycle:
             preStop:
               exec:
@@ -102,7 +102,7 @@ spec:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
         - name: vsphere-syncer
-          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0-rc.1
+          image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.0.0
           args:
             - "--leader-election"
           imagePullPolicy: "Always"

diff --git a/manifests/v2.0.0/vsphere-7.0/vanilla/deploy/vsphere-csi-node-ds.yaml b/manifests/v2.0.0/vsphere-7.0/vanilla/deploy/vsphere-csi-node-ds.yaml
@@ -24,7 +24,7 @@ spec:
         lifecycle:
           preStop:
             exec:
-              command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com-reg.sock"]
+              command: ["/bin/sh", "-c", "rm -rf /registration/csi.vsphere.vmware.com-reg.sock /csi/csi.sock"]
         args:
         - "--v=5"
         - "--csi-address=$(ADDRESS)"
@@ -33,7 +33,7 @@ spec:
         - name: ADDRESS
           value: /csi/csi.sock
         - name: DRIVER_REG_SOCK_PATH
-          value: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com/csi.sock
+          value: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/csi.sock
         securityContext:
           privileged: true
         volumeMounts:
@@ -42,7 +42,7 @@ spec:
         - name: registration-dir
           mountPath: /registration
       - name: vsphere-csi-node
-        image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0-rc.1
+        image: gcr.io/cloud-provider-vsphere/csi/release/driver:v2.0.0
         imagePullPolicy: "Always"
         env:
         - name: NODE_NAME
@@ -96,10 +96,7 @@ spec:
       - name: liveness-probe
         image: quay.io/k8scsi/livenessprobe:v1.1.0
         args:
-        - "--csi-address=$(ADDRESS)"
-        env:
-        - name: ADDRESS
-          value: /csi/csi.sock
+        - --csi-address=/csi/csi.sock
         volumeMounts:
         - name: plugin-dir
           mountPath: /csi
@@ -111,10 +108,10 @@ spec:
       - name: registration-dir
         hostPath:
           path: /var/lib/kubelet/plugins_registry
-          type: DirectoryOrCreate
+          type: Directory
       - name: plugin-dir
         hostPath:
-          path: /var/lib/kubelet/plugins_registry/csi.vsphere.vmware.com
+          path: /var/lib/kubelet/plugins/csi.vsphere.vmware.com/
           type: DirectoryOrCreate
       - name: pods-mount-dir
         hostPath: