From 691938c2517a9cbdec1157c65bc025087ad99cbb Mon Sep 17 00:00:00 2001
From: Serge Logvinov <serge.logvinov@sinextra.dev>
Date: Tue, 22 Nov 2022 08:56:10 +0200
Subject: [PATCH] update affinity

---
 hetzner/Makefile                           |  1 +
 hetzner/deployments/hcloud-autoscaler.yaml |  5 +++--
 hetzner/deployments/hcloud-csi.yaml        | 13 +++----------
 hetzner/deployments/test-csi.yaml          |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/hetzner/Makefile b/hetzner/Makefile
index e36bdde..469738f 100644
--- a/hetzner/Makefile
+++ b/hetzner/Makefile
@@ -64,3 +64,4 @@ create-deployments:
 create-secrets:
 	dd if=/dev/urandom bs=1 count=16 2>/dev/null | hexdump -e '"%00x"' > hcloud-csi-secret.secret
 	kubectl --kubeconfig=kubeconfig create secret generic hcloud-csi-secret --from-file=encryptionPassphrase=hcloud-csi-secret.secret
+	rm -f hcloud-csi-secret.secret
diff --git a/hetzner/deployments/hcloud-autoscaler.yaml b/hetzner/deployments/hcloud-autoscaler.yaml
index 24422a0..3ea9bfa 100644
--- a/hetzner/deployments/hcloud-autoscaler.yaml
+++ b/hetzner/deployments/hcloud-autoscaler.yaml
@@ -140,13 +140,14 @@ spec:
       serviceAccountName: cluster-autoscaler
       nodeSelector:
         node-role.kubernetes.io/control-plane: ""
+        node.cloudprovider.kubernetes.io/platform: hcloud
       tolerations:
         - key: node-role.kubernetes.io/control-plane
           effect: NoSchedule
       containers:
         - name: cluster-autoscaler
-          # image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.1
-          image: ghcr.io/sergelogvinov/cluster-autoscaler-amd64:dev
+          image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.25.0
+          # image: ghcr.io/sergelogvinov/cluster-autoscaler-amd64:dev
           name: cluster-autoscaler
           resources:
             limits:
diff --git a/hetzner/deployments/hcloud-csi.yaml b/hetzner/deployments/hcloud-csi.yaml
index e78e1e3..4964795 100644
--- a/hetzner/deployments/hcloud-csi.yaml
+++ b/hetzner/deployments/hcloud-csi.yaml
@@ -208,6 +208,7 @@ spec:
     spec:
       nodeSelector:
         node-role.kubernetes.io/control-plane: ""
+        node.cloudprovider.kubernetes.io/platform: hcloud
       tolerations:
         - key: "node-role.kubernetes.io/control-plane"
           effect: NoSchedule
@@ -316,19 +317,11 @@ spec:
       labels:
         app: hcloud-csi
     spec:
+      nodeSelector:
+        node.cloudprovider.kubernetes.io/platform: hcloud
       tolerations:
         - effect: NoSchedule
           operator: Exists
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: instance.hetzner.cloud/is-root-server
-                    operator: NotIn
-                    values:
-                      - "true"
-      serviceAccount: hcloud-csi
       containers:
         - name: csi-node-driver-registrar
           image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
diff --git a/hetzner/deployments/test-csi.yaml b/hetzner/deployments/test-csi.yaml
index ba60543..ebb30ed 100644
--- a/hetzner/deployments/test-csi.yaml
+++ b/hetzner/deployments/test-csi.yaml
@@ -4,11 +4,11 @@ metadata:
   name: csi-pvc
 spec:
   accessModes:
-  - ReadWriteOnce
+    - ReadWriteOnce
   resources:
     requests:
       storage: 10Gi
-  storageClassName: hcloud-volumes-enc
+  storageClassName: hcloud-volumes
 ---
 kind: Pod
 apiVersion: v1