diff --git a/admin/hooks-1.31.sh b/admin/hooks-1.31.sh index ead147a4..0c8bfe99 100644 --- a/admin/hooks-1.31.sh +++ b/admin/hooks-1.31.sh @@ -14,7 +14,9 @@ pre_control_plane_upgrade_cluster() { # All things after the first controller / control plane upgrade post_control_plane_upgrade_cluster() { - echo + # delete previous root app controlled by kubezero module + kubectl delete application kubezero-git-sync -n argocd || true + kubectl delete appproject kubezero -n argocd || true } diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index 428bdf36..9a53cc35 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -38,7 +38,7 @@ read -r #[ "$ARGOCD" == "true" ] && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kubezero # upgrade modules -control_plane_upgrade "apply_network, apply_addons, apply_storage, apply_operators" +control_plane_upgrade "apply_kubezero apply_network, apply_addons, apply_storage, apply_operators" echo "Checking that all pods in kube-system are running ..." waitSystemPodsRunning