Bug fix for calico chart, tweaks

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.0
+version: 0.1.1
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:

deploy/deploy.sh

@@ -58,7 +58,8 @@ EOF
   helm template $DEPLOY_DIR -f values.yaml -f cloudbender.yaml --set istio.enabled=false --set prometheus.enabled=false > generated-values.yaml
   helm upgrade -n argocd kubezero kubezero/kubezero-argo-cd -f generated-values.yaml
 
-	exit 0
+	echo "Install Istio / kube-prometheus manually for now, before proceeding! <Any key to continue>"
+  read
   # Todo: Now we need to wait till all is synced and healthy ... argocd cli or kubectl ?
   # Wait for aws-ebs or kiam to be all ready, or all pods running ?
 

deploy/templates/values.yaml

@@ -8,6 +8,7 @@ kubezero:
     {{- if .Values.calico.network }}
     network: {{ .Values.calico.network }}
     {{- end }}
+    prometheus: {{ .Values.prometheus.enabled }}
   cert-manager:
     enabled: {{ index .Values "cert-manager" "enabled" }}
     values: