From 8512b2db5f23676cd3addac17e13102334c1514b Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Tue, 7 Jul 2020 13:50:08 +0100
Subject: [PATCH] Calico migration bug fixes

---
 charts/kubezero-calico/Chart.yaml     |  2 +-
 charts/kubezero-calico/README.md      |  2 +-
 charts/kubezero/templates/calico.yaml |  2 +-
 deploy/templates/values.yaml          | 11 ++++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/charts/kubezero-calico/Chart.yaml b/charts/kubezero-calico/Chart.yaml
index 0417184..ff572c8 100644
--- a/charts/kubezero-calico/Chart.yaml
+++ b/charts/kubezero-calico/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-calico
 description: KubeZero Umbrella Chart for Calico
 type: application
-version: 0.1.1
+version: 0.1.3
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero-calico/README.md b/charts/kubezero-calico/README.md
index fffd4bd..07e1e7d 100644
--- a/charts/kubezero-calico/README.md
+++ b/charts/kubezero-calico/README.md
@@ -2,7 +2,7 @@ kubezero-calico
 ===============
 KubeZero Umbrella Chart for Calico
 
-Current chart version is `0.1.0`
+Current chart version is `0.1.3`
 
 Source code can be found [here](https://kubezero.com)
 
diff --git a/charts/kubezero/templates/calico.yaml b/charts/kubezero/templates/calico.yaml
index 7c69e9d..8c3121d 100644
--- a/charts/kubezero/templates/calico.yaml
+++ b/charts/kubezero/templates/calico.yaml
@@ -1,6 +1,6 @@
 # {{ .Values.calico.network }}
 {{- if .Values.calico.enabled }}
-{{- if .Values.calico.network }}
+{{- 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 }}
diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 77bb749..3b76c4e 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -5,11 +5,12 @@ kubezero:
   {{- end }}
   calico:
     enabled: {{ .Values.calico.enabled  }}
-    {{- if .Values.calico.network }}
-    network: {{ .Values.calico.network }}
-    {{- end }}
-    migration: {{ .Values.calico.migration }}
-    prometheus: {{ .Values.prometheus.enabled }}
+    values:
+      migration: {{ .Values.calico.migration }}
+      prometheus: {{ .Values.prometheus.enabled }}
+      {{- if .Values.calico.network }}
+      network: {{ .Values.calico.network }}
+      {{- end }}
   cert-manager:
     enabled: {{ index .Values "cert-manager" "enabled" }}
     values: