From c381962b94ff055544aec0833bb187f371c0b78f Mon Sep 17 00:00:00 2001
From: Christian Bianchi <whites11@gmail.com>
Date: Tue, 5 Jul 2022 13:49:19 +0200
Subject: [PATCH] set image registry for aws ebs csi driver (#630)

---
 CHANGELOG.md                                         |  7 ++++++-
 templates/files/apps/aws/aws-ebs-csi-driver-app.yaml |  5 ++++-
 templates/files/conf/k8s-addons                      | 10 ----------
 templates/files/k8s-resource/priority_classes.yaml   |  7 -------
 templates/master.yaml.tmpl                           | 11 +----------
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 templates/files/k8s-resource/priority_classes.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5179e872..82e6f033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,9 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump kubernetes to `1.22.11`.
 - Bump `coredns` app to `1.10.1`.
 - Bump `nginx-ingress-controller` app to `2.14.0`.
-- [AWS] Bump `aws-ebs-csi-driver` to `2.14.0`.
+- [AWS] Bump `aws-ebs-csi-driver` to `2.15.0`.
 - [AWS] Bump `aws-node-termination-handler` to `1.16.5-gs1`.
 - [AWS] Bump `aws-cloud-controller-manager` to `1.22.4-gs1`.
+- [AWS] Bump `aws-attach-etcd-dep` to `0.4.0`.
 - [Azure] Bump `azuredisk-csi-driver` to `1.19.0-gs1`.
 - [Azure] Bump `azure-cloud-controller-manager` to `1.1.17-gs1`.
 - [Azure] Bump `azure-cloud-node-manager` to `1.1.17-gs1`.
@@ -29,6 +30,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump etcd image version to 3.5.4 for etcd3-defrag unit.
 
+### Removed
+
+- Don't create priority classes any more (chart-operator does that now).
+
 ## [10.2.0] - 2022-06-29
 
 ### Changed
diff --git a/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml b/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml
index 118356f2..076fb97a 100644
--- a/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml
+++ b/templates/files/apps/aws/aws-ebs-csi-driver-app.yaml
@@ -14,6 +14,9 @@ data:
       hostNetwork: false
       nodeSelector:
         kubernetes.io/os: linux
+    global:
+      image:
+        registry: {{.DockerRegistry}}
 ---
 apiVersion: application.giantswarm.io/v1alpha1
 kind: App
@@ -50,4 +53,4 @@ spec:
     secret:
       name: ""
       namespace: ""
-  version: 2.14.0
+  version: 2.15.0
diff --git a/templates/files/conf/k8s-addons b/templates/files/conf/k8s-addons
index 29879979..40370099 100644
--- a/templates/files/conf/k8s-addons
+++ b/templates/files/conf/k8s-addons
@@ -53,16 +53,6 @@ do
     done
 done
 
-# apply priority classes
-PRIORITY_CLASSES_FILE="priority_classes.yaml"
-while
-    $KUBECTL apply -f /srv/${PRIORITY_CLASSES_FILE}
-    [ "$?" -ne "0" ]
-do
-    echo "failed to apply /srv/${PRIORITY_CLASSES_FILE}, retrying in 5 sec"
-    sleep 5s
-done
-
 # create kube-proxy configmap
 while
     $KUBECTL create configmap kube-proxy --from-file=kube-proxy.yaml=/srv/kube-proxy-config.yaml -o yaml --dry-run | $KUBECTL apply -n kube-system -f -
diff --git a/templates/files/k8s-resource/priority_classes.yaml b/templates/files/k8s-resource/priority_classes.yaml
deleted file mode 100644
index c33c1ef3..00000000
--- a/templates/files/k8s-resource/priority_classes.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: scheduling.k8s.io/v1alpha1
-kind: PriorityClass
-metadata:
-  name: giantswarm-critical
-value: 1000000000
-globalDefault: false
-description: "This priority class is used by giantswarm kubernetes components."
\ No newline at end of file
diff --git a/templates/master.yaml.tmpl b/templates/master.yaml.tmpl
index 680cfb6d..7235c35a 100644
--- a/templates/master.yaml.tmpl
+++ b/templates/master.yaml.tmpl
@@ -80,15 +80,6 @@ storage:
       contents:
         source: "data:text/plain;charset=utf-8;base64,{{ index .Files "k8s-resource/calico-all.yaml" }}"
 {{ end }}
-    - path: /srv/priority_classes.yaml
-      filesystem: root
-      mode: 420
-      user:
-        id: 0
-      group:
-        id: 0
-      contents:
-        source: "data:text/plain;charset=utf-8;base64,{{ index .Files "k8s-resource/priority_classes.yaml" }}"
 
     - path: /srv/default-storage-class.yaml
       filesystem: root
@@ -986,7 +977,7 @@ systemd:
       Before=k8s-kubelet.service
 
       [Service]
-      Environment="IMAGE={{.DockerRegistry}}/giantswarm/aws-attach-etcd-dep:0.3.0"
+      Environment="IMAGE={{.DockerRegistry}}/giantswarm/aws-attach-etcd-dep:0.4.0"
       Environment="NAME=%p.service"
       Environment=MASTER_ID={{.MasterID}}
       Type=oneshot