Fix handling global values #2

Manually merged
stefan merged 1 commits from master into stable 2020-05-15 10:24:03 +00:00
3 changed files with 5 additions and 3 deletions

View File

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

View File

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

View File

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