From 2a8cf94d1cb405de256864a0b56dbf4511e3728d Mon Sep 17 00:00:00 2001
From: Steve Hipwell <steve.hipwell@gmail.com>
Date: Tue, 3 Aug 2021 17:07:41 +0100
Subject: [PATCH] [chart] Add controller strategy

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
---
 charts/aws-ebs-csi-driver/CHANGELOG.md              | 4 ++++
 charts/aws-ebs-csi-driver/Chart.yaml                | 8 +++-----
 charts/aws-ebs-csi-driver/templates/controller.yaml | 6 +++++-
 charts/aws-ebs-csi-driver/values.yaml               | 5 +++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md
index 4c7c4645f9..51f3b285e8 100644
--- a/charts/aws-ebs-csi-driver/CHANGELOG.md
+++ b/charts/aws-ebs-csi-driver/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Helm chart
 
+## v2.1.0
+
+* Custom `controller.updateStrategy` to set controller deployment strategy.
+
 ## v2.0.4
 
 * Use chart app version as default image tag
diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml
index aabd2eeb34..b30e8d7e5c 100644
--- a/charts/aws-ebs-csi-driver/Chart.yaml
+++ b/charts/aws-ebs-csi-driver/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.2.0
 name: aws-ebs-csi-driver
 description: A Helm chart for AWS EBS CSI Driver
-version: 2.0.4
+version: 2.1.0
 kubeVersion: ">=1.17.0-0"
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 sources:
@@ -18,7 +18,5 @@ maintainers:
     url: https://github.com/krmichel
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Use chart app version as default image tag
-    - kind: changed
-      description: Add updateStrategy to daemonsets
+    - kind: added
+      description: Custom controller.updateStrategy to set controller deployment strategy.
diff --git a/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/aws-ebs-csi-driver/templates/controller.yaml
index ec851a468d..7cc165ba4e 100644
--- a/charts/aws-ebs-csi-driver/templates/controller.yaml
+++ b/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -7,6 +7,10 @@ metadata:
     {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controller.replicaCount }}
+  {{- with .Values.controller.updateStrategy }}
+  strategy:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       app: ebs-csi-controller
@@ -55,7 +59,7 @@ spec:
       {{- end }}
       containers:
         - name: ebs-plugin
-          image: {{ printf "%s:%s" .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (toString .Values.image.tag)) }}
+          image: {{ printf "%s:%s" .Values.image.repository (default (printf "v%s" .Chart.AppVersion) (.Values.image.tag | toString)) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             {{- if ne .Release.Name "kustomize" }}
diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml
index aef854d0bb..c1ec5c1d8a 100644
--- a/charts/aws-ebs-csi-driver/values.yaml
+++ b/charts/aws-ebs-csi-driver/values.yaml
@@ -85,6 +85,11 @@ controller:
   # region: us-east-1
   region:
   replicaCount: 2
+  updateStrategy: {}
+  # type: RollingUpdate
+  # rollingUpdate:
+  #   maxSurge: 0
+  #   maxUnavailable: 1
   resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little