From 63640c9a0d0809fc62c866306e42468010b3a7c7 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 30 Nov 2023 17:59:37 +0000 Subject: [PATCH] Minor upgrade tweaks --- admin/upgrade_cluster.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index 71591423..082bb60d 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -143,7 +143,6 @@ argo_used && disable_argo #all_nodes_upgrade "" - control_plane_upgrade kubeadm_upgrade echo "Adjust kubezero values as needed:" @@ -155,7 +154,7 @@ argo_used && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-val control_plane_upgrade apply_network echo "Wait for all CNI agents to be running ..." -kubectl rollout status ds/cilium -n kube-system --timeout=60s +kubectl rollout status ds/cilium -n kube-system --timeout=120s all_nodes_upgrade "cd /host/etc/cni/net.d && ln -s 05-cilium.conflist 05-cilium.conf || true" # v1.27 @@ -182,7 +181,7 @@ done # Cleanup of some legacy node labels and annotations controllers=$(kubectl get nodes -l node-role.kubernetes.io/control-plane -o json | jq .items[].metadata.name -r) for c in $controllers; do - for l in projectcalico.org/IPv4VXLANTunnelAddr projectcalico.org/IPv4Address kubeadm.alpha.kubernetes.io/cri-socket; do + for l in projectcalico.org/IPv4VXLANTunnelAddr projectcalico.org/IPv4Address; do kubectl annotate node $c ${l}- done kubectl label node $c topology.ebs.csi.aws.com/zone-