Adhere comments

- restore flannel-iface
- introduce disable-network-policy flag
This commit is contained in:
Philipp
2022-04-09 19:20:20 +02:00
parent 8cacb4a2f8
commit 5271f47984
4 changed files with 18 additions and 12 deletions

10
init.tf
View File

@@ -14,19 +14,17 @@ resource "null_resource" "first_control_plane" {
cluster-init = true
disable-cloud-controller = true
disable = local.disable_extras
flannel-iface = "eth1"
kubelet-arg = "cloud-provider=external"
node-ip = module.control_planes[0].private_ipv4_address
advertise-address = module.control_planes[0].private_ipv4_address
node-taint = var.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/master:NoSchedule"]
node-label = var.automatically_upgrade_k3s ? ["k3s_upgrade=true"] : []
disable-network-policy = var.cni_plugin == "calico" ? true : var.disable_network_policy
},
var.cni_plugin == "flannel" ? {
flannel-iface = "eth1"
} : {},
var.cni_plugin == "calico" ? {
flannel-backend = "none",
disable-network-policy = true,
kube-controller-manager-arg = "flex-volume-plugin-dir=/var/lib/kubelet/volumeplugins/nodeagent~uds",
flannel-backend = "none"
kube-controller-manager-arg = "flex-volume-plugin-dir=/var/lib/kubelet/volumeplugins/nodeagent~uds"
} : {}))
destination = "/tmp/config.yaml"
}