Improve app logic

charts/kubezero/Chart.yaml

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

charts/kubezero/templates/_app.yaml

@@ -31,15 +31,4 @@ spec:
   destination:
     server: {{ .root.Values.global.defaultDestination.server }}
     namespace: {{ default "kube-system" .namespace }}
-
-  {{- if or ( not .retain ) .selfheal }}
-  syncPolicy:
-    automated:
-      {{- if not .retain }}
-      prune: true
-      {{- end }}
-      {{- if .selfheal }}
-      selfHeal: true
-      {{- end }}
-  {{- end }}
 {{- end }}

charts/kubezero/templates/aws-ebs-csi-driver.yaml

@@ -1,3 +1,6 @@
 {{- if index .Values "aws-ebs-csi-driver" "enabled" }}
 {{ template "kubezero-app.app" dict "root" . "name" "aws-ebs-csi-driver" "type" "helm" }}
+  syncPolicy:
+    automated:
+      prune: true
 {{- end }}

charts/kubezero/templates/calico.yaml

@@ -1,3 +1,8 @@
 {{- if .Values.calico.enabled }}
 {{ template "kubezero-app.app" dict "root" . "name" "calico" "type" .Values.calico.type "retain" true }}
+  ignoreDifferences:
+  - group: api
+    kind: CustomResourceDefinition
+    jsonPointers:
+    - /status
 {{- end }}

charts/kubezero/templates/cert-manager.yaml

@@ -1,5 +1,9 @@
 {{- if index .Values "cert-manager" "enabled" }}
-{{ template "kubezero-app.app" dict "root" . "name" "cert-manager" "type" "helm" "namespace" "cert-manager" "selfheal" "true" }}
+{{ template "kubezero-app.app" dict "root" . "name" "cert-manager" "type" "helm" "namespace" "cert-manager" }}
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
 ---
 apiVersion: v1
 kind: Namespace

charts/kubezero/templates/kiam.yaml

@@ -1,3 +1,6 @@
 {{- if index .Values "kiam" "enabled" }}
 {{ template "kubezero-app.app" dict "root" . "name" "kiam" "type" "helm" }}
+  syncPolicy:
+    automated:
+      prune: true
 {{- end }}

charts/kubezero/templates/local-volume-provisioner.yaml

@@ -1,3 +1,6 @@
 {{- if index .Values "local-volume-provisioner" "enabled" }}
 {{ template "kubezero-app.app" dict "root" . "name" "local-volume-provisioner" "type" "kustomize" }}
+  syncPolicy:
+    automated:
+      prune: true
 {{- end }}