Improved root-app value handling

This commit is contained in:
Stefan Reimer 2020-05-04 12:10:15 +01:00
parent f460ef6276
commit 4a3ce8d101
9 changed files with 38 additions and 14 deletions

View File

@ -2,11 +2,14 @@
## Abstract ## Abstract
KubeZero is a mildly opinionated collection of Kubernetes components to be deployed on a bare Kubernetes cluster. KubeZero is a mildly opinionated collection of Kubernetes components to be deployed on a bare Kubernetes cluster.
All components are 100% organic OpenSource.
## Quickstart ## Quickstart
## Architecure ## Architecure
The kuberzero-app is root application Helm chart.
This also implements the *umbrella chart* pattern in order to inject custom values into upstream charts.
## Components ## Components

View File

@ -2,4 +2,4 @@ apiVersion: v2
name: kubezero-app name: kubezero-app
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.0 version: 0.1.1

View File

@ -8,11 +8,11 @@ spec:
project: kubezero project: kubezero
source: source:
repoURL: {{ .Values.source.repoURL }} repoURL: {{ default .Values.defaultSource.repoURL }}
targetRevision: {{ .Values.source.targetRevision }} targetRevision: {{ default .Values.defaultSource.targetRevision }}
path: {{ .Values.source.pathPrefix }}/artifacts/calico path: {{ default .Values.defaultSource.pathPrefix }}/artifacts/calico
destination: destination:
server: {{ .Values.destination.server }} server: {{ default .Values.defaultDestination.server }}
namespace: kube-system namespace: kube-system
{{- end }} {{- end }}

View File

@ -10,11 +10,11 @@ spec:
project: kubezero project: kubezero
source: source:
repoURL: {{ .Values.source.repoURL }} repoURL: {{ default .Values.defaultSource.repoURL }}
targetRevision: {{ .Values.source.targetRevision }} targetRevision: {{ default .Values.defaultSource.targetRevision }}
path: {{ .Values.source.pathPrefix }}/artifacts/local-volume-provisioner path: {{ default .Values.defaultSource.pathPrefix }}/artifacts/local-volume-provisioner
destination: destination:
server: {{ .Values.destination.server }} server: {{ default .Values.defaultDestination.server }}
namespace: kube-system namespace: kube-system
{{- end }} {{- end }}

View File

@ -1,6 +1,7 @@
destination: defaultDestination:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
source:
defaultSource:
# This repoURL is used a base for all the repoURLs applications # This repoURL is used a base for all the repoURLs applications
# Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be # Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be
# integrated into any repository as a git subtree if for example public internet access is unavailable # integrated into any repository as a git subtree if for example public internet access is unavailable

View File

@ -1,7 +1,7 @@
apiVersion: v2 apiVersion: v2
description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform description: KubeZero Helm chart to install Zero Down Time Kuberenetes platform
name: kubezero name: kubezero
version: 0.1.7 version: 0.1.8
home: https://kubezero.com home: https://kubezero.com
keywords: keywords:
- kubezero - kubezero

View File

@ -15,11 +15,18 @@ spec:
repoURL: https://github.com/Zero-Down-Time/kubezero repoURL: https://github.com/Zero-Down-Time/kubezero
targetRevision: HEAD targetRevision: HEAD
path: charts/kubezero-app path: charts/kubezero-app
{{- if .Values.config }}
helm:
values: |
{{- toYaml .Values.config | nindent 8 }}
{{- end }}
destination: destination:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
namespace: argocd namespace: argocd
syncPolicy: syncPolicy:
automated: automated:
prune: false prune: true
selfHeal: false selfHeal: false
{{- end }} {{- end }}

View File

@ -24,4 +24,8 @@ spec:
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
- namespace: cert-manager - namespace: cert-manager
server: https://kubernetes.default.svc server: https://kubernetes.default.svc
clusterResourceWhitelist:
- group: '*'
kind: '*'
{{- end }} {{- end }}

View File

@ -1,5 +1,14 @@
bootstrap: true bootstrap: true
#config:
# defaultSource:
# repoURL: https://myprivate.repo.com/k8s-components
# pathPrefix: 'some-folder'
#
# # Enabled component
# calico:
# enabled: true
argo-cd: argo-cd:
installCRDs: false installCRDs: false