fix: kubezero root module fixes

This commit is contained in:
Stefan Reimer 2025-03-24 18:11:26 +01:00
parent 6a7c0b6085
commit 94dd2f395e
5 changed files with 13 additions and 4 deletions

7
_argoapp_patch.yaml Normal file
View File

@ -0,0 +1,7 @@
spec:
syncWindows:
- kind: deny
schedule: '0 * * * *'
duration: 24h
namespaces:
- '*'

View File

@ -45,6 +45,7 @@ helm template $CHARTS/kubezero -f $WORKDIR/kubezero-values.yaml --kube-version $
# Root KubeZero apply directly and exit
if [ ${ARTIFACTS[0]} == "kubezero" ]; then
[ -f $CHARTS/kubezero/hooks.d/pre-install.sh ] && . $CHARTS/kubezero/hooks.d/pre-install.sh
kubectl replace -f $WORKDIR/kubezero/templates $(field_manager $ARGOCD)
exit $?

View File

@ -47,6 +47,9 @@ echo "Applying remaining KubeZero modules..."
control_plane_upgrade "apply_cert-manager, apply_istio, apply_istio-ingress, apply_istio-private-ingress, apply_logging, apply_metrics, apply_telemetry, apply_argo"
# we replace the project during v1.31 so disable again
[ "$ARGOCD" == "true" ] && disable_argo
# Final step is to commit the new argocd kubezero app
kubectl get app kubezero -n argocd -o yaml | yq 'del(.status) | del(.metadata) | del(.operation) | .metadata.name="kubezero" | .metadata.namespace="argocd"' | yq 'sort_keys(..)' > $ARGO_APP

View File

@ -2,7 +2,5 @@
kubectl get secret kubezero-secrets -n kubezero && rc=$? || rc=$?
if [ $rc != 0 ]; then
kubectl create secret generic kubezero-secrets -n kubezero \
--from-literal=argo-cd.adminPassword="geheim" \
--from-literal=argo-cd.kubezero.sshPrivateKey="--GEHEIM---"
kubectl create secret generic kubezero-secrets -n kubezero
fi

View File

@ -25,7 +25,7 @@ spec:
repoURL: {{ default "https://cdn.zero-downtime.net/charts" (index .Values $name "repository") }}
targetRevision: {{ default "HEAD" ( index .Values $name "targetRevision" ) | quote }}
helm:
skipTests: true
#skipTests: true
valuesObject:
{{- include (print $name "-values") $ | nindent 8 }}