kjuulh/terraform-hcloud-kube-hetzner
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix(control-plane): use correct taints and labels for first control plane node and fix existing default taints

Browse Source
This commit is contained in:
Henk van Maanen 2022-04-11 17:44:50 +02:00
parent 4117776994
commit b142be2d84
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.tf
View File

@ -18,8 +18,8 @@ resource "null_resource" "first_control_plane" {
kubelet-arg = "cloud-provider=external" kubelet-arg = "cloud-provider=external"
node-ip = module.control_planes[keys(module.control_planes)[0]].private_ipv4_address node-ip = module.control_planes[keys(module.control_planes)[0]].private_ipv4_address
advertise-address = module.control_planes[keys(module.control_planes)[0]].private_ipv4_address advertise-address = module.control_planes[keys(module.control_planes)[0]].private_ipv4_address
node-taint = var.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/master:NoSchedule"] node-taint = local.control_plane_nodepools[keys(module.control_planes)[0]].taints
node-label = var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : [] node-label = local.control_plane_nodepools[keys(module.control_planes)[0]].labels
}) })
destination = "/tmp/config.yaml" destination = "/tmp/config.yaml"
} }

7
locals.tf
View File

@ -177,7 +177,7 @@ locals {
server_type : nodepool_obj.server_type, server_type : nodepool_obj.server_type,
location : nodepool_obj.location, location : nodepool_obj.location,
labels : concat(local.default_control_plane_labels, nodepool_obj.labels), labels : concat(local.default_control_plane_labels, nodepool_obj.labels),
taints : nodepool_obj.taints, taints : concat(local.default_control_plane_taints, nodepool_obj.taints),
index : node_index index : node_index
} }
} }
@ -209,5 +209,8 @@ locals {
# Default k3s node labels # Default k3s node labels
default_agent_labels = concat([], var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : []) default_agent_labels = concat([], var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : [])
default_control_plane_labels = concat([], var.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/master:NoSchedule"]) default_control_plane_labels = concat([], var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : [])
# Default k3s node taints
default_control_plane_taints = concat([], var.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/master:NoSchedule"])
} }