From 1822242d24014a50439cdfb3059805b79d71febc Mon Sep 17 00:00:00 2001 From: Saikat Roychowdhury Date: Wed, 1 Jul 2020 19:52:35 +0000 Subject: [PATCH] Increase CSI sidecar operation timeout 1. Timeouts increased for staging head and rc overlay only 2. Operation timeouts changed for attacher, provisioner and snapshotter. --- .../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 +++++++ 4 files changed, 37 insertions(+) create mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml create mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml 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 new file mode 100644 index 000000000..dffed5653 --- /dev/null +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/increase-sidecar-operation-timeout.yaml @@ -0,0 +1,12 @@ +# 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 cef121c3b..4bdc0e4ab 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-head/kustomization.yaml @@ -17,3 +17,9 @@ 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 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 new file mode 100644 index 000000000..dffed5653 --- /dev/null +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/increase-sidecar-operation-timeout.yaml @@ -0,0 +1,12 @@ +# 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 644186669..d5822d578 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml @@ -4,3 +4,10 @@ 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