fix: upgrade flow tweaks

This commit is contained in:
Stefan Reimer 2024-04-08 19:08:45 +01:00
parent 0a4d222d8f
commit 8d4bf09214
2 changed files with 8 additions and 9 deletions

View File

@ -13,6 +13,13 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
echo "Checking that all pods in kube-system are running ..." echo "Checking that all pods in kube-system are running ..."
waitSystemPodsRunning 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 argo_used && disable_argo
#all_nodes_upgrade "" #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 #argo_used && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kube-system
# upgrade modules # 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 ..." echo "Checking that all pods in kube-system are running ..."
waitSystemPodsRunning waitSystemPodsRunning
echo "Applying remaining KubeZero modules..." 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" 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 # Trigger backup of upgraded cluster state

View File

@ -21,4 +21,3 @@
- CustomCPUCFSQuotaPeriod - CustomCPUCFSQuotaPeriod
## Known issues ## Known issues
None.