diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index aaf9aa05..12ba32e3 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -13,6 +13,13 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) echo "Checking that all pods in kube-system are running ..." waitSystemPodsRunning +### v1.28 +# - remove old argocd app, all resources will be taken over by argo.argo-cd +argo_used && kubectl patch app argocd -n argocd \ + --type json \ + --patch='[ { "op": "remove", "path": "/metadata/finalizers" } ]' && \ + kubectl delete app argocd -n argocd || true + argo_used && disable_argo #all_nodes_upgrade "" @@ -24,20 +31,13 @@ control_plane_upgrade kubeadm_upgrade #argo_used && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kube-system # upgrade modules -control_plane_upgrade "apply_network apply_addons, apply_storage, apply_operators" +control_plane_upgrade "apply_network, apply_addons, apply_storage, apply_operators" echo "Checking that all pods in kube-system are running ..." waitSystemPodsRunning echo "Applying remaining KubeZero modules..." -### v1.28 -# - remove old argocd app, all resources will be taken over by argo.argo-cd -kubectl patch app argocd -n argocd \ - --type json \ - --patch='[ { "op": "remove", "path": "/metadata/finalizers" } ]' && \ - kubectl delete app argocd -n argocd || true - control_plane_upgrade "apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_telemetry, apply_argo" # Trigger backup of upgraded cluster state diff --git a/docs/v1.28.md b/docs/v1.28.md index 4e9ddf5b..e5198af8 100644 --- a/docs/v1.28.md +++ b/docs/v1.28.md @@ -21,4 +21,3 @@ - CustomCPUCFSQuotaPeriod ## Known issues -None.