scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-11-02 19:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix node labels

Browse Source
This commit is contained in:
Serge Logvinov
2024-06-28 15:56:44 +03:00
parent 98916a2ae4
commit dadcb60981
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
proxmox/Makefile
View File

@@ -46,6 +46,7 @@ create-controlplane-bootstrap: ## Bootstrap controlplane
talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT} talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT}
talosctl --talosconfig _cfgs/talosconfig --nodes ${CPFIRST} bootstrap talosctl --talosconfig _cfgs/talosconfig --nodes ${CPFIRST} bootstrap
.PHONY: kubeconfig
kubeconfig: ## Prepare kubeconfig kubeconfig: ## Prepare kubeconfig
rm -f kubeconfig rm -f kubeconfig
talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT} talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT}

2
proxmox/instances-db.tf
View File

@@ -43,7 +43,7 @@ resource "proxmox_virtual_environment_file" "db_machineconfig" {
source_raw { source_raw {
data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "db_template", "worker.yaml.tpl")}", data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "db_template", "worker.yaml.tpl")}",
merge(local.kubernetes, try(var.instances["all"], {}), { merge(local.kubernetes, try(var.instances["all"], {}), {
labels = join(",", [local.web_labels, lookup(var.instances[each.value.zone], "db_labels", "")]) labels = join(",", [local.db_labels, lookup(var.instances[each.value.zone], "db_labels", "")])
nodeSubnets = [local.subnets[each.value.zone], var.vpc_main_cidr[1]] nodeSubnets = [local.subnets[each.value.zone], var.vpc_main_cidr[1]]
lbv4 = local.lbv4 lbv4 = local.lbv4
ipv4 = each.value.ipv4 ipv4 = each.value.ipv4

2
proxmox/instances-worker.tf
View File

@@ -39,7 +39,7 @@ resource "proxmox_virtual_environment_file" "worker_machineconfig" {
source_raw { source_raw {
data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "worker_template", "worker.yaml.tpl")}", data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "worker_template", "worker.yaml.tpl")}",
merge(local.kubernetes, try(var.instances["all"], {}), { merge(local.kubernetes, try(var.instances["all"], {}), {
labels = join(",", [local.web_labels, lookup(var.instances[each.value.zone], "worker_labels", "")]) labels = join(",", [local.worker_labels, lookup(var.instances[each.value.zone], "worker_labels", "")])
nodeSubnets = [local.subnets[each.value.zone], var.vpc_main_cidr[1]] nodeSubnets = [local.subnets[each.value.zone], var.vpc_main_cidr[1]]
lbv4 = local.lbv4 lbv4 = local.lbv4
ipv4 = each.value.ipv4 ipv4 = each.value.ipv4

2
proxmox/prepare/group_vars/pve.yml
View File

@@ -13,6 +13,8 @@ system_sysctl:
- { name: net.ipv6.conf.all.autoconf, value: 0 } - { name: net.ipv6.conf.all.autoconf, value: 0 }
- { name: net.ipv6.conf.all.accept_ra, value: 0 } - { name: net.ipv6.conf.all.accept_ra, value: 0 }
- { name: kernel.sched_autogroup_enabled, value: 0 }
# #
dnsmasq_configs: ["proxmox"] dnsmasq_configs: ["proxmox"]