Merge pull request #577 from saikat-royc/iss-576

Promote increase timeout change to stable

Author: k8s-ci-robot

deploy/kubernetes/base/controller/controller.yaml

@@ -32,6 +32,7 @@ spec:
             - "--enable-leader-election"
             - "--leader-election-type=leases"
             - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
+            - "--timeout=250s"
           # - "--run-controller-service=false" # disable the controller service of the CSI driver
           # - "--run-node-service=false"       # disable the node service of the CSI driver
           env:
@@ -50,6 +51,7 @@ spec:
             - "--metrics-address=:22012"
             - "--leader-election"
             - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
+            - "--timeout=250s"
           env:
             - name: PDCSI_NAMESPACE
               valueFrom:
@@ -82,6 +84,7 @@ spec:
             - "--metrics-address=:22014"
             - "--leader-election"
             - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
+            - "--timeout=300s"
           env:
             - name: PDCSI_NAMESPACE
               valueFrom:

deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml

@@ -17,12 +17,6 @@ patchesJson6902:
     kind: Deployment
     name: csi-gce-pd-controller
   path: volume-inuse-error-handler.yaml
-- target:
-    group: apps
-    version: v1
-    kind: Deployment
-    name: csi-gce-pd-controller
-  path: increase-sidecar-operation-timeout.yaml
 - target:
     group: apps
     version: v1

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

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