ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

Make calico migration explicit

Browse Source
This commit is contained in:
Stefan Reimer 2020-07-07 14:28:32 +01:00
parent 301b972787
commit 491398c722
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero/templates/_app.yaml
View File

@ -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 }}

7
charts/kubezero/templates/calico.yaml
View File

@ -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" "helm" "retain" true }}
{{- else }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }}
{{- end }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" .Values.calico.type "retain" true }}
{{- end }}

1
charts/kubezero/values.yaml
View File

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

1
deploy/templates/values.yaml
View File

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