Enable timeout/retry configuration in Values for csi-provisioner and …

…csi-attacher Signed-off-by: Gengtao Xu <gengtaox@amazon.com>
kubernetes-sigs · Apr 25, 2023 · 2ebe4f4 · 2ebe4f4
1 parent aaeddc0
commit 2ebe4f4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -194,6 +194,17 @@ spec:
             - --leader-election-retry-period={{ .Values.sidecars.provisioner.leaderElection.retryPeriod }}
             {{- end }}
             {{- end }}
+            {{- with .Values.sidecars.provisioner.retryInterval }}
+            {{- if .Values.sidecars.provisioner.retryInterval.startTime }}
+            - --retry-interval-start={{ .Values.sidecars.provisioner.retryInterval.startTime }}
+            {{- end }}
+            {{- if .Values.sidecars.provisioner.retryInterval.maxTime }}
+            - --retry-interval-max={{ .Values.sidecars.provisioner.retryInterval.maxTime }}
+            {{- end }}
+            {{- end }}
+            {{- if .Values.sidecars.provisioner.timout }}
+            - --timeout={{ .Values.sidecars.provisioner.timeout }}
+            {{- end }}
             - --default-fstype={{ .Values.controller.defaultFsType }}
           env:
             - name: ADDRESS
@@ -237,6 +248,17 @@ spec:
             - --leader-election-retry-period={{ .Values.sidecars.attacher.leaderElection.retryPeriod }}
             {{- end }}
             {{- end }}
+            {{- with .Values.sidecars.attacher.retryInterval }}
+            {{- if .Values.sidecars.attacher.retryInterval.startTime }}
+            - --retry-interval-start={{ .Values.sidecars.attacher.retryInterval.startTime }}
+            {{- end }}
+            {{- if .Values.sidecars.attacher.retryInterval.maxTime }}
+            - --retry-interval-max={{ .Values.sidecars.attacher.retryInterval.maxTime }}
+            {{- end }}
+            {{- end }}
+            {{- if .Values.sidecars.attacher.timout }}
+            - --timeout={{ .Values.sidecars.attacher.timeout }}
+            {{- end }}
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
@@ -32,6 +32,12 @@ sidecars:
       # leaseDuration: "15s"
       # renewDeadline: "10s"
       # retryPeriod: "5s"
+    # Timeout and retry configuration for gRPC calls to CSI driver
+    # Ref: https://github.com/kubernetes-csi/external-provisioner#csi-error-and-timeout-handling
+    # timout: "15s"
+    # retryInterval:
+    #   startTime: "1s"
+    #   maxTime: "5m"
     securityContext:
       readOnlyRootFilesystem: true
       allowPrivilegeEscalation: false
@@ -51,6 +57,12 @@ sidecars:
       # leaseDuration: "15s"
       # renewDeadline: "10s"
       # retryPeriod: "5s"
+    # Timeout and retry configuration for gRPC calls to CSI driver
+    # Ref: https://github.com/kubernetes-csi/external-attacher#csi-error-and-timeout-handling
+    # timout: "15s"
+    # retryInterval:
+    #   startTime: "1s"
+    #   maxTime: "5m"
     logLevel: 2
     resources: {}
     securityContext: