Merge branch 'master' into feat/calico

This commit is contained in:
Karim Naufal
2022-04-13 14:33:33 +02:00
committed by GitHub
11 changed files with 252 additions and 109 deletions

View File

@@ -9,14 +9,12 @@ module "agents" {
private_key = var.private_key
additional_public_keys = var.additional_public_keys
firewall_ids = [hcloud_firewall.k3s.id]
placement_group_id = hcloud_placement_group.k3s.id
location = var.location
placement_group_id = var.placement_group_disable ? 0 : element(hcloud_placement_group.agent.*.id, ceil(each.value.index / 10))
location = each.value.location
server_type = each.value.server_type
ipv4_subnet_id = hcloud_network_subnet.subnet[[for i, v in var.agent_nodepools : i if v.name == each.value.nodepool_name][0] + 2].id
ipv4_subnet_id = hcloud_network_subnet.agent[[for i, v in var.agent_nodepools : i if v.name == each.value.nodepool_name][0]].id
# We leave some room so 100 eventual Hetzner LBs that can be created perfectly safely
# It leaves the subnet with 254 x 254 - 100 = 64416 IPs to use, so probably enough.
private_ipv4 = cidrhost(local.network_ipv4_subnets[[for i, v in var.agent_nodepools : i if v.name == each.value.nodepool_name][0] + 2], each.value.index + 101)
private_ipv4 = cidrhost(hcloud_network_subnet.agent[[for i, v in var.agent_nodepools : i if v.name == each.value.nodepool_name][0]].ip_range, each.value.index + 101)
labels = {
"provisioner" = "terraform",
@@ -24,7 +22,7 @@ module "agents" {
}
depends_on = [
hcloud_network_subnet.subnet
hcloud_network_subnet.agent
]
}
@@ -46,12 +44,13 @@ resource "null_resource" "agents" {
provisioner "file" {
content = yamlencode({
node-name = module.agents[each.key].name
server = "https://${module.control_planes[0].private_ipv4_address}:6443"
server = "https://${module.control_planes[keys(module.control_planes)[0]].private_ipv4_address}:6443"
token = random_password.k3s_token.result
kubelet-arg = ["cloud-provider=external", "volume-plugin-dir=/var/lib/kubelet/volumeplugins"]
flannel-iface = "eth1"
node-ip = module.agents[each.key].private_ipv4_address
node-label = var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : []
node-label = each.value.labels
node-taint = each.value.taints
})
destination = "/tmp/config.yaml"
}
@@ -79,6 +78,6 @@ resource "null_resource" "agents" {
depends_on = [
null_resource.first_control_plane,
hcloud_network_subnet.subnet
hcloud_network_subnet.agent
]
}