diff --git a/tofu/kubernetes/talos/config.tf b/tofu/kubernetes/talos/config.tf index 4444293..df78322 100644 --- a/tofu/kubernetes/talos/config.tf +++ b/tofu/kubernetes/talos/config.tf @@ -54,14 +54,15 @@ data "talos_machine_configuration" "this" { machine_secrets = talos_machine_secrets.this.machine_secrets config_patches = [ templatefile("${path.module}/machine-config/common.yaml.tftpl", { - node_name = each.value.host_node - cluster_name = var.cluster.proxmox_cluster - hostname = each.key - ip = each.value.ip + node_name = each.value.host_node + cluster_name = var.cluster.proxmox_cluster + kubernetes_version = var.cluster.kubernetes_version + hostname = each.key + ip = each.value.ip mac_address = lower(each.value.mac_address) - gateway = var.cluster.gateway - subnet_mask = var.cluster.subnet_mask - vip = var.cluster.vip + gateway = var.cluster.gateway + subnet_mask = var.cluster.subnet_mask + vip = var.cluster.vip }), each.value.machine_type == "controlplane" ? templatefile("${path.module}/machine-config/control-plane.yaml.tftpl", { kubelet = var.cluster.kubelet diff --git a/tofu/kubernetes/talos/machine-config/common.yaml.tftpl b/tofu/kubernetes/talos/machine-config/common.yaml.tftpl index 6ad0a58..b0a6f2f 100644 --- a/tofu/kubernetes/talos/machine-config/common.yaml.tftpl +++ b/tofu/kubernetes/talos/machine-config/common.yaml.tftpl @@ -2,6 +2,8 @@ machine: nodeLabels: topology.kubernetes.io/region: ${cluster_name} topology.kubernetes.io/zone: ${node_name} + kubelet: + image: ghcr.io/siderolabs/kubelet:${kubernetes_version} network: hostname: ${hostname} interfaces: @@ -30,3 +32,13 @@ machine: net.ipv4.tcp_wmem: 4096 65536 33554432 # 10Gb/s net.ipv4.tcp_window_scaling: 1 # 10Gb/s vm.nr_hugepages: 1024 # PostgreSQL + +cluster: + apiServer: + image: registry.k8s.io/kube-apiserver:${kubernetes_version} + controllerManager: + image: registry.k8s.io/kube-controller-manager:${kubernetes_version} + proxy: + image: registry.k8s.io/kube-proxy:${kubernetes_version} + scheduler: + image: registry.k8s.io/kube-scheduler:${kubernetes_version} diff --git a/tofu/kubernetes/talos_cluster.auto.tfvars b/tofu/kubernetes/talos_cluster.auto.tfvars index 74f5525..f664de2 100644 --- a/tofu/kubernetes/talos_cluster.auto.tfvars +++ b/tofu/kubernetes/talos_cluster.auto.tfvars @@ -9,7 +9,7 @@ talos_cluster_config = { # Uncomment to use this instead of version from talos_image. # talos_machine_config_version = "v1.9.2" proxmox_cluster = "homelab" - kubernetes_version = "1.32.3" # renovate: github-releases=kubernetes/kubernetes + kubernetes_version = "v1.32.3" # renovate: github-releases=kubernetes/kubernetes cilium = { bootstrap_manifest_path = "talos/inline-manifests/cilium-install.yaml" values_file_path = "../../k8s/infra/network/cilium/values.yaml"