From c9837a4b9b61fb0f3de18a5d1f0869c473ca88b6 Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Fri, 13 Nov 2020 08:39:29 -0500 Subject: [PATCH] Move all charts into /charts dir Attempting to get helm/charts-releaser to detect changes to our charts and publish them. It seems the GHA expects this layout. See discussion: https://github.com/helm/chart-releaser-action/issues/36 And default dir: https://github.com/helm/chart-releaser-action/blob/master/action.yml#L14 Signed-off-by: Daniel Farrell --- .github/workflows/linting.yml | 2 +- README.md | 4 ++-- .../submariner-k8s-broker}/.helmignore | 0 .../submariner-k8s-broker}/Chart.yaml | 0 .../submariner-k8s-broker}/app-readme.md | 0 .../submariner-k8s-broker}/crds/crd.yaml | 0 .../submariner-k8s-broker}/questions.yml | 0 .../submariner-k8s-broker}/templates/NOTES.txt | 0 .../submariner-k8s-broker}/templates/_helpers.tpl | 0 .../submariner-k8s-broker}/templates/rbac.yaml | 0 .../submariner-k8s-broker}/templates/svc-acct.yaml | 0 .../submariner-k8s-broker}/values.yaml | 0 .../submariner-operator}/.helmignore | 0 .../submariner-operator}/Chart.yaml | 0 .../submariner-operator}/app-readme.md | 0 .../submariner-operator}/crds/crd.yaml | 0 .../submariner-operator}/questions.yml | 0 .../submariner-operator}/templates/NOTES.txt | 0 .../submariner-operator}/templates/_helpers.tpl | 0 .../submariner-operator}/templates/operator-deployment.yaml | 0 .../submariner-operator}/templates/rbac.yaml | 0 .../submariner-operator}/templates/submariner.yaml | 0 .../submariner-operator}/templates/svc-acct.yaml | 0 .../submariner-operator}/values.yaml | 0 {submariner => charts/submariner}/.helmignore | 0 {submariner => charts/submariner}/Chart.yaml | 0 {submariner => charts/submariner}/app-readme.md | 0 {submariner => charts/submariner}/crds/crd.yaml | 0 {submariner => charts/submariner}/questions.yml | 0 {submariner => charts/submariner}/templates/NOTES.txt | 0 {submariner => charts/submariner}/templates/_helpers.tpl | 0 .../submariner}/templates/engine-deploy.yaml | 0 {submariner => charts/submariner}/templates/globalnet.yaml | 0 .../submariner}/templates/lighthouse-coredns.yaml | 0 {submariner => charts/submariner}/templates/lighthouse.yaml | 0 {submariner => charts/submariner}/templates/rbac.yaml | 0 .../submariner}/templates/route-agent-ds.yaml | 0 {submariner => charts/submariner}/templates/svc-acct.yaml | 0 {submariner => charts/submariner}/values.yaml | 0 deploy_helm | 4 ++-- 40 files changed, 5 insertions(+), 5 deletions(-) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/.helmignore (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/Chart.yaml (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/app-readme.md (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/crds/crd.yaml (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/questions.yml (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/templates/NOTES.txt (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/templates/_helpers.tpl (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/templates/rbac.yaml (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/templates/svc-acct.yaml (100%) rename {submariner-k8s-broker => charts/submariner-k8s-broker}/values.yaml (100%) rename {submariner-operator => charts/submariner-operator}/.helmignore (100%) rename {submariner-operator => charts/submariner-operator}/Chart.yaml (100%) rename {submariner-operator => charts/submariner-operator}/app-readme.md (100%) rename {submariner-operator => charts/submariner-operator}/crds/crd.yaml (100%) rename {submariner-operator => charts/submariner-operator}/questions.yml (100%) rename {submariner-operator => charts/submariner-operator}/templates/NOTES.txt (100%) rename {submariner-operator => charts/submariner-operator}/templates/_helpers.tpl (100%) rename {submariner-operator => charts/submariner-operator}/templates/operator-deployment.yaml (100%) rename {submariner-operator => charts/submariner-operator}/templates/rbac.yaml (100%) rename {submariner-operator => charts/submariner-operator}/templates/submariner.yaml (100%) rename {submariner-operator => charts/submariner-operator}/templates/svc-acct.yaml (100%) rename {submariner-operator => charts/submariner-operator}/values.yaml (100%) rename {submariner => charts/submariner}/.helmignore (100%) rename {submariner => charts/submariner}/Chart.yaml (100%) rename {submariner => charts/submariner}/app-readme.md (100%) rename {submariner => charts/submariner}/crds/crd.yaml (100%) rename {submariner => charts/submariner}/questions.yml (100%) rename {submariner => charts/submariner}/templates/NOTES.txt (100%) rename {submariner => charts/submariner}/templates/_helpers.tpl (100%) rename {submariner => charts/submariner}/templates/engine-deploy.yaml (100%) rename {submariner => charts/submariner}/templates/globalnet.yaml (100%) rename {submariner => charts/submariner}/templates/lighthouse-coredns.yaml (100%) rename {submariner => charts/submariner}/templates/lighthouse.yaml (100%) rename {submariner => charts/submariner}/templates/rbac.yaml (100%) rename {submariner => charts/submariner}/templates/route-agent-ds.yaml (100%) rename {submariner => charts/submariner}/templates/svc-acct.yaml (100%) rename {submariner => charts/submariner}/values.yaml (100%) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 63cf4278..eeaff33e 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -53,5 +53,5 @@ jobs: - name: Run yamllint uses: ibiqlik/action-yamllint@v1 with: - file_or_dir: submariner/Chart.yaml submariner/values.yaml submariner-k8s-broker/Chart.yaml submariner-k8s-broker/values.yaml submariner-operator/Chart.yaml submariner-operator/values.yaml + file_or_dir: charts/submariner/Chart.yaml charts/submariner/values.yaml charts/submariner-k8s-broker/Chart.yaml charts/submariner-k8s-broker/values.yaml charts/submariner-operator/Chart.yaml charts/submariner-operator/values.yaml config_file: .yamllint.yml diff --git a/README.md b/README.md index 24402585..456cb149 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ Now you can modify the helm charts according to your needs. Before serving the modified charts, the charts must be packaged for local usage. ```bash -helm package ./submariner -helm package ./submariner-k8s-broker +helm package ./charts/submariner +helm package ./charts/submariner-k8s-broker ``` Note: if you just installed helm, you have to init the helm, by running diff --git a/submariner-k8s-broker/.helmignore b/charts/submariner-k8s-broker/.helmignore similarity index 100% rename from submariner-k8s-broker/.helmignore rename to charts/submariner-k8s-broker/.helmignore diff --git a/submariner-k8s-broker/Chart.yaml b/charts/submariner-k8s-broker/Chart.yaml similarity index 100% rename from submariner-k8s-broker/Chart.yaml rename to charts/submariner-k8s-broker/Chart.yaml diff --git a/submariner-k8s-broker/app-readme.md b/charts/submariner-k8s-broker/app-readme.md similarity index 100% rename from submariner-k8s-broker/app-readme.md rename to charts/submariner-k8s-broker/app-readme.md diff --git a/submariner-k8s-broker/crds/crd.yaml b/charts/submariner-k8s-broker/crds/crd.yaml similarity index 100% rename from submariner-k8s-broker/crds/crd.yaml rename to charts/submariner-k8s-broker/crds/crd.yaml diff --git a/submariner-k8s-broker/questions.yml b/charts/submariner-k8s-broker/questions.yml similarity index 100% rename from submariner-k8s-broker/questions.yml rename to charts/submariner-k8s-broker/questions.yml diff --git a/submariner-k8s-broker/templates/NOTES.txt b/charts/submariner-k8s-broker/templates/NOTES.txt similarity index 100% rename from submariner-k8s-broker/templates/NOTES.txt rename to charts/submariner-k8s-broker/templates/NOTES.txt diff --git a/submariner-k8s-broker/templates/_helpers.tpl b/charts/submariner-k8s-broker/templates/_helpers.tpl similarity index 100% rename from submariner-k8s-broker/templates/_helpers.tpl rename to charts/submariner-k8s-broker/templates/_helpers.tpl diff --git a/submariner-k8s-broker/templates/rbac.yaml b/charts/submariner-k8s-broker/templates/rbac.yaml similarity index 100% rename from submariner-k8s-broker/templates/rbac.yaml rename to charts/submariner-k8s-broker/templates/rbac.yaml diff --git a/submariner-k8s-broker/templates/svc-acct.yaml b/charts/submariner-k8s-broker/templates/svc-acct.yaml similarity index 100% rename from submariner-k8s-broker/templates/svc-acct.yaml rename to charts/submariner-k8s-broker/templates/svc-acct.yaml diff --git a/submariner-k8s-broker/values.yaml b/charts/submariner-k8s-broker/values.yaml similarity index 100% rename from submariner-k8s-broker/values.yaml rename to charts/submariner-k8s-broker/values.yaml diff --git a/submariner-operator/.helmignore b/charts/submariner-operator/.helmignore similarity index 100% rename from submariner-operator/.helmignore rename to charts/submariner-operator/.helmignore diff --git a/submariner-operator/Chart.yaml b/charts/submariner-operator/Chart.yaml similarity index 100% rename from submariner-operator/Chart.yaml rename to charts/submariner-operator/Chart.yaml diff --git a/submariner-operator/app-readme.md b/charts/submariner-operator/app-readme.md similarity index 100% rename from submariner-operator/app-readme.md rename to charts/submariner-operator/app-readme.md diff --git a/submariner-operator/crds/crd.yaml b/charts/submariner-operator/crds/crd.yaml similarity index 100% rename from submariner-operator/crds/crd.yaml rename to charts/submariner-operator/crds/crd.yaml diff --git a/submariner-operator/questions.yml b/charts/submariner-operator/questions.yml similarity index 100% rename from submariner-operator/questions.yml rename to charts/submariner-operator/questions.yml diff --git a/submariner-operator/templates/NOTES.txt b/charts/submariner-operator/templates/NOTES.txt similarity index 100% rename from submariner-operator/templates/NOTES.txt rename to charts/submariner-operator/templates/NOTES.txt diff --git a/submariner-operator/templates/_helpers.tpl b/charts/submariner-operator/templates/_helpers.tpl similarity index 100% rename from submariner-operator/templates/_helpers.tpl rename to charts/submariner-operator/templates/_helpers.tpl diff --git a/submariner-operator/templates/operator-deployment.yaml b/charts/submariner-operator/templates/operator-deployment.yaml similarity index 100% rename from submariner-operator/templates/operator-deployment.yaml rename to charts/submariner-operator/templates/operator-deployment.yaml diff --git a/submariner-operator/templates/rbac.yaml b/charts/submariner-operator/templates/rbac.yaml similarity index 100% rename from submariner-operator/templates/rbac.yaml rename to charts/submariner-operator/templates/rbac.yaml diff --git a/submariner-operator/templates/submariner.yaml b/charts/submariner-operator/templates/submariner.yaml similarity index 100% rename from submariner-operator/templates/submariner.yaml rename to charts/submariner-operator/templates/submariner.yaml diff --git a/submariner-operator/templates/svc-acct.yaml b/charts/submariner-operator/templates/svc-acct.yaml similarity index 100% rename from submariner-operator/templates/svc-acct.yaml rename to charts/submariner-operator/templates/svc-acct.yaml diff --git a/submariner-operator/values.yaml b/charts/submariner-operator/values.yaml similarity index 100% rename from submariner-operator/values.yaml rename to charts/submariner-operator/values.yaml diff --git a/submariner/.helmignore b/charts/submariner/.helmignore similarity index 100% rename from submariner/.helmignore rename to charts/submariner/.helmignore diff --git a/submariner/Chart.yaml b/charts/submariner/Chart.yaml similarity index 100% rename from submariner/Chart.yaml rename to charts/submariner/Chart.yaml diff --git a/submariner/app-readme.md b/charts/submariner/app-readme.md similarity index 100% rename from submariner/app-readme.md rename to charts/submariner/app-readme.md diff --git a/submariner/crds/crd.yaml b/charts/submariner/crds/crd.yaml similarity index 100% rename from submariner/crds/crd.yaml rename to charts/submariner/crds/crd.yaml diff --git a/submariner/questions.yml b/charts/submariner/questions.yml similarity index 100% rename from submariner/questions.yml rename to charts/submariner/questions.yml diff --git a/submariner/templates/NOTES.txt b/charts/submariner/templates/NOTES.txt similarity index 100% rename from submariner/templates/NOTES.txt rename to charts/submariner/templates/NOTES.txt diff --git a/submariner/templates/_helpers.tpl b/charts/submariner/templates/_helpers.tpl similarity index 100% rename from submariner/templates/_helpers.tpl rename to charts/submariner/templates/_helpers.tpl diff --git a/submariner/templates/engine-deploy.yaml b/charts/submariner/templates/engine-deploy.yaml similarity index 100% rename from submariner/templates/engine-deploy.yaml rename to charts/submariner/templates/engine-deploy.yaml diff --git a/submariner/templates/globalnet.yaml b/charts/submariner/templates/globalnet.yaml similarity index 100% rename from submariner/templates/globalnet.yaml rename to charts/submariner/templates/globalnet.yaml diff --git a/submariner/templates/lighthouse-coredns.yaml b/charts/submariner/templates/lighthouse-coredns.yaml similarity index 100% rename from submariner/templates/lighthouse-coredns.yaml rename to charts/submariner/templates/lighthouse-coredns.yaml diff --git a/submariner/templates/lighthouse.yaml b/charts/submariner/templates/lighthouse.yaml similarity index 100% rename from submariner/templates/lighthouse.yaml rename to charts/submariner/templates/lighthouse.yaml diff --git a/submariner/templates/rbac.yaml b/charts/submariner/templates/rbac.yaml similarity index 100% rename from submariner/templates/rbac.yaml rename to charts/submariner/templates/rbac.yaml diff --git a/submariner/templates/route-agent-ds.yaml b/charts/submariner/templates/route-agent-ds.yaml similarity index 100% rename from submariner/templates/route-agent-ds.yaml rename to charts/submariner/templates/route-agent-ds.yaml diff --git a/submariner/templates/svc-acct.yaml b/charts/submariner/templates/svc-acct.yaml similarity index 100% rename from submariner/templates/svc-acct.yaml rename to charts/submariner/templates/svc-acct.yaml diff --git a/submariner/values.yaml b/charts/submariner/values.yaml similarity index 100% rename from submariner/values.yaml rename to charts/submariner/values.yaml diff --git a/deploy_helm b/deploy_helm index 207c9c3a..90bbc19a 100644 --- a/deploy_helm +++ b/deploy_helm @@ -19,7 +19,7 @@ function setup_broker() { else echo "Installing submariner broker..." # shellcheck disable=SC2086 # Split on purpose - helm install "${SUBMARINER_BROKER_NS}" ./submariner-k8s-broker \ + helm install "${SUBMARINER_BROKER_NS}" ./charts/submariner-k8s-broker \ --create-namespace \ --kube-context "${cluster}" \ --namespace "${SUBMARINER_BROKER_NS}" \ @@ -43,7 +43,7 @@ function helm_install_subm() { echo "Installing Submariner..." # shellcheck disable=SC2086 # Split on purpose helm --kube-context "${cluster}" install submariner-operator \ - ./submariner-operator \ + ./charts/submariner-operator \ --create-namespace \ --namespace "${SUBM_NS}" \ --set ipsec.psk="${SUBMARINER_PSK}" \