Allow values being passed down to implementation charts

This commit is contained in:
Stefan Reimer 2020-05-06 15:47:51 +01:00
parent 47a7abb628
commit df61aa094f
3 changed files with 8 additions and 2 deletions

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezeroApp name: kubezeroApp
description: KubeZero ArgoCD Application - Root chart of the KubeZero description: KubeZero ArgoCD Application - Root chart of the KubeZero
type: application type: application
version: 0.1.4 version: 0.1.5
home: https://kubezero.com home: https://kubezero.com
keywords: keywords:
- kubezero - kubezero

View File

@ -16,7 +16,13 @@ spec:
repoURL: {{ default .root.Values.defaultSource.repoURL }} repoURL: {{ default .root.Values.defaultSource.repoURL }}
targetRevision: {{ default .root.Values.defaultSource.targetRevision }} targetRevision: {{ default .root.Values.defaultSource.targetRevision }}
{{- if eq .type "helm" }} {{- if eq .type "helm" }}
{{ $values := index .root.Values .name "values" }}
path: {{ default .root.Values.defaultSource.pathPrefix }}charts/{{ .name }} path: {{ default .root.Values.defaultSource.pathPrefix }}charts/{{ .name }}
{{- if $values }}
helm:
values:
{{- toYaml $values | nindent 8 }}
{{- end }}
{{- else }} {{- else }}
path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/{{ .name }} path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/{{ .name }}
{{- end }} {{- end }}

View File

@ -1,5 +1,5 @@
{{- if .Values.certManager.enabled }} {{- if .Values.certManager.enabled }}
{{ template "kubezero.app" dict "root" . "name" "kubezeroCertManager" "type" "helm" }} {{ template "kubezero.app" dict "root" . "name" "certManager" "type" "helm" }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace