From 14fb35d0d001bddd929f46bf68f6f0a152d9c4d6 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 19 Jun 2021 08:33:04 +0200
Subject: [PATCH] Bump EBS Driver to 1.1.0

---
 pkg/model/components/awsebscsidriver.go       |  2 +-
 tests/e2e/scenarios/aws-ebs-csi/run-test.sh   |  5 +--
 .../k8s-1.17.yaml.template                    | 41 +++++++++++++++++--
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/pkg/model/components/awsebscsidriver.go b/pkg/model/components/awsebscsidriver.go
index ed3acf9210..9168c7a42f 100644
--- a/pkg/model/components/awsebscsidriver.go
+++ b/pkg/model/components/awsebscsidriver.go
@@ -48,7 +48,7 @@ func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 
 	if c.Version == nil {
-		version := "v1.0.0"
+		version := "v1.1.0"
 		c.Version = fi.String(version)
 	}
 
diff --git a/tests/e2e/scenarios/aws-ebs-csi/run-test.sh b/tests/e2e/scenarios/aws-ebs-csi/run-test.sh
index 1f50f3bc7c..efb68e8e02 100755
--- a/tests/e2e/scenarios/aws-ebs-csi/run-test.sh
+++ b/tests/e2e/scenarios/aws-ebs-csi/run-test.sh
@@ -17,8 +17,6 @@
 REPO_ROOT=$(git rev-parse --show-toplevel);
 source "${REPO_ROOT}"/tests/e2e/scenarios/lib/common.sh
 
-REPORT_DIR="${ARTIFACTS:-$(pwd)/_artifacts}/aws-ebs-csi-driver/"
-
 export KOPS_BASE_URL
 KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
 KOPS=$(kops-download-from-base)
@@ -30,12 +28,13 @@ OVERRIDES="$OVERRIDES --override=cluster.spec.certManager.enabled=true"
 kops-up
 
 ZONE=$(${KOPS} get ig -o json | jq -r '[.[] | select(.spec.role=="Node") | .spec.subnets[0]][0]')
+REPORT_DIR="${ARTIFACTS:-$(pwd)/_artifacts}/aws-ebs-csi-driver/"
 
 # shellcheck disable=SC2164
 cd "$(mktemp -dt kops.XXXXXXXXX)"
 go get github.com/onsi/ginkgo/ginkgo
 
-git clone --branch v1.0.0 https://github.com/kubernetes-sigs/aws-ebs-csi-driver.git .
+git clone --branch v1.1.0 https://github.com/kubernetes-sigs/aws-ebs-csi-driver.git .
 
 # shellcheck disable=SC2164
 cd tests/e2e-kubernetes/
diff --git a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
index 41eeea2275..f497290dff 100644
--- a/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
+++ b/upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
@@ -294,7 +294,7 @@ spec:
             - --volume-attach-limit={{ .VolumeAttachLimit }}
             {{- end }}
             - --logtostderr
-            - --v=5
+            - --v=2
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
@@ -379,7 +379,7 @@ metadata:
     app.kubernetes.io/instance: aws-ebs-csi-driver
     app.kubernetes.io/version: {{ .Version }}
 spec:
-  replicas: 2
+  replicas: {{ ControlPlaneControllerReplicas }}
   selector:
     matchLabels:
       app: ebs-csi-controller
@@ -393,6 +393,26 @@ spec:
         app.kubernetes.io/instance: aws-ebs-csi-driver
         app.kubernetes.io/version: {{ .Version }}
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - ebs-csi-controller
+            topologyKey: kubernetes.com/hostname
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100 
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - ebs-csi-controller
+              topologyKey: topology.kubernetes.io/zone
       nodeSelector:
         kubernetes.io/os: linux
         {{ if not UseServiceAccountIAM }}
@@ -523,4 +543,19 @@ metadata:
 spec:
   attachRequired: true
   podInfoOnMount: false
-{{ end }}
+---
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: ebs-csi-controller
+  labels:
+    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/instance: aws-ebs-csi-driver
+    app.kubernetes.io/version: {{ .Version }}
+spec:
+  selector:
+    matchLabels:
+      app: ebs-csi-controller
+      app.kubernetes.io/instance: aws-ebs-csi-driver
+  maxUnavailable: 1
+{{ end }}
\ No newline at end of file