From 79f10460e0a3f06195b89273abcdb9778234cd40 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 15 May 2020 11:22:15 +0100
Subject: [PATCH] Fix handling global values

---
 charts/kubezero/Chart.yaml         | 2 +-
 charts/kubezero/templates/app.yaml | 4 +++-
 scripts/publish.sh                 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 13b3711..e7979b2 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform
 name: kubezero
-version: 0.2.4
+version: 0.2.5
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/logo_small.png
 keywords:
diff --git a/charts/kubezero/templates/app.yaml b/charts/kubezero/templates/app.yaml
index 79ed4ba..14e94b7 100644
--- a/charts/kubezero/templates/app.yaml
+++ b/charts/kubezero/templates/app.yaml
@@ -15,9 +15,11 @@ spec:
     targetRevision: {{ .Values.global.defaultSource.targetRevision }}
     path: {{ .Values.global.defaultSource.pathPrefix}}charts/kubezero-app
 
-{{ if .Values.kubezero }}
     helm:
       values: |
+        global:
+{{- toYaml .Values.global | nindent 10 }}
+{{- if .Values.kubezero }}
 {{- toYaml .Values.kubezero | nindent 8 }}
 {{- end }}
 
diff --git a/scripts/publish.sh b/scripts/publish.sh
index d3a971e..64c9c57 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -17,7 +17,7 @@ helm repo add uswitch https://uswitch.github.io/kiam-helm-charts/charts/
 
 for dir in $(find $SRCROOT/charts -mindepth 1 -maxdepth 1 -type d);
 do
-    rm -rf $dir/charts
+    rm -rf $dir/charts $dir/Chart.lock
 
     name=$(basename $dir)