New consitent naming scheme for umbrella charts/artifacts

This commit is contained in:
Stefan Reimer 2020-05-06 18:20:53 +01:00
parent 3259b1362d
commit 46774f5df4
28 changed files with 14 additions and 14 deletions

View File

@ -1,8 +1,8 @@
apiVersion: v2 apiVersion: v2
name: kubezeroApp 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.8 version: 0.1.9
home: https://kubezero.com home: https://kubezero.com
keywords: keywords:
- kubezero - kubezero

View File

@ -17,14 +17,14 @@ spec:
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" }} {{ $values := index .root.Values .name "values" }}
path: {{ default .root.Values.defaultSource.pathPrefix }}charts/kubezero{{ .name }} path: {{ default .root.Values.defaultSource.pathPrefix }}charts/kubezero-{{ .name }}
{{- if $values }} {{- if $values }}
helm: helm:
values: | values: |
{{- toYaml $values | nindent 8 }} {{- toYaml $values | nindent 8 }}
{{- end }} {{- end }}
{{- else }} {{- else }}
path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/{{ .name }} path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/kubezero-{{ .name }}
{{- end }} {{- end }}
destination: destination:

View File

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

View File

@ -0,0 +1,3 @@
{{- if index .Values "local-volume-provisioner" "enabled" }}
{{ template "kubezero.app" dict "root" . "name" "local-volume-provisioner" "type" "kustomize" }}
{{- end }}

View File

@ -12,8 +12,8 @@ defaultSource:
calico: calico:
enabled: true enabled: true
localVolumeProvisioner: local-volume-provisioner:
enabled: true enabled: true
certManager: cert-manager:
enabled: true enabled: true

View File

@ -15,8 +15,8 @@ defaultSource:
calico: calico:
enabled: false enabled: false
localVolumeProvisioner: local-volume-provisioner:
enabled: false enabled: false
certManager: cert-manager:
enabled: false enabled: false

View File

@ -1,5 +1,5 @@
apiVersion: v2 apiVersion: v2
name: kubezeroCertManager name: kubezero-cert-manager
description: KubeZero Umbrella Chart for cert-manager description: KubeZero Umbrella Chart for cert-manager
type: application type: application
version: 0.1.1 version: 0.1.1

View File

@ -1,3 +0,0 @@
{{- if .Values.localVolumeProvisioner.enabled }}
{{ template "kubezero.app" dict "root" . "name" "localVolumeProvisioner" "type" "kustomize" }}
{{- end }}