From e533438a5bda0a02d5d92fafa3c6b68e26f712d2 Mon Sep 17 00:00:00 2001 From: Max Pfeiffer Date: Sat, 3 Jan 2026 18:02:06 +0100 Subject: [PATCH] Updated providers, formatting --- README.md | 2 +- proxmox/.terraform.lock.hcl | 92 ++++++++++++++++++------------------- proxmox/helm_templates.tf | 2 +- proxmox/providers.tf | 6 +-- proxmox/talos_linux.tf | 16 +++---- proxmox/virtual_machines.tf | 2 + 6 files changed, 61 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index d1fcecf..c07af07 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A turnkey Kubernetes cluster built with [Talos Linux](https://www.talos.dev/) ru Provisioning is done with [OpenTofu](https://opentofu.org/). Kubernetes cluster features: -* Kubernetes v1.34.1 +* Kubernetes v1.34.2 * no kube-proxy * [Cilium v1.18.3](https://cilium.io/) as Container Network Interface (CNI) * without kube-proxy diff --git a/proxmox/.terraform.lock.hcl b/proxmox/.terraform.lock.hcl index 7d80d4c..d672601 100644 --- a/proxmox/.terraform.lock.hcl +++ b/proxmox/.terraform.lock.hcl @@ -2,63 +2,63 @@ # Manual edits may be lost in future updates. provider "registry.opentofu.org/hashicorp/helm" { - version = "3.1.0" - constraints = "3.1.0" + version = "3.1.1" + constraints = "3.1.1" hashes = [ - "h1:vORgIBuTBOxVX2zePdQkvOiiQYjVLIKVS22KmJRDxoU=", - "zh:06a22880bb89397d0a99a66e887e1e3b80868ff000bceddf1454e8272b17dc2c", - "zh:3c50a2b50911a0ff165532b11105b09537402c752c138902882264b58c0ac8be", - "zh:516c64e23146d2ed4c033d33064ae79c7e29cd47ec18a71ef2158b009f7d7748", - "zh:84aed195b24cc9c32f7e387b1fc40d1f4ac67ab6ab32d84e4eeeca2b0c20b851", - "zh:b87f6146284dc745b32b9612583ed9ebd9488e932ca2c210afb29a351be2dfec", - "zh:cbba392b7e9ec83299e37999c779f744ef4ca8b4abe0ba19e5feaadf2aee6580", - "zh:dd82576699bca89f503b9d1328e0194fb24cf7e99194df98844e8cc127dfc45f", - "zh:e78fa0476d67623c252672e01b81192c7df07c1416433136f4f82ce451d533ce", - "zh:eac219620b2abfe12a4b392f75d90bcb209d9734c8c6f63917f808881ec6ce30", + "h1:brfn5YltnzexsfqpWKw+5gS9U/m77e0An3hZQamlEZk=", + "zh:09b38905e234c2e0b185332819614224660050b7e4b25e9e858b593ab01adafe", + "zh:09fed1b19b8bcded169fb76304e06c5b1216d5ceba92948c23384f34ddbf1fac", + "zh:2e0af220f3fe79048d82f6de91752ba9929c215819d3de4f82ccb473bcd9e5df", + "zh:5fe8657cbf6aca769b9565a4fb4605d7b441c2c558d915b067c0adf6f77c58d4", + "zh:713943f797be3a4c6fc6bb5f1306c4f74762bfaa663f98fd8b4c49d28ee54ecf", + "zh:b426458c0bbad64f9000c11af7e74a24ce9e0adb3037c05dadf80c0c3e757931", + "zh:c0664866280a42156484a48f6c461d0ddb2d212da9b6e930c721ef577ab75270", + "zh:e4f9d0ebb70d63d8ac3ccee00a4d8cdb15b97aaa390f95ed65921e9d0f65bfa0", + "zh:f6fe7ecfafc344f4e6aecacf5ae12ac73b94389b9679dcd0f04fc5ff45bdc066", ] } provider "registry.opentofu.org/siderolabs/talos" { - version = "0.9.0" - constraints = "0.9.0" + version = "0.10.0" + constraints = "0.10.0" hashes = [ - "h1:50TaymX/KnjXcURmpKsVd7JUyLRrMDNXMHFgqzSe88U=", + "h1:nFn2rYLkst+Bt9qSmtB0hIfV6iaZ98rqYc5TSZDhwzc=", + "zh:0640a27e658d5305c055721290a196780194c7f75ace9fd3461e0e2a8e465410", "zh:0fa82a384b25a58b65523e0ea4768fa1212b1f5cfc0c9379d31162454fedcc9d", - "zh:249ab08b810bb96ef7c35354a12622907df7cbda59c83ff314ee85e8b851128d", - "zh:4f284c21f0cb4b7012fdb231ebba4803e5c389f7ea380fb5958ebfa6b822d055", - "zh:6049f8d06bc92ab1a46d56c2b37799e6a1b7ce3c61905acf8f0c2009942be8ac", - "zh:7de5f0a6429c6856ade3c7e59d5041a7fe8e0010aea14a2074e91f8a526283ce", - "zh:9760420cf5feec0550556664962bc6f1af45115b9ea5bcbf47aa9bffd3dd4ac2", - "zh:9860272a9fbcea65393c478dc579ad2677a44338de24677702ce699a027801aa", - "zh:a60311a8bf267b18dcf1c8250f45e371b51c6aef086e037a3f9496602f190187", - "zh:b74c119b2a964cae8d17b5b5f14c8eecf44708e3817c1f65ac89b813856aed98", - "zh:bc33e14650052c246ac2e6492a0a24755d4e8d27cb7259e3996f07b0537f2c77", - "zh:c4bc2c65b3dcef2508c14dbbfc18937c5ede11670c02a644cbc28c83a57de92b", - "zh:c98bf4809220568d76ea2db232a88a60c29fd90d4c9e2f8c8a68cf91ceed066a", - "zh:de0179ee9c55bf36d3474049ceac3a105ed7bc1fb9c4787d4076c4b15d268b66", - "zh:e99e019d950131c2c4259c1cbca1d072cb813bdfdbbbf9359f5901d6b7542a0d", - "zh:feb941cc673692c6858f96590f3ca082683a62aa2d2842b9bfffcd327eb840d3", + "zh:1340a04eec0b33e08cca08aa414b53c8e279ec32d22bec828faa17c6043119ba", + "zh:1ab34b5dca009111238b9a787c618ea61585646b1a2f6364d57c7906bbe31d12", + "zh:22ec1058cf4e75af80edc00777250129f6d211e020da2fd256b288bce215d9ea", + "zh:334526c85d40fb87b772ec6eb00e7334940e17bb6c8ffe7dc9a7e22438487f1a", + "zh:38def6886f13da461535d1691d90ff6d700a111edb8fd2c49058b9ad071c6bb6", + "zh:3e63031980d12419efa0af2a398c17e3f75d6326fc49a298c689fc451efdd9cf", + "zh:48e71c03bb4f05cc6d6649f1c197669f170c60f63fbcd8f0a5c19a4e449113d9", + "zh:61bfcb5f5cd594b0a445a87f8450183ed376c973e3a2d3a8916f3daccd19ceb3", + "zh:8c06d6cfecd57a8a7c0d07d3bba0f9ebf8dda68068d1e2ca2f7fd30af4c629a0", + "zh:9ecc15da7a8e8ae94908fbf7cb662c26fbf028a2eeb5496121593ee549e408d5", + "zh:be6925cb91e302e1e7b7d161c3204d259b5f2c7d5b8ea315765ee493033b0b52", + "zh:c4b02f4271265e03ca473f330704d2010a6f6836b0fb26d17c7df758f8ec058c", + "zh:d3a9cd0451d55b71639ce97f561bdf0ebdbde5e4710a39bef75e0128c3efcd73", ] } provider "registry.opentofu.org/telmate/proxmox" { - version = "3.0.2-rc04" - constraints = "3.0.2-rc04" + version = "3.0.2-rc07" + constraints = "3.0.2-rc07" hashes = [ - "h1:ZPr93UUVOw1aCqsODLXsqNQ9Lq/WafX5jgCCLxKBHl4=", - "zh:00586a3e02061734f5ff4c309696ec1bbd6e00a7ed1281c44626f02929417f6e", - "zh:05af12aababd0a67a95309a803123f3c238b16ecdb73dc59c8d9c3d4a0b691c5", - "zh:4b6457bd0138f5c66c8b7043bdbffe3b8abcce2383293d77f653dbd77d14428f", - "zh:7b1b6e76d6b03c7829b8dadeb30de236782be314f5146d9f29ee12bd01961d7a", - "zh:87c21e0a8244b73c62ad3221773ec1c72fb918e0025b0664183a8ad8bebeb5bc", - "zh:954997c550285dfc167977683b97b045dd62923c251fad32c4ca81b564c2005f", - "zh:98781ef0199877580256e9f9a7f0666107f76af23f54f67d6392a66a6f5001b5", - "zh:9fc4dbd1752e2b9125223be2dd25597c0e6d534aa784c4829af3c3e3e58eb973", - "zh:a3f672019aee2d45c202668b95c48113e3c50001b740bd48956738ad1418c6b7", - "zh:a539852a4034132442e6dc6f644444994d83b0dc7a4d30bbe6464de420cfdf2d", - "zh:aade0b50a559a1da683c49ec8527e5e66b12ed42d4b1f10e69b25cbbf6c67805", - "zh:bdb7c2b78cfe039247948fa75fad49f871f8a8bb9b969aec4c45a24edc80ab0f", - "zh:c16209a6748f87a379a5a3132ca4f471a4807bd478664499593e09433ba39b7b", - "zh:cb015fb4a0a50d151c35c6a3505cdf7a337edd0b65eba82a43c8142c523adfb8", + "h1:0UpRJ8PFsu9lhD3p2KUdUNVsDPbjZLPR46wYRpt1dxc=", + "zh:2ee860cd0a368b3eaa53f4a9ea46f16dab8a97929e813ea6ef55183f8112c2ca", + "zh:415965fd915bae2040d7f79e45f64d6e3ae61149c10114efeac1b34687d7296c", + "zh:6584b2055df0e32062561c615e3b6b2c291ca8c959440adda09ef3ec1e1436bd", + "zh:65dcfad71928e0a8dd9befc22524ed686be5020b0024dc5cca5184c7420eeb6b", + "zh:7253dc29bd265d33f2791ac4f779c5413f16720bb717de8e6c5fcb2c858648ea", + "zh:7ec8993da10a47606670f9f67cfd10719a7580641d11c7aa761121c4a2bd66fb", + "zh:999a3f7a9dcf517967fc537e6ec930a8172203642fb01b8e1f78f908373db210", + "zh:a50e6df7280eb6584a5fd2456e3f5b6df13b2ec8a7fa4605511e438e1863be42", + "zh:b25b329a1e42681c509d027fee0365414f0cc5062b65690cfc3386aab16132ae", + "zh:c028877fdb438ece48f7bc02b65bbae9ca7b7befbd260e519ccab6c0cbb39f26", + "zh:cf0eaa3ea9fcc6d62793637947f1b8d7c885b6ad74695ab47e134e4ff132190f", + "zh:d5ade3fae031cc629b7c512a7b60e46570f4c41665e88a595d7efd943dde5ab2", + "zh:f388c15ad1ecfc09e7361e3b98bae9b627a3a85f7b908c9f40650969c949901c", + "zh:f415cc6f735a3971faae6ac24034afdb9ee83373ef8de19a9631c187d5adc7db", ] } diff --git a/proxmox/helm_templates.tf b/proxmox/helm_templates.tf index 8e64fa2..af51ab1 100644 --- a/proxmox/helm_templates.tf +++ b/proxmox/helm_templates.tf @@ -79,7 +79,7 @@ data "helm_template" "cilium" { { name = "gatewayAPI.gatewayClass.create" value = "true" - type = "string" + type = "string" }, # Egress Gateway # See: https://docs.cilium.io/en/stable/network/egress-gateway/egress-gateway/ diff --git a/proxmox/providers.tf b/proxmox/providers.tf index ce9aee8..8e59338 100644 --- a/proxmox/providers.tf +++ b/proxmox/providers.tf @@ -2,15 +2,15 @@ terraform { required_providers { proxmox = { source = "telmate/proxmox" - version = "3.0.2-rc04" + version = "3.0.2-rc07" } talos = { source = "siderolabs/talos" - version = "0.9.0" + version = "0.10.0" } helm = { source = "hashicorp/helm" - version = "3.1.0" + version = "3.1.1" } } } diff --git a/proxmox/talos_linux.tf b/proxmox/talos_linux.tf index e1a5834..5ddaca7 100644 --- a/proxmox/talos_linux.tf +++ b/proxmox/talos_linux.tf @@ -32,15 +32,15 @@ resource "talos_machine_configuration_apply" "controlplane" { node = each.key config_patches = [ templatefile("${path.module}/templates/machine_config_patches_controlplane.tftpl", { - hostname = each.value.hostname == null ? format("%s-cp-%s", var.cluster_name, index(keys(var.node_data.controlplanes), each.key)) : each.value.hostname - install_disk = each.value.install_disk - install_image = each.value.install_image - ip_address = "${each.key}/24" - network = var.network - network_gateway = var.network_gateway - vip_shared_ip = var.cluster_vip_shared_ip + hostname = each.value.hostname == null ? format("%s-cp-%s", var.cluster_name, index(keys(var.node_data.controlplanes), each.key)) : each.value.hostname + install_disk = each.value.install_disk + install_image = each.value.install_image + ip_address = "${each.key}/24" + network = var.network + network_gateway = var.network_gateway + vip_shared_ip = var.cluster_vip_shared_ip gateway_api_manifest = file("${path.module}/gateway-api/gateway-api-crds-v1.3.yaml") - cilium_manifest = data.helm_template.cilium.manifest + cilium_manifest = data.helm_template.cilium.manifest }), ] } diff --git a/proxmox/virtual_machines.tf b/proxmox/virtual_machines.tf index 06793f5..95c3978 100644 --- a/proxmox/virtual_machines.tf +++ b/proxmox/virtual_machines.tf @@ -8,6 +8,7 @@ resource "proxmox_vm_qemu" "kubernetes_control_plane" { vm_state = "running" memory = 8192 boot = "order=virtio0;ide2" + nameserver = var.domain_name_server cpu { cores = 2 @@ -60,6 +61,7 @@ resource "proxmox_vm_qemu" "kubernetes_worker" { vm_state = "running" memory = 16384 boot = "order=virtio0;ide2" + nameserver = var.domain_name_server cpu { cores = 2