Cherrypick #658 from master to release-1.1

README.md

@@ -12,7 +12,7 @@ lifecycle of Google Compute Engine Persistent Disks.
 ## Project Status
 
 Status: GA
-Latest stable image: `gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v1.0.1-gke.0`
+Latest stable image: `gcr.io/gke-release/gcp-compute-persistent-disk-csi-driver:v1.1.0-gke.0`
 
 ### Test Status
 

deploy/kubernetes/base/controller/controller.yaml

@@ -23,19 +23,19 @@ spec:
       priorityClassName: csi-gce-pd-controller
       containers:
         - name: csi-provisioner
-          image: gke.gcr.io/csi-provisioner
+          image: k8s.gcr.io/sig-storage/csi-provisioner
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
             - "--feature-gates=Topology=true"
             - "--metrics-address=:22011"
-            - "--enable-leader-election"
-            - "--leader-election-type=leases"
             - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
             - "--timeout=250s"
             - "--extra-create-metadata"
-          # - "--run-controller-service=false" # disable the controller service of the CSI driver
-          # - "--run-node-service=false"       # disable the node service of the CSI driver
+          # - "--run-controller-service=false"  # disable the controller service of the CSI driver
+          # - "--run-node-service=false"        # disable the node service of the CSI driver
+            - "--leader-election"
+            - "--default-fstype=ext4"
           env:
             - name: PDCSI_NAMESPACE
               valueFrom:
@@ -45,7 +45,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-attacher
-          image: gke.gcr.io/csi-attacher
+          image: k8s.gcr.io/sig-storage/csi-attacher
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
@@ -62,13 +62,14 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-resizer
-          image: gke.gcr.io/csi-resizer
+          image: k8s.gcr.io/sig-storage/csi-resizer
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
             - "--metrics-address=:22013"
             - "--leader-election"
             - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
+            - "--handle-volume-inuse-error=false"
           env:
             - name: PDCSI_NAMESPACE
               valueFrom:
@@ -78,7 +79,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-snapshotter
-          image: gke.gcr.io/csi-snapshotter
+          image: k8s.gcr.io/sig-storage/csi-snapshotter
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"

deploy/kubernetes/base/node_linux/node.yaml

@@ -23,7 +23,7 @@ spec:
         kubernetes.io/os: linux
       containers:
         - name: csi-driver-registrar
-          image: gke.gcr.io/csi-node-driver-registrar
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"

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

@@ -12,8 +12,8 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-provisioner-prow-head
 imageTag:
-  name: gke.gcr.io/csi-provisioner
-  newName: quay.io/k8scsi/csi-provisioner
+  name: k8s.gcr.io/sig-storage/csi-provisioner
+  newName: gcr.io/k8s-staging-sig-storage/csi-provisioner
   newTag: "canary"
 
 ---
@@ -22,8 +22,8 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-attacher-prow-head
 imageTag:
-  name: gke.gcr.io/csi-attacher
-  newName: quay.io/k8scsi/csi-attacher
+  name: k8s.gcr.io/sig-storage/csi-attacher
+  newName: gcr.io/k8s-staging-sig-storage/csi-attacher
   newTag: "canary"
 ---
 
@@ -32,8 +32,8 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-nodo-registrar-prow-head
 imageTag:
-  name: gke.gcr.io/csi-node-driver-registrar
-  newName: quay.io/k8scsi/csi-node-driver-registrar
+  name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+  newName: gcr.io/k8s-staging-sig-storage/csi-node-driver-registrar
   newTag: "canary"
 ---
 
@@ -42,8 +42,8 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-resizer-prow-head
 imageTag:
-  name: gke.gcr.io/csi-resizer
-  newName: quay.io/k8scsi/csi-resizer
+  name: k8s.gcr.io/sig-storage/csi-resizer
+  newName: gcr.io/k8s-staging-sig-storage/csi-resizer
   newTag: "canary"
 ---
 
@@ -52,6 +52,6 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-snapshotter-prow-head
 imageTag:
-  name: gke.gcr.io/csi-snapshotter
-  newName: quay.io/k8scsi/csi-snapshotter
+  name: k8s.gcr.io/sig-storage/csi-snapshotter
+  newName: gcr.io/k8s-staging-sig-storage/csi-snapshotter
   newTag: "canary"

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

@@ -3,29 +3,26 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-provisioner-prow-rc
 imageTag:
-  name: gke.gcr.io/csi-provisioner
-  newName: gcr.io/gke-release-staging/csi-provisioner
-  newTag: "v2.0.3-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-provisioner
+  newTag: "v2.0.4"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-attacher-prow-rc
 imageTag:
-  name: gke.gcr.io/csi-attacher
-  newName: gcr.io/gke-release-staging/csi-attacher
-  newTag: "v3.0.1-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-attacher
+  newTag: "v3.0.1"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-resize-prow-rc
 imageTag:
-  name: gke.gcr.io/csi-resizer
-  newName: gcr.io/gke-release-staging/csi-resizer
-  newTag: "v1.0.1-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-resizer
+  newTag: "v1.0.1"
 ---
 
 apiVersion: builtin
@@ -43,18 +40,16 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-node-registrar-prow-rc
 imageTag:
-  name: gke.gcr.io/csi-node-driver-registrar
-  newName: gcr.io/gke-release-staging/csi-node-driver-registrar
-  newTag: "v1.3.0-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+  newTag: "v2.0.1"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-snapshotter-prow-head
 imageTag:
-  name: gke.gcr.io/csi-snapshotter
-  newName: gcr.io/gke-release-staging/csi-snapshotter
-  newTag: "v3.0.1-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-snapshotter
+  newTag: "v3.0.1"
 ---
 

deploy/kubernetes/images/stable/image.yaml

@@ -3,44 +3,44 @@ kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-provisioner
 imageTag:
-  name: gke.gcr.io/csi-provisioner
-  newTag: "v1.6.0-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-provisioner
+  newTag: "v2.0.4"
 
 ---
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-attacher
 imageTag:
-  name: gke.gcr.io/csi-attacher
-  newTag: "v2.2.0-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-attacher
+  newTag: "v3.0.1"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-resizer
 imageTag:
-  name: gke.gcr.io/csi-resizer
-  newTag: "v0.5.0-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-resizer
+  newTag: "v1.0.1"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-snapshotter
 imageTag:
-  name: gke.gcr.io/csi-snapshotter
-  newTag: "v2.1.1-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-snapshotter
+  newTag: "v3.0.1"
 ---
 
 apiVersion: builtin
 kind: ImageTagTransformer
 metadata:
   name: imagetag-csi-node-registrar
 imageTag:
-  name: gke.gcr.io/csi-node-driver-registrar
-  newTag: "v1.3.0-gke.0"
+  name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+  newTag: "v2.0.1"
 ---
 
 apiVersion: builtin
@@ -51,5 +51,5 @@ imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
   # Don't change stable image without changing pdImagePlaceholder in
   # test/k8s-integration/main.go
-  newTag: "v1.0.0-gke.0"
+  newTag: "v1.1.0-gke.0"
 ---

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

@@ -4,16 +4,3 @@ resources:
 - ../stable
 transformers:
 - ../../images/prow-gke-release-staging-head
-patchesJson6902:
-- target:
-    group: apps
-    version: v1
-    kind: Deployment
-    name: csi-gce-pd-controller
-  path: leader-election-flag.yaml
-- target:
-    group: apps
-    version: v1
-    kind: Deployment
-    name: csi-gce-pd-controller
-  path: volume-inuse-error-handler.yaml

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

@@ -4,10 +4,3 @@ 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