From 49fa7b3c426418cc5bd7bf87ca2edd22fe65d4ba Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 30 May 2025 17:55:14 +0000 Subject: [PATCH] feat: ensure kube-proxy gets phased out during 1.32 upgrade --- admin/hooks-1.32.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/admin/hooks-1.32.sh b/admin/hooks-1.32.sh index 01a35cc0..30c94aea 100644 --- a/admin/hooks-1.32.sh +++ b/admin/hooks-1.32.sh @@ -5,6 +5,9 @@ pre_control_plane_upgrade_cluster() { if [ "$PLATFORM" != "gke" ];then # patch multus DS to ONLY run pods on 1.31 controllers kubectl patch ds kube-multus-ds -n kube-system -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.31.6"}}}}}' || true + + # patch kube-proxy DS to ONLY run pods on 1.31 controllers + kubectl patch ds kube-proxy -n kube-system -p '{"spec": {"template": {"spec": {"nodeSelector": {"node.kubernetes.io/kubezero.version": "v1.31.6"}}}}}' || true fi } @@ -28,6 +31,10 @@ pre_cluster_upgrade_final() { kubectl delete ds kube-multus-ds -n kube-system kubectl delete NetworkAttachmentDefinition cilium kubectl delete crd network-attachment-definitions.k8s.cni.cncf.io + + # remove kube-proxy + kubectl -n kube-system delete ds kube-proxy + kubectl -n kube-system delete cm kube-proxy fi set -e