fix: kubezero root module fixes
This commit is contained in:
parent
6a7c0b6085
commit
94dd2f395e
7
_argoapp_patch.yaml
Normal file
7
_argoapp_patch.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
spec:
|
||||||
|
syncWindows:
|
||||||
|
- kind: deny
|
||||||
|
schedule: '0 * * * *'
|
||||||
|
duration: 24h
|
||||||
|
namespaces:
|
||||||
|
- '*'
|
@ -45,6 +45,7 @@ helm template $CHARTS/kubezero -f $WORKDIR/kubezero-values.yaml --kube-version $
|
|||||||
|
|
||||||
# Root KubeZero apply directly and exit
|
# Root KubeZero apply directly and exit
|
||||||
if [ ${ARTIFACTS[0]} == "kubezero" ]; then
|
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)
|
kubectl replace -f $WORKDIR/kubezero/templates $(field_manager $ARGOCD)
|
||||||
exit $?
|
exit $?
|
||||||
|
|
||||||
|
@ -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"
|
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
|
# 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
|
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
|
||||||
|
|
||||||
|
@ -2,7 +2,5 @@
|
|||||||
kubectl get secret kubezero-secrets -n kubezero && rc=$? || rc=$?
|
kubectl get secret kubezero-secrets -n kubezero && rc=$? || rc=$?
|
||||||
|
|
||||||
if [ $rc != 0 ]; then
|
if [ $rc != 0 ]; then
|
||||||
kubectl create secret generic kubezero-secrets -n kubezero \
|
kubectl create secret generic kubezero-secrets -n kubezero
|
||||||
--from-literal=argo-cd.adminPassword="geheim" \
|
|
||||||
--from-literal=argo-cd.kubezero.sshPrivateKey="--GEHEIM---"
|
|
||||||
fi
|
fi
|
||||||
|
@ -25,7 +25,7 @@ spec:
|
|||||||
repoURL: {{ default "https://cdn.zero-downtime.net/charts" (index .Values $name "repository") }}
|
repoURL: {{ default "https://cdn.zero-downtime.net/charts" (index .Values $name "repository") }}
|
||||||
targetRevision: {{ default "HEAD" ( index .Values $name "targetRevision" ) | quote }}
|
targetRevision: {{ default "HEAD" ( index .Values $name "targetRevision" ) | quote }}
|
||||||
helm:
|
helm:
|
||||||
skipTests: true
|
#skipTests: true
|
||||||
valuesObject:
|
valuesObject:
|
||||||
{{- include (print $name "-values") $ | nindent 8 }}
|
{{- include (print $name "-values") $ | nindent 8 }}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user