From 94ccee0325b277a9971beae92753d6133ecdb0c3 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 6 May 2020 18:20:53 +0100 Subject: [PATCH] New consitent naming scheme for umbrella charts/artifacts --- artifacts/{calico => kubezero-calico}/README.md | 0 artifacts/{calico => kubezero-calico}/canal.yaml | 0 artifacts/{calico => kubezero-calico}/kustomization.yaml | 0 artifacts/{calico => kubezero-calico}/logging.yaml | 0 artifacts/{calico => kubezero-calico}/prometheus.yaml | 0 .../README.md | 0 .../kustomization.yaml | 0 .../local-sc-xfs.yaml | 0 .../local-volume-provisioner.yaml | 0 .../update.sh | 0 .../values.yaml | 0 charts/{kubezeroApp => kubezero-app}/.helmignore | 0 charts/{kubezeroApp => kubezero-app}/Chart.yaml | 4 ++-- charts/{kubezeroApp => kubezero-app}/README.md | 0 .../{kubezeroApp => kubezero-app}/templates/_apps_common.yaml | 4 ++-- charts/{kubezeroApp => kubezero-app}/templates/calico.yaml | 0 .../{kubezeroApp => kubezero-app}/templates/cert-manager.yaml | 4 ++-- charts/kubezero-app/templates/local-volume-provisioner.yaml | 3 +++ charts/{kubezeroApp => kubezero-app}/values-all.yaml | 4 ++-- charts/{kubezeroApp => kubezero-app}/values.yaml | 4 ++-- .../.helmignore | 0 .../{kubezeroCertManager => kubezero-cert-manager}/Chart.lock | 0 .../{kubezeroCertManager => kubezero-cert-manager}/Chart.yaml | 2 +- .../crds/cert-manager-crds.yaml | 0 .../templates/cluster-issuer.yaml | 0 .../update_crds.sh | 0 .../values.yaml | 0 charts/kubezeroApp/templates/local-volume-provisioner.yaml | 3 --- 28 files changed, 14 insertions(+), 14 deletions(-) rename artifacts/{calico => kubezero-calico}/README.md (100%) rename artifacts/{calico => kubezero-calico}/canal.yaml (100%) rename artifacts/{calico => kubezero-calico}/kustomization.yaml (100%) rename artifacts/{calico => kubezero-calico}/logging.yaml (100%) rename artifacts/{calico => kubezero-calico}/prometheus.yaml (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/README.md (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/kustomization.yaml (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/local-sc-xfs.yaml (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/local-volume-provisioner.yaml (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/update.sh (100%) rename artifacts/{local-volume-provisioner => kubezero-local-volume-provisioner}/values.yaml (100%) rename charts/{kubezeroApp => kubezero-app}/.helmignore (100%) rename charts/{kubezeroApp => kubezero-app}/Chart.yaml (85%) rename charts/{kubezeroApp => kubezero-app}/README.md (100%) rename charts/{kubezeroApp => kubezero-app}/templates/_apps_common.yaml (95%) rename charts/{kubezeroApp => kubezero-app}/templates/calico.yaml (100%) rename charts/{kubezeroApp => kubezero-app}/templates/cert-manager.yaml (53%) create mode 100644 charts/kubezero-app/templates/local-volume-provisioner.yaml rename charts/{kubezeroApp => kubezero-app}/values-all.yaml (92%) rename charts/{kubezeroApp => kubezero-app}/values.yaml (94%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/.helmignore (100%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/Chart.lock (100%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/Chart.yaml (91%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/crds/cert-manager-crds.yaml (100%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/templates/cluster-issuer.yaml (100%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/update_crds.sh (100%) rename charts/{kubezeroCertManager => kubezero-cert-manager}/values.yaml (100%) delete mode 100644 charts/kubezeroApp/templates/local-volume-provisioner.yaml diff --git a/artifacts/calico/README.md b/artifacts/kubezero-calico/README.md similarity index 100% rename from artifacts/calico/README.md rename to artifacts/kubezero-calico/README.md diff --git a/artifacts/calico/canal.yaml b/artifacts/kubezero-calico/canal.yaml similarity index 100% rename from artifacts/calico/canal.yaml rename to artifacts/kubezero-calico/canal.yaml diff --git a/artifacts/calico/kustomization.yaml b/artifacts/kubezero-calico/kustomization.yaml similarity index 100% rename from artifacts/calico/kustomization.yaml rename to artifacts/kubezero-calico/kustomization.yaml diff --git a/artifacts/calico/logging.yaml b/artifacts/kubezero-calico/logging.yaml similarity index 100% rename from artifacts/calico/logging.yaml rename to artifacts/kubezero-calico/logging.yaml diff --git a/artifacts/calico/prometheus.yaml b/artifacts/kubezero-calico/prometheus.yaml similarity index 100% rename from artifacts/calico/prometheus.yaml rename to artifacts/kubezero-calico/prometheus.yaml diff --git a/artifacts/local-volume-provisioner/README.md b/artifacts/kubezero-local-volume-provisioner/README.md similarity index 100% rename from artifacts/local-volume-provisioner/README.md rename to artifacts/kubezero-local-volume-provisioner/README.md diff --git a/artifacts/local-volume-provisioner/kustomization.yaml b/artifacts/kubezero-local-volume-provisioner/kustomization.yaml similarity index 100% rename from artifacts/local-volume-provisioner/kustomization.yaml rename to artifacts/kubezero-local-volume-provisioner/kustomization.yaml diff --git a/artifacts/local-volume-provisioner/local-sc-xfs.yaml b/artifacts/kubezero-local-volume-provisioner/local-sc-xfs.yaml similarity index 100% rename from artifacts/local-volume-provisioner/local-sc-xfs.yaml rename to artifacts/kubezero-local-volume-provisioner/local-sc-xfs.yaml diff --git a/artifacts/local-volume-provisioner/local-volume-provisioner.yaml b/artifacts/kubezero-local-volume-provisioner/local-volume-provisioner.yaml similarity index 100% rename from artifacts/local-volume-provisioner/local-volume-provisioner.yaml rename to artifacts/kubezero-local-volume-provisioner/local-volume-provisioner.yaml diff --git a/artifacts/local-volume-provisioner/update.sh b/artifacts/kubezero-local-volume-provisioner/update.sh similarity index 100% rename from artifacts/local-volume-provisioner/update.sh rename to artifacts/kubezero-local-volume-provisioner/update.sh diff --git a/artifacts/local-volume-provisioner/values.yaml b/artifacts/kubezero-local-volume-provisioner/values.yaml similarity index 100% rename from artifacts/local-volume-provisioner/values.yaml rename to artifacts/kubezero-local-volume-provisioner/values.yaml diff --git a/charts/kubezeroApp/.helmignore b/charts/kubezero-app/.helmignore similarity index 100% rename from charts/kubezeroApp/.helmignore rename to charts/kubezero-app/.helmignore diff --git a/charts/kubezeroApp/Chart.yaml b/charts/kubezero-app/Chart.yaml similarity index 85% rename from charts/kubezeroApp/Chart.yaml rename to charts/kubezero-app/Chart.yaml index 42ed7e9..52cffa2 100644 --- a/charts/kubezeroApp/Chart.yaml +++ b/charts/kubezero-app/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -name: kubezeroApp +name: kubezero-app description: KubeZero ArgoCD Application - Root chart of the KubeZero type: application -version: 0.1.8 +version: 0.1.9 home: https://kubezero.com keywords: - kubezero diff --git a/charts/kubezeroApp/README.md b/charts/kubezero-app/README.md similarity index 100% rename from charts/kubezeroApp/README.md rename to charts/kubezero-app/README.md diff --git a/charts/kubezeroApp/templates/_apps_common.yaml b/charts/kubezero-app/templates/_apps_common.yaml similarity index 95% rename from charts/kubezeroApp/templates/_apps_common.yaml rename to charts/kubezero-app/templates/_apps_common.yaml index 05f18a5..8e4fdf5 100644 --- a/charts/kubezeroApp/templates/_apps_common.yaml +++ b/charts/kubezero-app/templates/_apps_common.yaml @@ -17,14 +17,14 @@ spec: targetRevision: {{ default .root.Values.defaultSource.targetRevision }} {{- if eq .type "helm" }} {{ $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 }} helm: values: | {{- toYaml $values | nindent 8 }} {{- end }} {{- else }} - path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/{{ .name }} + path: {{ default .root.Values.defaultSource.pathPrefix }}artifacts/kubezero-{{ .name }} {{- end }} destination: diff --git a/charts/kubezeroApp/templates/calico.yaml b/charts/kubezero-app/templates/calico.yaml similarity index 100% rename from charts/kubezeroApp/templates/calico.yaml rename to charts/kubezero-app/templates/calico.yaml diff --git a/charts/kubezeroApp/templates/cert-manager.yaml b/charts/kubezero-app/templates/cert-manager.yaml similarity index 53% rename from charts/kubezeroApp/templates/cert-manager.yaml rename to charts/kubezero-app/templates/cert-manager.yaml index 83d3733..ed61de6 100644 --- a/charts/kubezeroApp/templates/cert-manager.yaml +++ b/charts/kubezero-app/templates/cert-manager.yaml @@ -1,5 +1,5 @@ -{{- if .Values.certManager.enabled }} -{{ template "kubezero.app" dict "root" . "name" "certManager" "type" "helm" }} +{{- if index .Values "cert-manager" "enabled" }} +{{ template "kubezero.app" dict "root" . "name" "cert-manager" "type" "helm" }} --- apiVersion: v1 kind: Namespace diff --git a/charts/kubezero-app/templates/local-volume-provisioner.yaml b/charts/kubezero-app/templates/local-volume-provisioner.yaml new file mode 100644 index 0000000..490efbb --- /dev/null +++ b/charts/kubezero-app/templates/local-volume-provisioner.yaml @@ -0,0 +1,3 @@ +{{- if index .Values "local-volume-provisioner" "enabled" }} +{{ template "kubezero.app" dict "root" . "name" "local-volume-provisioner" "type" "kustomize" }} +{{- end }} diff --git a/charts/kubezeroApp/values-all.yaml b/charts/kubezero-app/values-all.yaml similarity index 92% rename from charts/kubezeroApp/values-all.yaml rename to charts/kubezero-app/values-all.yaml index ebbbcb9..2920d7e 100644 --- a/charts/kubezeroApp/values-all.yaml +++ b/charts/kubezero-app/values-all.yaml @@ -12,8 +12,8 @@ defaultSource: calico: enabled: true -localVolumeProvisioner: +local-volume-provisioner: enabled: true -certManager: +cert-manager: enabled: true diff --git a/charts/kubezeroApp/values.yaml b/charts/kubezero-app/values.yaml similarity index 94% rename from charts/kubezeroApp/values.yaml rename to charts/kubezero-app/values.yaml index 3f84417..aef4cbc 100644 --- a/charts/kubezeroApp/values.yaml +++ b/charts/kubezero-app/values.yaml @@ -15,8 +15,8 @@ defaultSource: calico: enabled: false -localVolumeProvisioner: +local-volume-provisioner: enabled: false -certManager: +cert-manager: enabled: false diff --git a/charts/kubezeroCertManager/.helmignore b/charts/kubezero-cert-manager/.helmignore similarity index 100% rename from charts/kubezeroCertManager/.helmignore rename to charts/kubezero-cert-manager/.helmignore diff --git a/charts/kubezeroCertManager/Chart.lock b/charts/kubezero-cert-manager/Chart.lock similarity index 100% rename from charts/kubezeroCertManager/Chart.lock rename to charts/kubezero-cert-manager/Chart.lock diff --git a/charts/kubezeroCertManager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml similarity index 91% rename from charts/kubezeroCertManager/Chart.yaml rename to charts/kubezero-cert-manager/Chart.yaml index 2143607..ba67d3e 100644 --- a/charts/kubezeroCertManager/Chart.yaml +++ b/charts/kubezero-cert-manager/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: kubezeroCertManager +name: kubezero-cert-manager description: KubeZero Umbrella Chart for cert-manager type: application version: 0.1.1 diff --git a/charts/kubezeroCertManager/crds/cert-manager-crds.yaml b/charts/kubezero-cert-manager/crds/cert-manager-crds.yaml similarity index 100% rename from charts/kubezeroCertManager/crds/cert-manager-crds.yaml rename to charts/kubezero-cert-manager/crds/cert-manager-crds.yaml diff --git a/charts/kubezeroCertManager/templates/cluster-issuer.yaml b/charts/kubezero-cert-manager/templates/cluster-issuer.yaml similarity index 100% rename from charts/kubezeroCertManager/templates/cluster-issuer.yaml rename to charts/kubezero-cert-manager/templates/cluster-issuer.yaml diff --git a/charts/kubezeroCertManager/update_crds.sh b/charts/kubezero-cert-manager/update_crds.sh similarity index 100% rename from charts/kubezeroCertManager/update_crds.sh rename to charts/kubezero-cert-manager/update_crds.sh diff --git a/charts/kubezeroCertManager/values.yaml b/charts/kubezero-cert-manager/values.yaml similarity index 100% rename from charts/kubezeroCertManager/values.yaml rename to charts/kubezero-cert-manager/values.yaml diff --git a/charts/kubezeroApp/templates/local-volume-provisioner.yaml b/charts/kubezeroApp/templates/local-volume-provisioner.yaml deleted file mode 100644 index 3c691b6..0000000 --- a/charts/kubezeroApp/templates/local-volume-provisioner.yaml +++ /dev/null @@ -1,3 +0,0 @@ -{{- if .Values.localVolumeProvisioner.enabled }} -{{ template "kubezero.app" dict "root" . "name" "localVolumeProvisioner" "type" "kustomize" }} -{{- end }}