From ac47c8b8096db4dad014a8cce878b952e13edb1f Mon Sep 17 00:00:00 2001 From: pgijsbertsen <117165507+pgijsbertsen@users.noreply.github.com> Date: Tue, 18 Nov 2025 22:14:35 +0100 Subject: [PATCH] chore: Update IP addresses --- pve01.wheatley.in/k8s-wheatley/main.tf | 28 ++++++------------- .../templates/cilium-install.yaml.tmpl | 2 +- .../templates/machineconfig-cp.yaml.tmpl | 2 +- .../templates/machineconfig-worker.yaml.tmpl | 2 +- .../k8s-wheatley/modules/talos-node/main.tf | 3 +- pve01.wheatley.in/templates/talos/main.tf | 3 +- 6 files changed, 15 insertions(+), 25 deletions(-) diff --git a/pve01.wheatley.in/k8s-wheatley/main.tf b/pve01.wheatley.in/k8s-wheatley/main.tf index e0e41b0..48ae1dc 100644 --- a/pve01.wheatley.in/k8s-wheatley/main.tf +++ b/pve01.wheatley.in/k8s-wheatley/main.tf @@ -1,7 +1,6 @@ provider "proxmox" { endpoint = var.proxmox_endpoint api_token = var.proxmox_api_token - insecure = true } locals { @@ -11,15 +10,14 @@ locals { talos_version = "1.11.5" gateway_api_version = "1.3.0" cilium_version = "1.18.4" - ipv4_gateway = "10.13.38.1" - cluster_endpoint_ip = "10.13.38.10" + ipv4_gateway = "10.13.37.1" + cluster_endpoint_ip = "10.13.37.10" proxmox_node = "pve01" - controlplanes = { cpu = 4 memory = 8 - disk = 40 + disk = 20 storagepool = "nvme-fastpool" talos_version = local.talos_version cluster_name = local.cluster_name @@ -28,15 +26,15 @@ locals { nodes = [ { name = "cp01" - ip_address = "10.13.38.11" + ip_address = "10.13.37.11" }, { name = "cp02" - ip_address = "10.13.38.12" + ip_address = "10.13.37.12" }, { name = "cp03" - ip_address = "10.13.38.13" + ip_address = "10.13.37.13" }, ] } @@ -59,23 +57,15 @@ locals { nodes = [ { name = "worker01" - ip_address = "10.13.38.21" + ip_address = "10.13.37.21" }, { name = "worker02" - ip_address = "10.13.38.22" + ip_address = "10.13.37.22" }, { name = "worker03" - ip_address = "10.13.38.23" - }, - { - name = "worker04" - ip_address = "10.13.38.24" - }, - { - name = "worker05" - ip_address = "10.13.38.25" + ip_address = "10.13.37.23" }, ] } diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl index 183dc29..a18f449 100644 --- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/cilium-install.yaml.tmpl @@ -85,7 +85,7 @@ spec: - --set - cgroup.hostRoot=/sys/fs/cgroup - --set - - k8sServiceHost=10.13.38.11 + - k8sServiceHost=auto - --set - k8sServicePort=6443 - --set diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl index 54a4d15..bc81f6c 100644 --- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-cp.yaml.tmpl @@ -7,7 +7,7 @@ machine: network: hostname: ${hostname} nameservers: - - 192.168.1.2 + - 9.9.9.9 interfaces: - interface: eth0 dhcp: false diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl index 66e8e8a..95b4d12 100644 --- a/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-bootstrap/templates/machineconfig-worker.yaml.tmpl @@ -7,7 +7,7 @@ machine: network: hostname: ${hostname} nameservers: - - 192.168.1.2 + - 9.9.9.9 kubelet: extraArgs: pod-max-pids: 1000 diff --git a/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf index 9ac4b7c..020a5f5 100644 --- a/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf +++ b/pve01.wheatley.in/k8s-wheatley/modules/talos-node/main.tf @@ -15,6 +15,7 @@ resource "proxmox_virtual_environment_vm" "talos-node" { clone { vm_id = 10000 + tonumber(replace(var.node.talos_version, ".", "")) + retries = 3 } cpu { @@ -53,7 +54,7 @@ resource "proxmox_virtual_environment_vm" "talos-node" { } } dns { - servers = ["192.168.1.2"] + servers = ["9.9.9.9"] } } } diff --git a/pve01.wheatley.in/templates/talos/main.tf b/pve01.wheatley.in/templates/talos/main.tf index cff4fae..fc0e246 100644 --- a/pve01.wheatley.in/templates/talos/main.tf +++ b/pve01.wheatley.in/templates/talos/main.tf @@ -1,11 +1,10 @@ provider "proxmox" { endpoint = var.proxmox_endpoint api_token = var.proxmox_api_token - insecure = true } locals { - talos_versions = ["1.11.4", "1.11.5"] + talos_versions = ["1.11.5"] } data "http" "schematic" {