From df16afd5bf4ee7140542553e992b037e9790026f Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Tue, 7 Jun 2022 11:22:33 +0200 Subject: [PATCH 01/14] add release workflow --- .github/workflows/release.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a92231b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,28 @@ +name: Release Chart + +on: + pull_request: + branches: + - main + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.1.0 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + CR_OWNER: "deviesdevelopment" + CR_GIT_REPO: "helm-charts" + From c468c3010a2780ae3699cc1b528f417cc51f4d3f Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Tue, 7 Jun 2022 11:23:55 +0200 Subject: [PATCH 02/14] tmp don't trgger test workflows --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b442b5d..8c1c330 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,7 +2,7 @@ name: pr validation on: pull_request: branches: - - master + - abc env: IMAGE_NAME: ingress-supervisor-${{ github.event.number }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a92231b..cef8e4c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release Chart on: pull_request: branches: - - main + - master jobs: release: From 0ca27845e2338eb4aa90c01639ee9acee640d20b Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Tue, 7 Jun 2022 12:56:47 +0200 Subject: [PATCH 03/14] install helm in release workflow --- .github/workflows/release.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cef8e4c..3e6ee37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,11 +18,19 @@ jobs: run: | git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - + - name: Install Helm + uses: azure/setup-helm@v1 + with: + version: v3.8.1 + - name: Package Helm Chart + run: | + mkdir .deploys + helm package ingress-supervisor/kubesquid-ingress-supervisor -d .deploys - name: Run chart-releaser uses: helm/chart-releaser-action@v1.1.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_OWNER: "deviesdevelopment" CR_GIT_REPO: "helm-charts" + CR_PACKAGE_PATH: ".deploys From 81e7c44e7e97041b4fddb85d4946a8f85a1b5c58 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Tue, 7 Jun 2022 12:57:45 +0200 Subject: [PATCH 04/14] fix indentation --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e6ee37..4511703 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,6 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Configure Git run: | git config user.name "$GITHUB_ACTOR" @@ -24,8 +23,8 @@ jobs: version: v3.8.1 - name: Package Helm Chart run: | - mkdir .deploys - helm package ingress-supervisor/kubesquid-ingress-supervisor -d .deploys + mkdir .deploys + helm package ingress-supervisor/kubesquid-ingress-supervisor -d .deploys - name: Run chart-releaser uses: helm/chart-releaser-action@v1.1.0 env: From e89fe352614f9333535c8272dcfc3a6628444a7c Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Tue, 7 Jun 2022 16:03:54 +0200 Subject: [PATCH 05/14] fix typo --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4511703..9d08280 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,5 +31,5 @@ jobs: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_OWNER: "deviesdevelopment" CR_GIT_REPO: "helm-charts" - CR_PACKAGE_PATH: ".deploys + CR_PACKAGE_PATH: ".deploys" From 0643089455136f05cb59abd4d07014541b4b110d Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:03:28 +0200 Subject: [PATCH 06/14] format yml --- .github/workflows/release.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d08280..f1a8903 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,24 +9,19 @@ jobs: release: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Configure Git - run: | + - run: | git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - name: Install Helm - uses: azure/setup-helm@v1 - with: + - uses: azure/setup-helm@v1 + with: version: v3.8.1 - - name: Package Helm Chart - run: | + - run: | mkdir .deploys helm package ingress-supervisor/kubesquid-ingress-supervisor -d .deploys - - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.1.0 + - uses: helm/chart-releaser-action@v1.1.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_OWNER: "deviesdevelopment" From 7d34b4a41ac8170d1b04edeaf1e9d20dc2698a49 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:09:23 +0200 Subject: [PATCH 07/14] try setting chart dir --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1a8903..b240d4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,4 +27,5 @@ jobs: CR_OWNER: "deviesdevelopment" CR_GIT_REPO: "helm-charts" CR_PACKAGE_PATH: ".deploys" + CR_CHART_DIR: "/" From 0fd0a1de74ee6ad572ba9d29a4b3d5d44ec59802 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:13:16 +0200 Subject: [PATCH 08/14] add missing s --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b240d4d..387a250 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,5 +27,6 @@ jobs: CR_OWNER: "deviesdevelopment" CR_GIT_REPO: "helm-charts" CR_PACKAGE_PATH: ".deploys" - CR_CHART_DIR: "/" + CR_CHARTS_DIR: "/" + CR_CHARTS_REPO_URL: "https://deviesdevelopment.github.io/helm-charts/" From 4de82ef8c79bee97dd8d46a10c33958eb6095bb7 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:28:01 +0200 Subject: [PATCH 09/14] try using current repo --- .github/workflows/release.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 387a250..cc55653 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,5 @@ jobs: - uses: helm/chart-releaser-action@v1.1.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - CR_OWNER: "deviesdevelopment" - CR_GIT_REPO: "helm-charts" CR_PACKAGE_PATH: ".deploys" - CR_CHARTS_DIR: "/" - CR_CHARTS_REPO_URL: "https://deviesdevelopment.github.io/helm-charts/" From ea2579460874ad63402441c1fb864b5d33d24019 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:30:38 +0200 Subject: [PATCH 10/14] skip existing --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc55653..a599045 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,4 +25,5 @@ jobs: env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_PACKAGE_PATH: ".deploys" + CR_SKIP_EXISTING: "true" From 2224f7201f9ec53002dbb188f1fe1add7611d544 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:34:54 +0200 Subject: [PATCH 11/14] move ingress-supervisor chart to charts/ --- .../kubesquid-ingress-supervisor/.helmignore | 0 .../kubesquid-ingress-supervisor/Chart.yaml | 0 .../kubesquid-ingress-supervisor/templates/NOTES.txt | 0 .../kubesquid-ingress-supervisor/templates/_helpers.tpl | 0 .../kubesquid-ingress-supervisor/templates/configmap.yaml | 0 .../kubesquid-ingress-supervisor/templates/deployment.yaml | 0 .../kubesquid-ingress-supervisor/templates/hpa.yaml | 0 .../kubesquid-ingress-supervisor/templates/ingress.yaml | 0 .../kubesquid-ingress-supervisor/templates/role.yaml | 0 .../kubesquid-ingress-supervisor/templates/rolebinding.yaml | 0 .../kubesquid-ingress-supervisor/templates/service.yaml | 0 .../kubesquid-ingress-supervisor/templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../kubesquid-ingress-supervisor/values.yaml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/.helmignore (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/Chart.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/NOTES.txt (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/_helpers.tpl (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/configmap.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/deployment.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/hpa.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/ingress.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/role.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/rolebinding.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/service.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/serviceaccount.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/values.yaml (100%) diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/.helmignore b/charts/kubesquid-ingress-supervisor/.helmignore similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/.helmignore rename to charts/kubesquid-ingress-supervisor/.helmignore diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml b/charts/kubesquid-ingress-supervisor/Chart.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml rename to charts/kubesquid-ingress-supervisor/Chart.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/NOTES.txt b/charts/kubesquid-ingress-supervisor/templates/NOTES.txt similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/NOTES.txt rename to charts/kubesquid-ingress-supervisor/templates/NOTES.txt diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl b/charts/kubesquid-ingress-supervisor/templates/_helpers.tpl similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl rename to charts/kubesquid-ingress-supervisor/templates/_helpers.tpl diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml b/charts/kubesquid-ingress-supervisor/templates/configmap.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml rename to charts/kubesquid-ingress-supervisor/templates/configmap.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml b/charts/kubesquid-ingress-supervisor/templates/deployment.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml rename to charts/kubesquid-ingress-supervisor/templates/deployment.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/hpa.yaml b/charts/kubesquid-ingress-supervisor/templates/hpa.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/hpa.yaml rename to charts/kubesquid-ingress-supervisor/templates/hpa.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/ingress.yaml b/charts/kubesquid-ingress-supervisor/templates/ingress.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/ingress.yaml rename to charts/kubesquid-ingress-supervisor/templates/ingress.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml b/charts/kubesquid-ingress-supervisor/templates/role.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml rename to charts/kubesquid-ingress-supervisor/templates/role.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml b/charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml rename to charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml b/charts/kubesquid-ingress-supervisor/templates/service.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml rename to charts/kubesquid-ingress-supervisor/templates/service.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml b/charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml rename to charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml b/charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml rename to charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/values.yaml b/charts/kubesquid-ingress-supervisor/values.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/values.yaml rename to charts/kubesquid-ingress-supervisor/values.yaml From d41bbb04ae6f1a1767ea88869bb2d63b3a4a32b7 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:41:21 +0200 Subject: [PATCH 12/14] reset move --- .../kubesquid-ingress-supervisor/.helmignore | 0 .../kubesquid-ingress-supervisor/Chart.yaml | 0 .../kubesquid-ingress-supervisor/templates/NOTES.txt | 0 .../kubesquid-ingress-supervisor/templates/_helpers.tpl | 0 .../kubesquid-ingress-supervisor/templates/configmap.yaml | 0 .../kubesquid-ingress-supervisor/templates/deployment.yaml | 0 .../kubesquid-ingress-supervisor/templates/hpa.yaml | 0 .../kubesquid-ingress-supervisor/templates/ingress.yaml | 0 .../kubesquid-ingress-supervisor/templates/role.yaml | 0 .../kubesquid-ingress-supervisor/templates/rolebinding.yaml | 0 .../kubesquid-ingress-supervisor/templates/service.yaml | 0 .../kubesquid-ingress-supervisor/templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../kubesquid-ingress-supervisor/values.yaml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/.helmignore (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/Chart.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/NOTES.txt (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/_helpers.tpl (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/configmap.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/deployment.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/hpa.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/ingress.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/role.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/rolebinding.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/service.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/serviceaccount.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml (100%) rename {charts => ingress-supervisor}/kubesquid-ingress-supervisor/values.yaml (100%) diff --git a/charts/kubesquid-ingress-supervisor/.helmignore b/ingress-supervisor/kubesquid-ingress-supervisor/.helmignore similarity index 100% rename from charts/kubesquid-ingress-supervisor/.helmignore rename to ingress-supervisor/kubesquid-ingress-supervisor/.helmignore diff --git a/charts/kubesquid-ingress-supervisor/Chart.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/Chart.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/NOTES.txt b/ingress-supervisor/kubesquid-ingress-supervisor/templates/NOTES.txt similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/NOTES.txt rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/NOTES.txt diff --git a/charts/kubesquid-ingress-supervisor/templates/_helpers.tpl b/ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/_helpers.tpl rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl diff --git a/charts/kubesquid-ingress-supervisor/templates/configmap.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/configmap.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/deployment.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/deployment.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/hpa.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/hpa.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/hpa.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/hpa.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/ingress.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/ingress.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/ingress.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/ingress.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/role.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/role.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/service.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/service.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml diff --git a/charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml diff --git a/charts/kubesquid-ingress-supervisor/values.yaml b/ingress-supervisor/kubesquid-ingress-supervisor/values.yaml similarity index 100% rename from charts/kubesquid-ingress-supervisor/values.yaml rename to ingress-supervisor/kubesquid-ingress-supervisor/values.yaml From 0f00e92996772b453c8ff9f6f2949d593d796e24 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:41:52 +0200 Subject: [PATCH 13/14] move --- .../kubesquid-ingress-supervisor/.helmignore | 0 .../kubesquid-ingress-supervisor/Chart.yaml | 0 .../kubesquid-ingress-supervisor/templates/_helpers.tpl | 0 .../kubesquid-ingress-supervisor/templates/configmap.yaml | 0 .../kubesquid-ingress-supervisor/templates/deployment.yaml | 0 .../kubesquid-ingress-supervisor/templates/role.yaml | 0 .../kubesquid-ingress-supervisor/templates/rolebinding.yaml | 0 .../kubesquid-ingress-supervisor/templates/service.yaml | 0 .../kubesquid-ingress-supervisor/templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../kubesquid-ingress-supervisor/values.yaml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/.helmignore (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/Chart.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/_helpers.tpl (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/configmap.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/deployment.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/role.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/rolebinding.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/service.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/serviceaccount.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml (100%) rename {ingress-supervisor => charts}/kubesquid-ingress-supervisor/values.yaml (100%) diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/.helmignore b/charts/kubesquid-ingress-supervisor/.helmignore similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/.helmignore rename to charts/kubesquid-ingress-supervisor/.helmignore diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml b/charts/kubesquid-ingress-supervisor/Chart.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/Chart.yaml rename to charts/kubesquid-ingress-supervisor/Chart.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl b/charts/kubesquid-ingress-supervisor/templates/_helpers.tpl similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/_helpers.tpl rename to charts/kubesquid-ingress-supervisor/templates/_helpers.tpl diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml b/charts/kubesquid-ingress-supervisor/templates/configmap.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/configmap.yaml rename to charts/kubesquid-ingress-supervisor/templates/configmap.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml b/charts/kubesquid-ingress-supervisor/templates/deployment.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/deployment.yaml rename to charts/kubesquid-ingress-supervisor/templates/deployment.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml b/charts/kubesquid-ingress-supervisor/templates/role.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/role.yaml rename to charts/kubesquid-ingress-supervisor/templates/role.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml b/charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/rolebinding.yaml rename to charts/kubesquid-ingress-supervisor/templates/rolebinding.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml b/charts/kubesquid-ingress-supervisor/templates/service.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/service.yaml rename to charts/kubesquid-ingress-supervisor/templates/service.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml b/charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/serviceaccount.yaml rename to charts/kubesquid-ingress-supervisor/templates/serviceaccount.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml b/charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml rename to charts/kubesquid-ingress-supervisor/templates/tests/test-connection.yaml diff --git a/ingress-supervisor/kubesquid-ingress-supervisor/values.yaml b/charts/kubesquid-ingress-supervisor/values.yaml similarity index 100% rename from ingress-supervisor/kubesquid-ingress-supervisor/values.yaml rename to charts/kubesquid-ingress-supervisor/values.yaml From 9a136a9b34453d1fbb98ef190dd97291eb912126 Mon Sep 17 00:00:00 2001 From: Fredrik Mile Date: Wed, 8 Jun 2022 12:42:49 +0200 Subject: [PATCH 14/14] use correct path in helm package --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a599045..c4b42d6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: version: v3.8.1 - run: | mkdir .deploys - helm package ingress-supervisor/kubesquid-ingress-supervisor -d .deploys + helm package charts/kubesquid-ingress-supervisor -d .deploys - uses: helm/chart-releaser-action@v1.1.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"