chore: update hetzner configuration

Update the example Packer and Terraform configuration.
- Remove "wait" from talos_cluster_kubeconfig
- Update Talos version from v1.3.0 to v1.6.0
- Update Hetzner server types
- Update Hetzner Terraform provider
- Set talos_version and kubernetes_version

Signed-off-by: Andrew Longwill <[email protected]>

Author: alongwill

examples/terraform/basic/main.tf

@@ -58,5 +58,4 @@ resource "talos_cluster_kubeconfig" "this" {
   depends_on           = [talos_machine_bootstrap.this]
   client_configuration = talos_machine_secrets.this.client_configuration
   node                 = [for k, v in var.node_data.controlplanes : k][0]
-  wait                 = true
 }

examples/terraform/hcloud/packer/hcloud_talosimage.pkr.hcl

@@ -11,7 +11,7 @@ packer {
 
 variable "talos_version" {
   type    = string
-  default = "v1.3.0"
+  default = "v1.6.0"
 }
 
 locals {
@@ -20,9 +20,9 @@ locals {
 
 source "hcloud" "talos" {
   rescue       = "linux64"
-  image        = "debian-11"
+  image        = "debian-12"
   location     = "fsn1"
-  server_type  = "cx11"
+  server_type  = "cx22"
   ssh_username = "root"
 
   snapshot_name = "talos system disk ${var.talos_version}"

examples/terraform/hcloud/terraform/.terraform.lock.hcl

@@ -3,14 +3,14 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_hcloud"></a> [hcloud](#requirement\_hcloud) | 1.35.2 |
+| <a name="requirement_hcloud"></a> [hcloud](#requirement\_hcloud) | 1.48.1 |
 | <a name="requirement_talos"></a> [talos](#requirement\_talos) | 0.6.0-beta.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_hcloud"></a> [hcloud](#provider\_hcloud) | 1.35.2 |
+| <a name="provider_hcloud"></a> [hcloud](#provider\_hcloud) | 1.48.1 |
 | <a name="provider_talos"></a> [talos](#provider\_talos) | 0.6.0-beta.0 |
 
 ## Modules
@@ -21,17 +21,17 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [hcloud_load_balancer.controlplane_load_balancer](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer) | resource |
-| [hcloud_load_balancer_network.srvnetwork](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer_network) | resource |
-| [hcloud_load_balancer_service.controlplane_load_balancer_service_kubectl](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer_service) | resource |
-| [hcloud_load_balancer_service.controlplane_load_balancer_service_mayastor](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer_service) | resource |
-| [hcloud_load_balancer_service.controlplane_load_balancer_service_talosctl](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer_service) | resource |
-| [hcloud_load_balancer_target.load_balancer_target](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/load_balancer_target) | resource |
-| [hcloud_network.network](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/network) | resource |
-| [hcloud_network_subnet.subnet](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/network_subnet) | resource |
-| [hcloud_server.controlplane_server](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/server) | resource |
-| [hcloud_server.worker_server](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/server) | resource |
-| [hcloud_volume.volumes](https://registry.terraform.io/providers/hetznercloud/hcloud/1.35.2/docs/resources/volume) | resource |
+| [hcloud_load_balancer.controlplane_load_balancer](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer) | resource |
+| [hcloud_load_balancer_network.srvnetwork](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer_network) | resource |
+| [hcloud_load_balancer_service.controlplane_load_balancer_service_kubectl](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer_service) | resource |
+| [hcloud_load_balancer_service.controlplane_load_balancer_service_mayastor](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer_service) | resource |
+| [hcloud_load_balancer_service.controlplane_load_balancer_service_talosctl](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer_service) | resource |
+| [hcloud_load_balancer_target.load_balancer_target](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/load_balancer_target) | resource |
+| [hcloud_network.network](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/network) | resource |
+| [hcloud_network_subnet.subnet](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/network_subnet) | resource |
+| [hcloud_server.controlplane_server](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/server) | resource |
+| [hcloud_server.worker_server](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/server) | resource |
+| [hcloud_volume.volumes](https://registry.terraform.io/providers/hetznercloud/hcloud/1.48.1/docs/resources/volume) | resource |
 | [talos_cluster_kubeconfig.this](https://registry.terraform.io/providers/siderolabs/talos/0.6.0-beta.0/docs/resources/cluster_kubeconfig) | resource |
 | [talos_machine_bootstrap.bootstrap](https://registry.terraform.io/providers/siderolabs/talos/0.6.0-beta.0/docs/resources/machine_bootstrap) | resource |
 | [talos_machine_secrets.this](https://registry.terraform.io/providers/siderolabs/talos/0.6.0-beta.0/docs/resources/machine_secrets) | resource |
@@ -45,14 +45,16 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | A name to provide for the Talos cluster | `string` | `"talos-hloud-cluster"` | no |
 | <a name="input_controlplane_ip"></a> [controlplane\_ip](#input\_controlplane\_ip) | n/a | `string` | `"10.0.0.3"` | no |
-| <a name="input_controlplane_type"></a> [controlplane\_type](#input\_controlplane\_type) | Control plane | `string` | `"cpx31"` | no |
+| <a name="input_controlplane_type"></a> [controlplane\_type](#input\_controlplane\_type) | Control plane | `string` | `"cx32"` | no |
 | <a name="input_image_id"></a> [image\_id](#input\_image\_id) | Talos specific variables | `string` | n/a | yes |
+| <a name="input_kubernetes_version"></a> [kubernetes\_version](#input\_kubernetes\_version) | Kubernetes version to use for the cluster, if not set the k8s version shipped with the talos sdk version will be used | `string` | `null` | no |
 | <a name="input_load_balancer_type"></a> [load\_balancer\_type](#input\_load\_balancer\_type) | n/a | `string` | `"lb11"` | no |
 | <a name="input_location"></a> [location](#input\_location) | Workers | `string` | `"fsn1"` | no |
 | <a name="input_network_zone"></a> [network\_zone](#input\_network\_zone) | Load balancer | `string` | `"eu-central"` | no |
 | <a name="input_private_network_ip_range"></a> [private\_network\_ip\_range](#input\_private\_network\_ip\_range) | n/a | `string` | `"10.0.0.0/16"` | no |
 | <a name="input_private_network_name"></a> [private\_network\_name](#input\_private\_network\_name) | Networking | `string` | `"talos-network"` | no |
 | <a name="input_private_network_subnet_range"></a> [private\_network\_subnet\_range](#input\_private\_network\_subnet\_range) | n/a | `string` | `"10.0.0.0/24"` | no |
+| <a name="input_talos_version_contract"></a> [talos\_version\_contract](#input\_talos\_version\_contract) | Talos API version to use for the cluster, if not set the the version shipped with the talos sdk version will be used | `string` | `"v1.6"` | no |
 | <a name="input_worker_extra_volume_size"></a> [worker\_extra\_volume\_size](#input\_worker\_extra\_volume\_size) | Size of SSD volume to attach to workers | `number` | `10` | no |
 | <a name="input_workers"></a> [workers](#input\_workers) | Worker definition | `any` | n/a | yes |
 

examples/terraform/hcloud/terraform/README.md

@@ -62,14 +62,18 @@ resource "hcloud_load_balancer_service" "controlplane_load_balancer_service_maya
 
 # Talos
 # create the machine secrets
-resource "talos_machine_secrets" "this" {}
+resource "talos_machine_secrets" "this" {
+  talos_version = var.talos_version_contract
+}
 
 # create the controlplane config, using the loadbalancer as cluster endpoint
 data "talos_machine_configuration" "controlplane" {
-  cluster_name     = var.cluster_name
-  cluster_endpoint = "https://${hcloud_load_balancer.controlplane_load_balancer.ipv4}:6443"
-  machine_type     = "controlplane"
-  machine_secrets  = talos_machine_secrets.this.machine_secrets
+  cluster_name       = var.cluster_name
+  cluster_endpoint   = "https://${hcloud_load_balancer.controlplane_load_balancer.ipv4}:6443"
+  machine_type       = "controlplane"
+  machine_secrets    = talos_machine_secrets.this.machine_secrets
+  talos_version      = var.talos_version_contract
+  kubernetes_version = var.kubernetes_version
   config_patches = [
     templatefile("${path.module}/templates/controlplanepatch.yaml.tmpl", {
       loadbalancerip = hcloud_load_balancer.controlplane_load_balancer.ipv4, subnet = var.private_network_subnet_range
@@ -117,10 +121,12 @@ resource "talos_machine_bootstrap" "bootstrap" {
 
 # create the worker config and apply the worker patch
 data "talos_machine_configuration" "worker" {
-  cluster_name     = var.cluster_name
-  cluster_endpoint = "https://${hcloud_load_balancer.controlplane_load_balancer.ipv4}:6443"
-  machine_type     = "worker"
-  machine_secrets  = talos_machine_secrets.this.machine_secrets
+  cluster_name       = var.cluster_name
+  cluster_endpoint   = "https://${hcloud_load_balancer.controlplane_load_balancer.ipv4}:6443"
+  machine_type       = "worker"
+  machine_secrets    = talos_machine_secrets.this.machine_secrets
+  talos_version      = var.talos_version_contract
+  kubernetes_version = var.kubernetes_version
   config_patches = [
     templatefile("${path.module}/templates/workerpatch.yaml.tmpl", {
       subnet = var.private_network_subnet_range
@@ -164,5 +170,4 @@ resource "hcloud_volume" "volumes" {
 resource "talos_cluster_kubeconfig" "this" {
   client_configuration = talos_machine_secrets.this.client_configuration
   node                 = hcloud_server.controlplane_server.ipv4_address
-  wait                 = true
 }

examples/terraform/hcloud/terraform/main.tf

@@ -1,20 +1,20 @@
 workers = {
   1 = {
-    server_type = "cpx31",
+    server_type = "cx32",
     name        = "talos-worker-1",
     location    = "fsn1",
     labels      = { "type" : "talos-worker" },
     taints      = [],
   },
   2 = {
-    server_type = "cpx31",
+    server_type = "cx32",
     name        = "talos-worker-2",
     location    = "fsn1",
     labels      = { "type" : "talos-worker" },
     taints      = [],
   },
   3 = {
-    server_type = "cpx31",
+    server_type = "cx32",
     name        = "talos-worker-3",
     location    = "fsn1",
     labels      = { "type" : "talos-worker" },

examples/terraform/hcloud/terraform/three_workers.tfvars

@@ -9,9 +9,21 @@ variable "cluster_name" {
   default     = "talos-hloud-cluster"
 }
 
+variable "talos_version_contract" {
+  description = "Talos API version to use for the cluster, if not set the the version shipped with the talos sdk version will be used"
+  type        = string
+  default     = "v1.6"
+}
+
+variable "kubernetes_version" {
+  description = "Kubernetes version to use for the cluster, if not set the k8s version shipped with the talos sdk version will be used"
+  type        = string
+  default     = null
+}
+
 # Control plane
 variable "controlplane_type" {
-  default = "cpx31"
+  default = "cx32"
 }
 
 variable "controlplane_ip" {
@@ -51,7 +63,7 @@ variable "workers" {
 }
 
 variable "worker_extra_volume_size" {
-  description = " Size of SSD volume to attach to workers"
+  description = "Size of SSD volume to attach to workers"
   type        = number
   default     = 10
 }

examples/terraform/hcloud/terraform/variables.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     hcloud = {
       source  = "hetznercloud/hcloud"
-      version = "1.35.2"
+      version = "1.48.1"
     }
     talos = {
       source  = "siderolabs/talos"