From 9d28705079b6f1e9250bcac99a1fbae3b724ca86 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 17 Apr 2025 12:08:06 +0000 Subject: [PATCH] docs: typos --- admin/hooks-1.31.sh | 2 +- admin/libhelm.sh | 1 + admin/upgrade_cluster.sh | 2 +- charts/kubezero-argo/hooks.d/pre-install.sh | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/hooks-1.31.sh b/admin/hooks-1.31.sh index ea6dd3a8..4c684549 100644 --- a/admin/hooks-1.31.sh +++ b/admin/hooks-1.31.sh @@ -17,7 +17,7 @@ post_control_plane_upgrade_cluster() { # delete previous root app controlled by kubezero module kubectl delete application kubezero-git-sync -n argocd || true - # Patch appproject to keep SyncWindow in place + # only patch appproject to keep SyncWindow in place kubectl patch appproject kubezero -n argocd --type json -p='[{"op": "remove", "path": "/metadata/labels"}]' || true kubectl patch appproject kubezero -n argocd --type json -p='[{"op": "remove", "path": "/metadata/annotations"}]' || true } diff --git a/admin/libhelm.sh b/admin/libhelm.sh index 5e1f1f3e..fa4d7c4e 100644 --- a/admin/libhelm.sh +++ b/admin/libhelm.sh @@ -93,6 +93,7 @@ function ensure_kubezero_secret_key() { done } + function set_kubezero_secret() { local key="$1" local val="$2" diff --git a/admin/upgrade_cluster.sh b/admin/upgrade_cluster.sh index d249d454..9528bb74 100755 --- a/admin/upgrade_cluster.sh +++ b/admin/upgrade_cluster.sh @@ -20,7 +20,7 @@ echo "Checking that all pods in kube-system are running ..." [ "$ARGOCD" == "true" ] && disable_argo # Check if we already have all controllers on the current version -#OLD_CONTROLLERS=$(kubectl get nodes -l "node-role.kubernetes.io/control-plane=" --no-headers=true | grep -cv $KUBE_VERSION || true) +OLD_CONTROLLERS=$(kubectl get nodes -l "node-role.kubernetes.io/control-plane=" --no-headers=true | grep -cv $KUBE_VERSION || true) if [ "$OLD_CONTROLLERS" == "0" ]; then # All controllers already on current version diff --git a/charts/kubezero-argo/hooks.d/pre-install.sh b/charts/kubezero-argo/hooks.d/pre-install.sh index 91dd852c..eb9c5957 100755 --- a/charts/kubezero-argo/hooks.d/pre-install.sh +++ b/charts/kubezero-argo/hooks.d/pre-install.sh @@ -22,4 +22,5 @@ fi kubectl get secret argocd-redis -n argocd || kubectl create secret generic argocd-redis -n argocd \ --from-literal=auth=$(date +%s | sha256sum | base64 | head -c 16 ; echo) +# required keys in kubezero-secrets, as --ignore-missing-values in helm-secrets doesnt work with vals ;-( ensure_kubezero_secret_key argo-cd.kubezero.username argo-cd.kubezero.password argo-cd.kubezero.sshPrivateKey