From 093a071f0d7ce3ef516952771445a70c1ee7dd14 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 21 Jun 2024 17:28:45 +0000
Subject: [PATCH] fix: fix typos, version handling

---
 admin/dev_apply.sh       | 6 ++----
 admin/libhelm.sh         | 5 +----
 admin/upgrade_cluster.sh | 2 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/admin/dev_apply.sh b/admin/dev_apply.sh
index 5c877d7e..6f5e048f 100755
--- a/admin/dev_apply.sh
+++ b/admin/dev_apply.sh
@@ -26,8 +26,7 @@ CHARTS="$(dirname $SCRIPT_DIR)/charts"
 ################
 function cert-manager-post() {
   # If any error occurs, wait for initial webhook deployment and try again
-  # see: https://cert-manager.io/docs/concepts/webhook/#webhook-connection-problems-shortly-af
-ter-cert-manager-installation
+  # see: https://cert-manager.io/docs/concepts/webhook/#webhook-connection-problems-shortly-after-cert-manager-installation
 
   if [ $rc -ne 0 ]; then
     wait_for "kubectl get deployment -n $namespace cert-manager-webhook"
@@ -37,8 +36,7 @@ ter-cert-manager-installation
   fi
 
   wait_for "kubectl get ClusterIssuer -n $namespace kubezero-local-ca-issuer"
-  kubectl wait --timeout=180s --for=condition=Ready -n $namespace ClusterIssuer/kubezero-local
--ca-issuer
+  kubectl wait --timeout=180s --for=condition=Ready -n $namespace ClusterIssuer/kubezero-local-ca-issuer
 }
 
 
diff --git a/admin/libhelm.sh b/admin/libhelm.sh
index 0fd40be0..ac8e7b65 100644
--- a/admin/libhelm.sh
+++ b/admin/libhelm.sh
@@ -5,9 +5,6 @@ API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1 -a polic
 
 export HELM_SECRETS_BACKEND="vals"
 
-#VERSION="latest"
-VERSION="v1.28"
-
 # Waits for max 300s and retries
 function wait_for() {
   local TRIES=0
@@ -277,7 +274,7 @@ spec:
   hostPID: true
   containers:
   - name: kubezero-admin
-    image: public.ecr.aws/zero-downtime/kubezero-admin:${VERSION}
+    image: public.ecr.aws/zero-downtime/kubezero-admin:${KUBE_VERSION}
     imagePullPolicy: Always
     command: ["kubezero.sh"]
     args: [$TASKS]
diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh
index 53916e7a..dfc26e68 100755
--- a/admin/upgrade_cluster.sh
+++ b/admin/upgrade_cluster.sh
@@ -2,6 +2,8 @@
 set -eE
 set -o pipefail
 
+KUBE_VERSION=v1.29
+
 ARGO_APP=${1:-/tmp/new-kubezero-argoapp.yaml}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )