fix: some test infra stuff and add ping for nodes

Author: PeeK1e

tofu_infra/cloud-init.tf

@@ -10,8 +10,8 @@ apt:
       keyid: DE15B14486CD377B9E876E1A234654DA9A296436
       filename: kubernetes.list
     crio.list:
-      source: "deb [signed-by=$KEY_FILE] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/${var.crio_version}/Debian_12/ /"
-      keyid: 2472D6D0D2F66AF87ABA8DA34D64390375060AA4
+      source: "deb [signed-by=$KEY_FILE] https://pkgs.k8s.io/addons:/cri-o:/stable:/v${var.kube_version}/deb/ /"
+      keyid: DE15B14486CD377B9E876E1A234654DA9A296436
       filename: crio.list
     kubic.list:
       source: "deb [signed-by=$KEY_FILE] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_12/ /"

tofu_infra/control-plane.tf

@@ -3,6 +3,8 @@ resource "hcloud_server" "control-planes" {
   name        = each.value.name
   image       = "debian-12"
   server_type = each.value.type
+  location    = "nbg1"
+
   public_net {
     ipv6_enabled = true
   }

tofu_infra/network.tf

@@ -85,25 +85,21 @@ resource "hcloud_firewall" "k8s_intern" {
 }
 
 resource "hcloud_firewall_attachment" "pub_attachment_worker" {
-  for_each    = hcloud_server.worker
   firewall_id = hcloud_firewall.k8s_pub.id
-  server_ids  = [each.value.id]
+  label_selectors =  [ "vm-type=cp", "vm-type=worker" ]
 }
 
 resource "hcloud_firewall_attachment" "priv_attachment_worker" {
-  for_each    = hcloud_server.worker
   firewall_id = hcloud_firewall.k8s_intern.id
-  server_ids  = [each.value.id]
+  label_selectors =  [ "vm-type=cp", "vm-type=worker" ]
 }
 
 resource "hcloud_firewall_attachment" "pub_attachment_cp" {
-  for_each    = hcloud_server.control-planes
   firewall_id = hcloud_firewall.k8s_pub.id
-  server_ids  = [each.value.id]
+  label_selectors =  [ "vm-type=cp", "vm-type=worker" ]
 }
 
 resource "hcloud_firewall_attachment" "priv_attachment_cp" {
-  for_each    = hcloud_server.control-planes
   firewall_id = hcloud_firewall.k8s_intern.id
-  server_ids  = [each.value.id]
+  label_selectors =  [ "vm-type=cp", "vm-type=worker" ]
 }

tofu_infra/providers.tf

@@ -42,4 +42,4 @@ provider "kubectl" {
   load_config_file  = true
   apply_retry_count = 3
   config_path       = "${path.cwd}/local/kubeconfig"
-}
+}

tofu_infra/variables.tfvars

@@ -1,11 +1,11 @@
-hcloud_token             = "{hcloud api key}"
+hcloud_token = "{hcloud api key}"
 
 # the crio version wanted
-# currently still using the suse mirrors so only <= 1.28 is supported
-crio_version = "1.28"
+# bumped to >1.28, starting with 1.28 there is a repo change. (https://github.com/cri-o/packaging/blob/d12f75b1322d9f8ef90559f51ea55fc09943d3aa/README.md#usage)
+crio_version = "1.30"
 
 # kubernetes version
-kube_version = "1.28"
+kube_version = "1.30"
 
 worker = {
   "w-1" = {
@@ -23,7 +23,7 @@ worker = {
 }
 
 control-plane = {
-  "cp1" = {
+  "cp4" = {
     name = "cp-1"
     type = "cax11"
   },

tofu_infra/worker.tf

@@ -3,6 +3,8 @@ resource "hcloud_server" "worker" {
   name        = each.value.name
   image       = "debian-12"
   server_type = each.value.type
+  location    = "nbg1"
+
   public_net {
     ipv6_enabled = true
   }

upgrade_cluster.yaml

@@ -4,6 +4,8 @@
   become: true
   gather_facts: false
   tasks:
+  - name: Example from an Ansible Playbook
+    ansible.builtin.ping:
   - ansible.builtin.apt:
       package:
         - jq