From dadcb60981a3db3898355ba3e71051c8100432b4 Mon Sep 17 00:00:00 2001 From: Serge Logvinov Date: Fri, 28 Jun 2024 15:56:44 +0300 Subject: [PATCH] fix node labels --- proxmox/Makefile | 1 + proxmox/instances-db.tf | 2 +- proxmox/instances-worker.tf | 2 +- proxmox/prepare/group_vars/pve.yml | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/proxmox/Makefile b/proxmox/Makefile index bb1d1ae..1911a9e 100644 --- a/proxmox/Makefile +++ b/proxmox/Makefile @@ -46,6 +46,7 @@ create-controlplane-bootstrap: ## Bootstrap controlplane talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT} talosctl --talosconfig _cfgs/talosconfig --nodes ${CPFIRST} bootstrap +.PHONY: kubeconfig kubeconfig: ## Prepare kubeconfig rm -f kubeconfig talosctl --talosconfig _cfgs/talosconfig config endpoint ${ENDPOINT} diff --git a/proxmox/instances-db.tf b/proxmox/instances-db.tf index 65682c8..79a802d 100644 --- a/proxmox/instances-db.tf +++ b/proxmox/instances-db.tf @@ -43,7 +43,7 @@ resource "proxmox_virtual_environment_file" "db_machineconfig" { source_raw { data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "db_template", "worker.yaml.tpl")}", 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]] lbv4 = local.lbv4 ipv4 = each.value.ipv4 diff --git a/proxmox/instances-worker.tf b/proxmox/instances-worker.tf index 3de21e0..c4fe861 100644 --- a/proxmox/instances-worker.tf +++ b/proxmox/instances-worker.tf @@ -39,7 +39,7 @@ resource "proxmox_virtual_environment_file" "worker_machineconfig" { source_raw { data = templatefile("${path.module}/templates/${lookup(var.instances[each.value.zone], "worker_template", "worker.yaml.tpl")}", 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]] lbv4 = local.lbv4 ipv4 = each.value.ipv4 diff --git a/proxmox/prepare/group_vars/pve.yml b/proxmox/prepare/group_vars/pve.yml index 163fd1b..3e16e27 100644 --- a/proxmox/prepare/group_vars/pve.yml +++ b/proxmox/prepare/group_vars/pve.yml @@ -13,6 +13,8 @@ system_sysctl: - { name: net.ipv6.conf.all.autoconf, value: 0 } - { name: net.ipv6.conf.all.accept_ra, value: 0 } + - { name: kernel.sched_autogroup_enabled, value: 0 } + # dnsmasq_configs: ["proxmox"]