fix: adjust kubezero argocd flow once more

charts/kubezero-argocd/values.yaml

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

charts/kubezero/Chart.yaml

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

charts/kubezero/bootstrap.sh

@@ -194,9 +194,13 @@ function metrics-pre() {
 
 
 ## 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
 
 # Resolve all the all enabled artifacts in order of their appearance

charts/kubezero/templates/argocd.yaml

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

charts/kubezero/templates/kubezero.yaml

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

charts/kubezero/values.yaml

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