removing taints
This commit is contained in:
parent
0f37945f51
commit
af043463e8
|
|
@ -449,8 +449,10 @@ resource "null_resource" "calico_ready" {
|
|||
triggers = {
|
||||
kubeconfig_path = var.kubeconfig_path
|
||||
calico_version = var.calico.version
|
||||
calico_ready_version = "2"
|
||||
pod_network_cidr = var.pod_network_cidr
|
||||
calico_node_address_autodetection_cidrs = join(",", var.calico_node_address_autodetection_cidrs)
|
||||
calico_operator_node_name = var.calico_operator_node_name
|
||||
}
|
||||
|
||||
provisioner "local-exec" {
|
||||
|
|
@ -492,7 +494,13 @@ wait_for_resource() {
|
|||
|
||||
trap dump_calico_debug ERR
|
||||
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" taint node "${self.triggers.calico_operator_node_name}" node-role.kubernetes.io/control-plane:NoSchedule- || true
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" taint node "${self.triggers.calico_operator_node_name}" node-role.kubernetes.io/control-plane- || true
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" taint node "${self.triggers.calico_operator_node_name}" node-role.kubernetes.io/master:NoSchedule- || true
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" taint node "${self.triggers.calico_operator_node_name}" node-role.kubernetes.io/master- || true
|
||||
|
||||
wait_for_resource deployment tigera-operator tigera-operator 300
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n tigera-operator patch deployment tigera-operator --type merge -p '{"spec":{"template":{"spec":{"tolerations":[{"operator":"Exists","effect":"NoSchedule"},{"operator":"Exists","effect":"NoExecute"}]}}}}'
|
||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" -n tigera-operator rollout status deployment/tigera-operator --timeout=300s
|
||||
|
||||
wait_for_resource daemonset calico-system calico-node 600
|
||||
|
|
|
|||
Loading…
Reference in New Issue