Merge pull request #631 from Jiawei0227/sidecar-upgrade

Upgrade csi sidecars to newest versions on rc

Author: k8s-ci-robot

deploy/kubernetes/base/controller/cluster_setup.yaml

@@ -49,6 +49,13 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
     verbs: ["get", "list"]
+  # Access to volumeattachments is only needed when the CSI driver
+  # has the PUBLISH_UNPUBLISH_VOLUME controller capability.
+  # In that case, external-provisioner will watch volumeattachments
+  # to determine when it is safe to delete a volume.
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments"]
+    verbs: ["get", "list", "watch"]
 ---
 
 kind: ClusterRoleBinding
@@ -139,6 +146,10 @@ rules:
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
+  # If handle-volume-inuse-error=true, the pod specific rbac is needed
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch"]
 
 ---
 kind: ClusterRoleBinding

deploy/kubernetes/images/prow-gke-release-staging-rc/image.yaml

@@ -5,7 +5,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/csi-provisioner
   newName: gcr.io/gke-release-staging/csi-provisioner
-  newTag: "v1.6.0-gke.0"
+  newTag: "v2.0.3-gke.0"
 ---
 
 apiVersion: builtin
@@ -15,7 +15,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/csi-attacher
   newName: gcr.io/gke-release-staging/csi-attacher
-  newTag: "v2.2.0-gke.0"
+  newTag: "v3.0.1-gke.0"
 ---
 
 apiVersion: builtin
@@ -25,7 +25,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/csi-resizer
   newName: gcr.io/gke-release-staging/csi-resizer
-  newTag: "v0.5.0-gke.0"
+  newTag: "v1.0.1-gke.0"
 ---
 
 apiVersion: builtin
@@ -35,7 +35,7 @@ metadata:
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.0.0-gke.0"
+  newTag: "v1.0.1-gke.0"
 ---
 
 apiVersion: builtin
@@ -55,6 +55,6 @@ metadata:
 imageTag:
   name: gke.gcr.io/csi-snapshotter
   newName: gcr.io/gke-release-staging/csi-snapshotter
-  newTag: "v2.1.1-gke.0"
+  newTag: "v3.0.1-gke.0"
 ---
 

deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml

@@ -4,3 +4,10 @@ resources:
 - ../stable
 transformers:
 - ../../images/prow-gke-release-staging-rc
+patchesJson6902:
+- target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: csi-gce-pd-controller
+  path: sidecar-upgrade.yaml

deploy/kubernetes/overlays/prow-gke-release-staging-rc/sidecar-upgrade.yaml

@@ -0,0 +1,24 @@
+# csi-provisioner
+# "--leader-election-type=leases"
+- op: remove
+  path: /spec/template/spec/containers/0/args/5
+
+# csi-provisioner
+# "--enable-leader-election" 
+- op: remove
+  path: /spec/template/spec/containers/0/args/4
+
+# csi-provisioner
+- op: add	
+  path: /spec/template/spec/containers/0/args/-	
+  value: "--leader-election"
+
+# csi-provisioner
+- op: add
+  path: /spec/template/spec/containers/0/args/-	
+  value: "--default-fstype=ext4"
+
+# csi-resizer
+- op: add
+  path: /spec/template/spec/containers/2/args/-
+  value: "--handle-volume-inuse-error=false"