build(helm): Helm-docs + fix Helm chart release (#21963)

apache · Oct 29, 2022 · ae9a30b · ae9a30b
1 parent efefb66
commit ae9a30b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/superset-helm-release.yml b/.github/workflows/superset-helm-release.yml
@@ -3,9 +3,9 @@ name: Release Charts
 on:
   push:
     branches:
-      - 'master'
+      - "master"
     paths:
-      - 'helm/**'
+      - "helm/**"
 
 jobs:
   release:
@@ -28,6 +28,9 @@ jobs:
         with:
           version: v3.5.4
 
+      - name: Add bitnami repo dependency
+        run: helm repo add bitnami https://charts.bitnami.com/bitnami
+
       - name: Run chart-releaser
         uses: ./.github/actions/chart-releaser-action
         with:

diff --git a/.github/workflows/superset-python-misc.yml b/.github/workflows/superset-python-misc.yml
@@ -33,8 +33,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-          cache-dependency-path: 'requirements/testing.txt'
+          cache: "pip"
+          cache-dependency-path: "requirements/testing.txt"
       - name: Install dependencies
         if: steps.check.outcome == 'failure'
         uses: ./.github/actions/cached-dependencies
@@ -65,7 +65,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
+          cache: "pip"
           cache-dependency-path: |
             requirements/base.txt
             requirements/integration.txt
@@ -78,6 +78,15 @@ jobs:
             pip install wheel
             pip install -r requirements/base.txt
             pip install -r requirements/integration.txt
+      # Add brew to the path - see https://github.com/actions/runner-images/issues/6283
+      - name: Enable brew and helm-docs
+        run: |
+          echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+          echo "HOMEBREW_PREFIX=$HOMEBREW_PREFIX" >>"${GITHUB_ENV}"
+          echo "HOMEBREW_CELLAR=$HOMEBREW_CELLAR" >>"${GITHUB_ENV}"
+          echo "HOMEBREW_REPOSITORY=$HOMEBREW_REPOSITORY" >>"${GITHUB_ENV}"
+          brew install norwoodj/tap/helm-docs
       - name: pre-commit
         run: pre-commit run --all-files
 
@@ -97,8 +106,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
-          cache-dependency-path: 'requirements/base.txt'
+          cache: "pip"
+          cache-dependency-path: "requirements/base.txt"
       - name: Install dependencies
         uses: ./.github/actions/cached-dependencies
         with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -49,11 +49,16 @@ repos:
     rev: v2.4.1 # Use the sha or tag you want to point at
     hooks:
       - id: prettier
-        args: ['--ignore-path=./superset-frontend/.prettierignore']
-        files: 'superset-frontend'
+        args: ["--ignore-path=./superset-frontend/.prettierignore"]
+        files: "superset-frontend"
   # blacklist unsafe functions like make_url (see #19526)
   - repo: https://github.com/skorokithakis/blacklist-pre-commit-hook
     rev: e2f070289d8eddcaec0b580d3bde29437e7c8221
     hooks:
       - id: blacklist
         args: ["--blacklisted-names=make_url", "--ignore=tests/"]
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: v1.11.0
+    hooks:
+      - id: helm-docs
+        files: helm
diff --git a/helm/superset/Chart.yaml b/helm/superset/Chart.yaml
@@ -29,7 +29,7 @@ maintainers:
   - name: craig-rueda
     email: craig@craigrueda.com
     url: https://github.com/craig-rueda
-version: 0.7.5
+version: 0.7.6
 dependencies:
   - name: postgresql
     version: 11.1.22

diff --git a/helm/superset/README.md b/helm/superset/README.md
@@ -19,7 +19,7 @@
 
 # superset
 
-![Version: 0.7.5](https://img.shields.io/badge/Version-0.7.5-informational?style=flat-square)
+![Version: 0.7.6](https://img.shields.io/badge/Version-0.7.6-informational?style=flat-square)
 
 Apache Superset is a modern, enterprise-ready business intelligence web application