From a32bf798214ccb3284d064f203c5b5cfae5dfa50 Mon Sep 17 00:00:00 2001
From: Saikat Roychowdhury <saikat.royc85@gmail.com>
Date: Tue, 11 Aug 2020 22:17:13 +0000
Subject: [PATCH] Promote increase timeout change to stable

---
 deploy/kubernetes/base/controller/controller.yaml    |  3 +++
 .../increase-sidecar-operation-timeout.yaml          | 12 ------------
 .../prow-gke-release-staging-head/kustomization.yaml |  6 ------
 .../increase-sidecar-operation-timeout.yaml          | 12 ------------
 .../prow-gke-release-staging-rc/kustomization.yaml   |  7 -------
 5 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml
 delete mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml

diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml
index 49f5382c4..a113aa1a9 100644
--- a/deploy/kubernetes/base/controller/controller.yaml
+++ b/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:
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml
deleted file mode 100644
index dffed5653..000000000
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Increase operation timeout for provisioner sidecar.
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "--timeout=250s"
-# Increase operation timeout for attacher sidecar.
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: "--timeout=250s"
-# Increase operation timeout for snapshotter sidecar.
-- op: add
-  path: /spec/template/spec/containers/3/args/-
-  value: "--timeout=300s"
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml
index 90581f8c8..699060189 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.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
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml
deleted file mode 100644
index dffed5653..000000000
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Increase operation timeout for provisioner sidecar.
-- op: add
-  path: /spec/template/spec/containers/0/args/-
-  value: "--timeout=250s"
-# Increase operation timeout for attacher sidecar.
-- op: add
-  path: /spec/template/spec/containers/1/args/-
-  value: "--timeout=250s"
-# Increase operation timeout for snapshotter sidecar.
-- op: add
-  path: /spec/template/spec/containers/3/args/-
-  value: "--timeout=300s"
diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml
index d5822d578..644186669 100644
--- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml
+++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/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