From 2cb4f7764980948c8473c44209f7e6f0a3ac5aa1 Mon Sep 17 00:00:00 2001
From: elijah quinones <elijahlq@amazon.com>
Date: Fri, 8 Nov 2024 18:56:30 +0000
Subject: [PATCH] Finetune sidecar retry-interval-start

---
 charts/aws-ebs-csi-driver/templates/controller.yaml | 12 ++++++++++++
 deploy/kubernetes/base/controller.yaml              |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index da7310549d..1800593ac0 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -224,6 +224,9 @@ spec:
             - --kube-api-burst=100
             - --worker-threads=100
             {{- end }}
+            {{- if not (regexMatch "(-retry-interval-start)" (join " " .Values.sidecars.provisioner.additionalArgs)) }}
+            - --retry-interval-start=4s
+            {{- end }}
             {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.provisioner.additionalArgs)) }}
             - --retry-interval-max=30m
             {{- end }}
@@ -283,6 +286,9 @@ spec:
             - --kube-api-burst=100
             - --worker-threads=100
             {{- end }}
+            {{- if not (regexMatch "(-retry-interval-start)" (join " " .Values.sidecars.attacher.additionalArgs)) }}
+            - --retry-interval-start=500ms
+            {{- end }}
             {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.attacher.additionalArgs)) }}
             - --retry-interval-max=5m
             {{- end }}
@@ -329,6 +335,9 @@ spec:
             - --kube-api-burst=100
             - --worker-threads=100
             {{- end }}
+            {{- if not (regexMatch "(-retry-interval-start)" (join " " .Values.sidecars.snapshotter.additionalArgs)) }}
+            - --retry-interval-start=4s
+            {{- end }}
             {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.snapshotter.additionalArgs)) }}
             - --retry-interval-max=30m
             {{- end }}
@@ -445,6 +454,9 @@ spec:
             - --kube-api-burst=100
             - --workers=100
             {{- end }}
+            {{- if not (regexMatch "(-retry-interval-start)" (join " " .Values.sidecars.resizer.additionalArgs)) }}
+            - --retry-interval-start=4s
+            {{- end }}
             {{- if not (regexMatch "(-retry-interval-max)" (join " " .Values.sidecars.resizer.additionalArgs)) }}
             - --retry-interval-max=30m
             {{- end }}
diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
index ecddfd896d..09c91828e9 100644
--- a/deploy/kubernetes/base/controller.yaml
+++ b/deploy/kubernetes/base/controller.yaml
@@ -144,6 +144,7 @@ spec:
             - --kube-api-qps=20
             - --kube-api-burst=100
             - --worker-threads=100
+            - --retry-interval-start=4s
             - --retry-interval-max=30m
           env:
             - name: ADDRESS
@@ -173,6 +174,7 @@ spec:
             - --kube-api-qps=20
             - --kube-api-burst=100
             - --worker-threads=100
+            - --retry-interval-start=500ms
             - --retry-interval-max=5m
           env:
             - name: ADDRESS
@@ -202,6 +204,7 @@ spec:
             - --kube-api-qps=20
             - --kube-api-burst=100
             - --worker-threads=100
+            - --retry-interval-start=4s
             - --retry-interval-max=30m
           env:
             - name: ADDRESS
@@ -232,6 +235,7 @@ spec:
             - --kube-api-qps=20
             - --kube-api-burst=100
             - --workers=100
+            - --retry-interval-start=4s
             - --retry-interval-max=30m
           env:
             - name: ADDRESS