From aec5c189fe654db717982010f27926df51cb7aea Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 6 Jul 2020 14:42:37 +0100 Subject: [PATCH] Bug fix for calico chart, tweaks --- charts/kubezero-calico/Chart.yaml | 2 +- charts/kubezero-calico/{crds => templates}/crds.yaml | 0 deploy/deploy.sh | 3 ++- deploy/templates/values.yaml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename charts/kubezero-calico/{crds => templates}/crds.yaml (100%) diff --git a/charts/kubezero-calico/Chart.yaml b/charts/kubezero-calico/Chart.yaml index d4cfec1..0417184 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.0 +version: 0.1.1 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero-calico/crds/crds.yaml b/charts/kubezero-calico/templates/crds.yaml similarity index 100% rename from charts/kubezero-calico/crds/crds.yaml rename to charts/kubezero-calico/templates/crds.yaml diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 4360cdc..7a02eaf 100755 --- a/deploy/deploy.sh +++ b/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! " + 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 ? diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index 48ad6d3..8331b5e 100644 --- a/deploy/templates/values.yaml +++ b/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: