fix: adjust kubezero argocd flow once more

This commit is contained in:
Stefan Reimer 2021-08-30 12:52:35 +02:00
parent d7dad46f1e
commit e837c758e8
6 changed files with 20 additions and 8 deletions

View File

@ -106,6 +106,10 @@ argo-cd:
argocd-applicationset: argocd-applicationset:
enabled: false enabled: false
# Prevent accidental cascading deletes of Applications
args:
policy: create-update
rbac: rbac:
pspEnabled: false pspEnabled: false

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero name: kubezero
description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
type: application type: application
version: 1.20.8-4 version: 1.20.8-5
home: https://kubezero.com home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords: keywords:

View File

@ -194,9 +194,13 @@ function metrics-pre() {
## MAIN ## ## MAIN ##
# First lets generate kubezero.yaml # First lets generate kubezero.yaml, either plain values.yaml or application.yaml for ArgoCD
# Add all yaml files in $CLUSTER if [ -f $CLUSTER/kubezero/application.yaml ]; then
VALUES="$(find $CLUSTER -maxdepth 1 -name '*.yaml' | sort | tr '\n' ',')" yq r $CLUSTER/kubezero/application.yaml 'spec.source.helm.values' > $TMPDIR/_argovalues.yaml
VALUES=$TMPDIR/_argovalues.yaml
else
VALUES="$(find $CLUSTER -name '*.yaml' | sort | tr '\n' ',')"
fi
helm template $(chart_location kubezero) -f ${VALUES%%,} $KUBEZERO_VERSION > $TMPDIR/kubezero.yaml helm template $(chart_location kubezero) -f ${VALUES%%,} $KUBEZERO_VERSION > $TMPDIR/kubezero.yaml
# Resolve all the all enabled artifacts in order of their appearance # Resolve all the all enabled artifacts in order of their appearance

View File

@ -24,6 +24,11 @@ istio:
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- with index .Values "argocd" "argocd-applicationset" }}
argocd-applicationset:
{{ toYaml . | nindent 2 }}
{{- end }}
{{- end }} {{- end }}
{{- define "argocd-argo" }} {{- define "argocd-argo" }}

View File

@ -56,9 +56,8 @@ spec:
targetRevision: {{ .Values.kubezero.gitSync.targetRevision }} targetRevision: {{ .Values.kubezero.gitSync.targetRevision }}
path: {{ .Values.kubezero.gitSync.path }} path: {{ .Values.kubezero.gitSync.path }}
helm: directory:
valueFiles: recurse: true
- kubezero.yaml
destination: destination:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc

View File

@ -62,7 +62,7 @@ logging:
enabled: false enabled: false
crds: true crds: true
namespace: logging namespace: logging
targetRevision: 0.7.8 targetRevision: 0.7.9
argocd: argocd:
enabled: false enabled: false