From b729d97bf1547d911a2085cd0cede0fb009877cc Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 19 Jun 2025 10:57:34 +0100
Subject: [PATCH] Fix: inject missing global value

---
 admin/kubezero.sh        | 5 +++++
 admin/upgrade_cluster.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/admin/kubezero.sh b/admin/kubezero.sh
index ff68f6a5..f1ea699f 100755
--- a/admin/kubezero.sh
+++ b/admin/kubezero.sh
@@ -123,6 +123,11 @@ upgrade_kubezero_config() {
   migrate_argo_values.py < "$WORKDIR"/kubezero-values.yaml > "$WORKDIR"/new-kubezero-values.yaml \
     && mv "$WORKDIR"/new-kubezero-values.yaml "$WORKDIR"/kubezero-values.yaml
 
+  # V1.32 - Inject new global.apiServerUrl
+  _API_ENDPOINT=$(kubectl config view | yq .clusters[0].cluster.server | sed -e 's,https://,,' -e 's/:6443//')
+  yq '.global.apiServerUrl="'$_API_ENDPOINT'"' -i "$WORKDIR"/kubezero-values.yaml
+  #
+
   update_kubezero_cm
 
   if [ "$ARGOCD" == "true" ]; then
diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh
index 2becbdd9..a98abf37 100755
--- a/admin/upgrade_cluster.sh
+++ b/admin/upgrade_cluster.sh
@@ -48,7 +48,7 @@ while true; do
   sleep 1
 done
 
-echo "Once all controller nodes are running on $KUBE_VERSION, <return> to continue"
+echo "Once ALL nodes, incl. workers, ALL, are running on $KUBE_VERSION, <return> to continue"
 read -r
 
 # Final control plane upgrades