From 12f73c02111848659df0f71fae7680d617d40de7 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 19 May 2020 16:25:29 +0100 Subject: [PATCH] Add aws-ebs-csi-driver into root app, rename module properly --- charts/kubezero-app/Chart.yaml | 2 +- charts/kubezero-app/templates/aws-ebs-csi-driver.yaml | 3 +++ charts/kubezero-app/values-all.yaml | 3 +++ charts/kubezero-app/values.yaml | 3 +++ .../.helmignore | 0 .../Chart.yaml | 2 +- .../README.md | 0 .../charts/aws-ebs-csi-driver/.helmignore | 0 .../charts/aws-ebs-csi-driver/Chart.yaml | 0 .../charts/aws-ebs-csi-driver/templates/NOTES.txt | 0 .../charts/aws-ebs-csi-driver/templates/_helpers.tpl | 0 .../charts/aws-ebs-csi-driver/templates/csidriver.yaml | 0 .../charts/aws-ebs-csi-driver/templates/daemonset.yaml | 0 .../charts/aws-ebs-csi-driver/templates/deployment.yaml | 0 .../charts/aws-ebs-csi-driver/templates/rbac.yaml | 0 .../charts/aws-ebs-csi-driver/templates/serviceaccount.yaml | 0 .../charts/aws-ebs-csi-driver/templates/statefulset.yaml | 0 .../charts/aws-ebs-csi-driver/values.yaml | 0 .../templates/snapshot-class.yaml | 0 .../templates/storage-class.yaml | 0 .../update.sh | 0 .../values.yaml | 0 22 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 charts/kubezero-app/templates/aws-ebs-csi-driver.yaml rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/.helmignore (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/Chart.yaml (93%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/README.md (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/.helmignore (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/Chart.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/NOTES.txt (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/_helpers.tpl (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/csidriver.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/daemonset.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/deployment.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/rbac.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/templates/statefulset.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/charts/aws-ebs-csi-driver/values.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/templates/snapshot-class.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/templates/storage-class.yaml (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/update.sh (100%) rename charts/{kubezero-aws-ebs => kubezero-aws-ebs-csi-driver}/values.yaml (100%) diff --git a/charts/kubezero-app/Chart.yaml b/charts/kubezero-app/Chart.yaml index f14be38..adab879 100644 --- a/charts/kubezero-app/Chart.yaml +++ b/charts/kubezero-app/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-app description: KubeZero ArgoCD Application - Root chart of the KubeZero type: application -version: 0.2.1 +version: 0.2.2 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/logo_small.png keywords: diff --git a/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml b/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml new file mode 100644 index 0000000..cf4e108 --- /dev/null +++ b/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml @@ -0,0 +1,3 @@ +{{- if index .Values "aws-ebs-csi-driver" "enabled" }} +{{ template "kubezero-app.app" dict "root" . "name" "aws-ebs-csi-driver" "type" "helm" }} +{{- end }} diff --git a/charts/kubezero-app/values-all.yaml b/charts/kubezero-app/values-all.yaml index acfbcfb..d939434 100644 --- a/charts/kubezero-app/values-all.yaml +++ b/charts/kubezero-app/values-all.yaml @@ -24,3 +24,6 @@ cert-manager: kiam: enabled: true + +aws-ebs-csi-driver: + enabled: true diff --git a/charts/kubezero-app/values.yaml b/charts/kubezero-app/values.yaml index 0b88a44..c888333 100644 --- a/charts/kubezero-app/values.yaml +++ b/charts/kubezero-app/values.yaml @@ -24,3 +24,6 @@ cert-manager: kiam: enabled: false + +aws-ebs-csi-driver: + enabled: false diff --git a/charts/kubezero-aws-ebs/.helmignore b/charts/kubezero-aws-ebs-csi-driver/.helmignore similarity index 100% rename from charts/kubezero-aws-ebs/.helmignore rename to charts/kubezero-aws-ebs-csi-driver/.helmignore diff --git a/charts/kubezero-aws-ebs/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml similarity index 93% rename from charts/kubezero-aws-ebs/Chart.yaml rename to charts/kubezero-aws-ebs-csi-driver/Chart.yaml index 2349320..111306d 100644 --- a/charts/kubezero-aws-ebs/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: kubezero-aws-ebs +name: kubezero-aws-ebs-csi-driver description: KubeZero Umbrella Chart for aws-ebs-csi-driver type: application version: 0.1.0 diff --git a/charts/kubezero-aws-ebs/README.md b/charts/kubezero-aws-ebs-csi-driver/README.md similarity index 100% rename from charts/kubezero-aws-ebs/README.md rename to charts/kubezero-aws-ebs-csi-driver/README.md diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/.helmignore b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/.helmignore rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/Chart.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/NOTES.txt b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/NOTES.txt rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/_helpers.tpl b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/_helpers.tpl rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/csidriver.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/csidriver.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/daemonset.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/daemonset.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/daemonset.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/daemonset.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/deployment.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/deployment.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/deployment.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/deployment.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/rbac.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rbac.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/rbac.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rbac.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/statefulset.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/statefulset.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/statefulset.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/statefulset.yaml diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml similarity index 100% rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/values.yaml rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml diff --git a/charts/kubezero-aws-ebs/templates/snapshot-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml similarity index 100% rename from charts/kubezero-aws-ebs/templates/snapshot-class.yaml rename to charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml diff --git a/charts/kubezero-aws-ebs/templates/storage-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml similarity index 100% rename from charts/kubezero-aws-ebs/templates/storage-class.yaml rename to charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml diff --git a/charts/kubezero-aws-ebs/update.sh b/charts/kubezero-aws-ebs-csi-driver/update.sh similarity index 100% rename from charts/kubezero-aws-ebs/update.sh rename to charts/kubezero-aws-ebs-csi-driver/update.sh diff --git a/charts/kubezero-aws-ebs/values.yaml b/charts/kubezero-aws-ebs-csi-driver/values.yaml similarity index 100% rename from charts/kubezero-aws-ebs/values.yaml rename to charts/kubezero-aws-ebs-csi-driver/values.yaml