From 7bbeb9d22dfa58abfed5aff68450a30edfdd0f9b Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 22 Mar 2024 16:58:42 +0000 Subject: [PATCH] chore: cleanup upgrade script --- admin/upgrade_cluster.sh | 41 ++-------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index c736eb9c..6381f684 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -23,51 +23,14 @@ control_plane_upgrade kubeadm_upgrade # shellcheck disable=SC2015 #argo_used && kubectl edit app kubezero -n argocd || kubectl edit cm kubezero-values -n kube-system -# v1.27 -# We need to restore the network ready file as cilium decided to rename it -control_plane_upgrade apply_network - -echo "Wait for all CNI agents to be running ..." -kubectl rollout status ds/cilium -n kube-system --timeout=300s - -all_nodes_upgrade "cd /host/etc/cni/net.d && ln -s 05-cilium.conflist 05-cilium.conf || true" -# v1.27 - -# now the rest -control_plane_upgrade "apply_addons, apply_storage, apply_operators" - -# v1.27 -# Remove legacy eck-operator as part of logging if running -kubectl delete statefulset elastic-operator -n logging || true -# v1.27 +# upgrade modules +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.27 -### Cleanup of some deprecated Istio Crds -for crd in clusterrbacconfigs.rbac.istio.io rbacconfigs.rbac.istio.io servicerolebindings.rbac.istio.io serviceroles.rbac.istio.io; do - kubectl delete crds $crd || true -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; do - kubectl annotate node $c ${l}- - done - kubectl label node $c topology.ebs.csi.aws.com/zone- -done - -# Fix for legacy cert-manager CRDs to be upgraded -for crd_name in certificaterequests.cert-manager.io certificates.cert-manager.io challenges.acme.cert-manager.io clusterissuers.cert-manager.io issuers.cert-manager.io orders.acme.cert-manager.io; do - manager_index="$(kubectl get crd "${crd_name}" --show-managed-fields --output json | jq -r '.metadata.managedFields | map(.manager == "cert-manager-cainjector") | index(true)')" - [ "$manager_index" != "null" ] && kubectl patch crd "${crd_name}" --type=json -p="[{\"op\": \"remove\", \"path\": \"/metadata/managedFields/${manager_index}\"}]" -done -# v1.27 - control_plane_upgrade "apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_telemetry, apply_argocd" # Trigger backup of upgraded cluster state