diff --git a/admin/migrate_argo_values.py b/admin/migrate_argo_values.py index 680d723..04322ba 100755 --- a/admin/migrate_argo_values.py +++ b/admin/migrate_argo_values.py @@ -8,11 +8,6 @@ import yaml def migrate(values): """Actual changes here""" - # Remove various keys as they have been merged into the metrics template - deleteKey(values["metrics"]['kube-prometheus-stack']["alertmanager"]["alertmanagerSpec"], "podMetadata") - deleteKey(values["metrics"]['kube-prometheus-stack']["alertmanager"], "config") - deleteKey(values["metrics"]['kube-prometheus-stack']["prometheus"]["prometheusSpec"], "externalLabels") - return values diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index 1256e56..4f95248 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -1,7 +1,9 @@ -#!/bin/bash -e +#!/bin/bash +set -eE +set -o pipefail #VERSION="latest" -VERSION="v1.25" +VERSION="v1.26" ARGO_APP=${1:-/tmp/new-kubezero-argoapp.yaml} SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) @@ -147,14 +149,6 @@ argo_used && disable_argo #all_nodes_upgrade "" -# Cleanup -# Remove calico CRDs -kubectl delete -f https://git.zero-downtime.net/ZeroDownTime/kubezero/raw/tag/v1.23.11/charts/kubezero-network/charts/calico/crds/crds.yaml 2>/dev/null || true -kubectl delete servicemonitor calico-node -n kube-system 2>/dev/null || true - -# delete old kubelet configs -for cm in $(kubectl get cm -n kube-system --no-headers | awk '{if ($1 ~ "kubelet-config-1*") print $1}'); do kubectl delete cm $cm -n kube-system; done -for rb in $(kubectl get rolebindings -n kube-system --no-headers | awk '{if ($1 ~ "kubelet-config-1*") print $1}'); do kubectl delete rolebindings $rb -n kube-system; done control_plane_upgrade kubeadm_upgrade