From acc6504b5f7da522daf02810d4078076f4e6f9cf Mon Sep 17 00:00:00 2001
From: Christian Hoffmeister <mail@choffmeister.de>
Date: Tue, 17 Oct 2023 11:52:40 +0200
Subject: [PATCH] Update hcloud-cloud-controller-manager to 1.18.0 (#12)

---
 ...fests_hcloud_cloud_controller_manager.yaml | 57 ++++++++++++-------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/internal/apply_manifests_hcloud_cloud_controller_manager.yaml b/internal/apply_manifests_hcloud_cloud_controller_manager.yaml
index 7809529..1e3b767 100644
--- a/internal/apply_manifests_hcloud_cloud_controller_manager.yaml
+++ b/internal/apply_manifests_hcloud_cloud_controller_manager.yaml
@@ -1,24 +1,27 @@
-# https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.13.2/ccm.yaml
+# https://github.com/hetznercloud/hcloud-cloud-controller-manager/releases/download/v1.18.0/ccm.yaml
 ---
+# Source: hcloud-cloud-controller-manager/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: cloud-controller-manager
+  name: hcloud-cloud-controller-manager
   namespace: kube-system
 ---
+# Source: hcloud-cloud-controller-manager/templates/clusterrolebinding.yaml
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: system:cloud-controller-manager
+  name: "system:hcloud-cloud-controller-manager"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: cluster-admin
 subjects:
   - kind: ServiceAccount
-    name: cloud-controller-manager
+    name: hcloud-cloud-controller-manager
     namespace: kube-system
 ---
+# Source: hcloud-cloud-controller-manager/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -35,50 +38,60 @@ spec:
       labels:
         app: hcloud-cloud-controller-manager
     spec:
-      serviceAccountName: cloud-controller-manager
+      serviceAccountName: hcloud-cloud-controller-manager
       dnsPolicy: Default
       tolerations:
-        # this taint is set by all kubelets running `--cloud-provider=external`
-        # so we should tolerate it to schedule the cloud controller manager
+        # Allow HCCM itself to schedule on nodes that have not yet been initialized by HCCM.
         - key: "node.cloudprovider.kubernetes.io/uninitialized"
           value: "true"
           effect: "NoSchedule"
         - key: "CriticalAddonsOnly"
           operator: "Exists"
-        # cloud controller manages should be able to run on masters
+
+        # Allow HCCM to schedule on control plane nodes.
         - key: "node-role.kubernetes.io/master"
           effect: NoSchedule
+          operator: Exists
         - key: "node-role.kubernetes.io/control-plane"
           effect: NoSchedule
+          operator: Exists
+
         - key: "node.kubernetes.io/not-ready"
-          effect: "NoSchedule"
+          effect: "NoExecute"
       containers:
-        - image: hetznercloud/hcloud-cloud-controller-manager:v1.13.2
-          name: hcloud-cloud-controller-manager
+        - name: hcloud-cloud-controller-manager
           command:
             - "/bin/hcloud-cloud-controller-manager"
+            - "--allow-untagged-cloud"
             - "--cloud-provider=hcloud"
+            - "--route-reconciliation-period=30s"
+            - "--webhook-secure-port=0"
             - "--leader-elect=false"
-            - "--allow-untagged-cloud"
-          resources:
-            requests:
-              cpu: 100m
-              memory: 50Mi
           env:
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
             - name: HCLOUD_TOKEN
               valueFrom:
                 secretKeyRef:
-                  name: hcloud
                   key: token
+                  name: hcloud
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            # manually added start
             - name: HCLOUD_NETWORK
               valueFrom:
                 secretKeyRef:
-                  name: hcloud
                   key: network
+                  name: hcloud
             - name: HCLOUD_NETWORK_ROUTES_ENABLED
               value: "false"
+            # manually added end
+          image: hetznercloud/hcloud-cloud-controller-manager:v1.18.0 # x-release-please-version
+          ports:
+            - name: metrics
+              containerPort: 8233
+          resources:
+            requests:
+              cpu: 100m
+              memory: 50Mi
       priorityClassName: system-cluster-critical