diff --git a/hetzner/Makefile b/hetzner/Makefile index 30bb660..3244560 100644 --- a/hetzner/Makefile +++ b/hetzner/Makefile @@ -24,8 +24,8 @@ create-config: ## Genereate talos configs talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT} create-templates: - @echo 'podSubnets: "10.32.0.0/12,fd40:10:32::/96"' > _cfgs/tfstate.vars - @echo 'serviceSubnets: "10.200.0.0/22,fd40:10:200::/112"' >> _cfgs/tfstate.vars + @echo 'podSubnets: "10.32.0.0/12,fd40:10:32::/64"' > _cfgs/tfstate.vars + @echo 'serviceSubnets: "10.200.0.0/22,fd40:10:200::/108"' >> _cfgs/tfstate.vars @echo 'apiDomain: api.cluster.local' >> _cfgs/tfstate.vars @yq eval '.cluster.network.dnsDomain' _cfgs/controlplane.yaml | awk '{ print "domain: "$$1}' >> _cfgs/tfstate.vars @yq eval '.cluster.clusterName' _cfgs/controlplane.yaml | awk '{ print "clusterName: "$$1}' >> _cfgs/tfstate.vars diff --git a/hetzner/instances-controlplane.tf b/hetzner/instances-controlplane.tf index d571ccf..961a6d6 100644 --- a/hetzner/instances-controlplane.tf +++ b/hetzner/instances-controlplane.tf @@ -37,6 +37,7 @@ resource "hcloud_server" "controlplane" { alias_ips = each.key == keys(local.controlplanes)[0] ? [local.ipv4_vip] : [] } + shutdown_before_deletion = true lifecycle { ignore_changes = [ network, diff --git a/hetzner/instances-web.tf b/hetzner/instances-web.tf index 6e7dbd8..7f71b72 100644 --- a/hetzner/instances-web.tf +++ b/hetzner/instances-web.tf @@ -46,6 +46,7 @@ resource "hcloud_server" "web" { ipv6_enabled = true } + shutdown_before_deletion = true lifecycle { ignore_changes = [ image, diff --git a/hetzner/instances-worker.tf b/hetzner/instances-worker.tf index f7e1d53..9d44ace 100644 --- a/hetzner/instances-worker.tf +++ b/hetzner/instances-worker.tf @@ -46,6 +46,7 @@ resource "hcloud_server" "worker" { ipv6_enabled = true } + shutdown_before_deletion = true lifecycle { ignore_changes = [ image, diff --git a/hetzner/templates/controlplane.yaml.tpl b/hetzner/templates/controlplane.yaml.tpl index e92abbf..62ca450 100644 --- a/hetzner/templates/controlplane.yaml.tpl +++ b/hetzner/templates/controlplane.yaml.tpl @@ -123,7 +123,7 @@ cluster: externalCloudProvider: enabled: true manifests: - - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/hetzner/deployments/talos-cloud-controller-manager-result.yaml + # - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/hetzner/deployments/talos-cloud-controller-manager-result.yaml - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/hetzner/deployments/hcloud-cloud-controller-manager-result.yaml - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/_deployments/vars/local-path-storage-ns.yaml - https://raw.githubusercontent.com/sergelogvinov/terraform-talos/main/_deployments/vars/local-path-storage-result.yaml diff --git a/hetzner/variables.tf b/hetzner/variables.tf index a9734cd..dae4282 100644 --- a/hetzner/variables.tf +++ b/hetzner/variables.tf @@ -84,7 +84,7 @@ variable "instances" { type = map(any) default = { "all" = { - version = "v1.30.2" + version = "v1.30.3" }, "nbg1" = { web_count = 0,