fix: fix typos, version handling

This commit is contained in:
Stefan Reimer 2024-06-21 17:28:45 +00:00
parent 77642ab255
commit 093a071f0d
3 changed files with 5 additions and 8 deletions

View File

@ -26,8 +26,7 @@ CHARTS="$(dirname $SCRIPT_DIR)/charts"
################ ################
function cert-manager-post() { function cert-manager-post() {
# If any error occurs, wait for initial webhook deployment and try again # 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 # see: https://cert-manager.io/docs/concepts/webhook/#webhook-connection-problems-shortly-after-cert-manager-installation
ter-cert-manager-installation
if [ $rc -ne 0 ]; then if [ $rc -ne 0 ]; then
wait_for "kubectl get deployment -n $namespace cert-manager-webhook" wait_for "kubectl get deployment -n $namespace cert-manager-webhook"
@ -37,8 +36,7 @@ ter-cert-manager-installation
fi fi
wait_for "kubectl get ClusterIssuer -n $namespace kubezero-local-ca-issuer" wait_for "kubectl get ClusterIssuer -n $namespace kubezero-local-ca-issuer"
kubectl wait --timeout=180s --for=condition=Ready -n $namespace ClusterIssuer/kubezero-local kubectl wait --timeout=180s --for=condition=Ready -n $namespace ClusterIssuer/kubezero-local-ca-issuer
-ca-issuer
} }

View File

@ -5,9 +5,6 @@ API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1 -a polic
export HELM_SECRETS_BACKEND="vals" export HELM_SECRETS_BACKEND="vals"
#VERSION="latest"
VERSION="v1.28"
# Waits for max 300s and retries # Waits for max 300s and retries
function wait_for() { function wait_for() {
local TRIES=0 local TRIES=0
@ -277,7 +274,7 @@ spec:
hostPID: true hostPID: true
containers: containers:
- name: kubezero-admin - name: kubezero-admin
image: public.ecr.aws/zero-downtime/kubezero-admin:${VERSION} image: public.ecr.aws/zero-downtime/kubezero-admin:${KUBE_VERSION}
imagePullPolicy: Always imagePullPolicy: Always
command: ["kubezero.sh"] command: ["kubezero.sh"]
args: [$TASKS] args: [$TASKS]

View File

@ -2,6 +2,8 @@
set -eE set -eE
set -o pipefail set -o pipefail
KUBE_VERSION=v1.29
ARGO_APP=${1:-/tmp/new-kubezero-argoapp.yaml} ARGO_APP=${1:-/tmp/new-kubezero-argoapp.yaml}
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )