Merge pull request #16523 from hakman/hetzner-up

hetzner: Update components before release
kubernetes · May 5, 2024 · 8fe0567 · 8fe0567
2 parents 3d43f9e + 36c5409
commit 8fe0567
Show file tree

Hide file tree

Showing 7 changed files with 581 additions and 505 deletions.
diff --git a/pkg/model/components/hetznercloudcontrollermanager.go b/pkg/model/components/hetznercloudcontrollermanager.go
@@ -55,7 +55,7 @@ func (b *HetznerCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}
 	eccm.ConfigureCloudRoutes = fi.PtrTo(false)
 
 	if eccm.Image == "" {
-		eccm.Image = "hetznercloud/hcloud-cloud-controller-manager:v1.16.0"
+		eccm.Image = "hetznercloud/hcloud-cloud-controller-manager:v1.19.0"
 	}
 
 	return nil

diff --git a/...egration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content b/...egration/update_cluster/minimal_hetzner/data/aws_s3_object_cluster-completed.spec_content
@@ -18,7 +18,7 @@ spec:
     cloudProvider: hcloud
     clusterCIDR: 100.96.0.0/11
     configureCloudRoutes: false
-    image: hetznercloud/hcloud-cloud-controller-manager:v1.16.0
+    image: hetznercloud/hcloud-cloud-controller-manager:v1.19.0
     leaderElection:
       leaderElect: false
   cloudProvider: hetzner

diff --git a/...e_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/...e_cluster/minimal_hetzner/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -34,14 +34,14 @@ spec:
     version: 9.99.0
   - id: k8s-1.22
     manifest: hcloud-cloud-controller.addons.k8s.io/k8s-1.22.yaml
-    manifestHash: 6afe8a04e648a1df0a64e22dfe70f7f2b6b82a121c6595a3078f9bdcebbb7cd1
+    manifestHash: 734a1bfdeb92881a6fee5079b13805bb25a519ab7dc2b13f8b192c9107b1faa4
     name: hcloud-cloud-controller.addons.k8s.io
     selector:
       k8s-addon: hcloud-cloud-controller.addons.k8s.io
     version: 9.99.0
   - id: k8s-1.22
     manifest: hcloud-csi-driver.addons.k8s.io/k8s-1.22.yaml
-    manifestHash: f86445654ced20b614f6031d14a5fea5cf61fdc98f39968407af67a0ddb258e9
+    manifestHash: 17957f9bc33c605a2dca8ce3ff59844023fc8079bb1a4f08025eb5e18d0c2968
     name: hcloud-csi-driver.addons.k8s.io
     selector:
       k8s-addon: hcloud-csi-driver.addons.k8s.io

diff --git a/..._object_minimal.example.com-addons-hcloud-cloud-controller.addons.k8s.io-k8s-1.22_content b/..._object_minimal.example.com-addons-hcloud-cloud-controller.addons.k8s.io-k8s-1.22_content
@@ -22,7 +22,7 @@ metadata:
     addon.kops.k8s.io/name: hcloud-cloud-controller.addons.k8s.io
     app.kubernetes.io/managed-by: kops
     k8s-addon: hcloud-cloud-controller.addons.k8s.io
-  name: cloud-controller-manager
+  name: hcloud-cloud-controller-manager
   namespace: kube-system
 
 ---
@@ -35,14 +35,14 @@ metadata:
     addon.kops.k8s.io/name: hcloud-cloud-controller.addons.k8s.io
     app.kubernetes.io/managed-by: kops
     k8s-addon: hcloud-cloud-controller.addons.k8s.io
-  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
 
 ---
@@ -82,10 +82,6 @@ spec:
         - --v=2
         - --use-service-account-credentials=true
         env:
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
         - name: HCLOUD_TOKEN
           valueFrom:
             secretKeyRef:
@@ -96,7 +92,7 @@ spec:
             secretKeyRef:
               key: network
               name: hcloud
-        image: hetznercloud/hcloud-cloud-controller-manager:v1.16.0
+        image: hetznercloud/hcloud-cloud-controller-manager:v1.19.0
         name: hcloud-cloud-controller-manager
         ports:
         - containerPort: 8233
@@ -107,7 +103,7 @@ spec:
             memory: 50Mi
       dnsPolicy: Default
       priorityClassName: system-cluster-critical
-      serviceAccountName: cloud-controller-manager
+      serviceAccountName: hcloud-cloud-controller-manager
       tolerations:
       - effect: NoSchedule
         key: node.cloudprovider.kubernetes.io/uninitialized