Make calico migration explicit

charts/kubezero/templates/_app.yaml

@@ -32,6 +32,7 @@ spec:
     server: {{ .root.Values.global.defaultDestination.server }}
     namespace: {{ default "kube-system" .namespace }}
 
+  {{- if or ( not .retain ) .selfheal }}
   syncPolicy:
     automated:
       {{- if not .retain }}
@@ -40,4 +41,5 @@ spec:
       {{- if .selfheal }}
       selfHeal: true
       {{- end }}
+  {{- end }}
 {{- end }}

charts/kubezero/templates/calico.yaml

@@ -1,8 +1,3 @@
-# {{ .Values.calico.network }}
 {{- if .Values.calico.enabled }}
-{{- if .Values.calico.values.network }}
+{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" .Values.calico.type "retain" true }}
-{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "helm" "retain" true }}
-{{- else }}
-{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }}
-{{- end }}
 {{- end }}

charts/kubezero/values.yaml

@@ -17,6 +17,7 @@ platform: aws
 
 calico:
   enabled: true
+  type: kustomize
 
 cert-manager:
   enabled: true

deploy/templates/values.yaml

@@ -5,6 +5,7 @@ kubezero:
   {{- end }}
   calico:
     enabled: {{ .Values.calico.enabled  }}
+    type: {{ .Values.calico.type  }}
     values:
       migration: {{ .Values.calico.migration }}
       prometheus: {{ .Values.prometheus.enabled }}