changed charts location

blablacar · Apr 11, 2024 · 7af1cee · 7af1cee
1 parent adf81f3
commit 7af1cee
Show file tree

Hide file tree

Showing 21 changed files with 326 additions and 309 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
       - uses: azure/setup-helm@v4
       - name: testing helm chart
         run: |
+          cd charts/redash
           helm lint .
           helm dependency build .
           cat > test-values.yaml <<- EOM
@@ -74,24 +75,10 @@ jobs:
         with:
           fetch-depth: 0
       - uses: azure/setup-helm@v4
-      - id: get-chart-version
-        uses: mikefarah/yq@master
-        with:
-          cmd: yq '.version' Chart.yaml
-      - id: skip-check
-        env:
-          VERSION: v${{ steps.get-chart-version.outputs.result }}
+      - name: configure git
         run: |
-          if git show-ref --tags --quiet --verify -- "refs/tags/$VERSION"; then
-            echo "Release already exists, skipping publish job"
-            echo skip=true >> "$GITHUB_OUTPUT"
-          else
-            echo "Tagging release"
-            git tag "$VERSION"
-            git push origin "$VERSION"
-            echo skip=false >> "$GITHUB_OUTPUT"
-          fi
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
       - uses: helm/chart-releaser-action@v1.6.0
-        if: steps.skip-check.outputs.skip == 'false'
         env:
           CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-charts
+charts/**/charts
 keys
 my-values.yaml
 .idea
-.vscode
+.vscode
diff --git a/README.md b/README.md
diff --git a/Chart.yaml → charts/redash/Chart.yaml b/Chart.yaml → charts/redash/Chart.yaml
diff --git a/charts/redash/README.md b/charts/redash/README.md
diff --git a/README.md.gotmpl → charts/redash/README.md.gotmpl b/README.md.gotmpl → charts/redash/README.md.gotmpl
diff --git a/requirements.lock → charts/redash/requirements.lock b/requirements.lock → charts/redash/requirements.lock
diff --git a/requirements.yaml → charts/redash/requirements.yaml b/requirements.yaml → charts/redash/requirements.yaml
diff --git a/templates/NOTES.txt → charts/redash/templates/NOTES.txt b/templates/NOTES.txt → charts/redash/templates/NOTES.txt
diff --git a/templates/_helpers.tpl → charts/redash/templates/_helpers.tpl b/templates/_helpers.tpl → charts/redash/templates/_helpers.tpl
diff --git a/templates/extra-manifests.yaml → charts/redash/templates/extra-manifests.yaml b/templates/extra-manifests.yaml → charts/redash/templates/extra-manifests.yaml
diff --git a/templates/hook-migrations-job.yaml → ...redash/templates/hook-migrations-job.yaml b/templates/hook-migrations-job.yaml → ...redash/templates/hook-migrations-job.yaml
diff --git a/templates/ingress.yaml → charts/redash/templates/ingress.yaml b/templates/ingress.yaml → charts/redash/templates/ingress.yaml
diff --git a/templates/scheduler-deployment.yaml → ...edash/templates/scheduler-deployment.yaml b/templates/scheduler-deployment.yaml → ...edash/templates/scheduler-deployment.yaml
diff --git a/templates/secrets.yaml → charts/redash/templates/secrets.yaml b/templates/secrets.yaml → charts/redash/templates/secrets.yaml
diff --git a/templates/server-deployment.yaml → ...s/redash/templates/server-deployment.yaml b/templates/server-deployment.yaml → ...s/redash/templates/server-deployment.yaml
diff --git a/templates/service.yaml → charts/redash/templates/service.yaml b/templates/service.yaml → charts/redash/templates/service.yaml
diff --git a/templates/serviceaccount.yaml → charts/redash/templates/serviceaccount.yaml b/templates/serviceaccount.yaml → charts/redash/templates/serviceaccount.yaml
diff --git a/templates/tests/test-connection.yaml → ...dash/templates/tests/test-connection.yaml b/templates/tests/test-connection.yaml → ...dash/templates/tests/test-connection.yaml
diff --git a/templates/worker-deployment.yaml → ...s/redash/templates/worker-deployment.yaml b/templates/worker-deployment.yaml → ...s/redash/templates/worker-deployment.yaml
diff --git a/values.yaml → charts/redash/values.yaml b/values.yaml → charts/redash/values.yaml