Merge branch 'master' into adding-issue-template-specific-to-helm

.github/ct.yaml

@@ -4,7 +4,10 @@ chart-dirs:
   - helm
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
+  - elastic=https://helm.elastic.co
+  - grafana=https://grafana.github.io/helm-charts
 helm-extra-args: --timeout 600s
 check-version-increment: true
 debug: false
-validate-maintainers: false
+validate-maintainers: false
+helm-dependency-extra-args: "--skip-refresh"

.github/workflows/lint_test.yaml

@@ -22,29 +22,41 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.3.1
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
           changed=$(ct list-changed --config .github/ct.yaml)
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
+            echo "changed=true >> $GITHUB_OUTPUT"
           fi
 
       - name: Run chart-testing (lint)
         run: ct lint --config .github/ct.yaml
-
-  # deploy-charts-to-kind:
-  #   name: ${{ matrix.environments }} - gen3 data portal build
+
+  # TODO: add back in when we have tests
+  # deploy-and-test-chart:
+  #   name: Deploy and Test Chart
   #   timeout-minutes: 20
   #   runs-on: ubuntu-latest
-  #   needs: [get-changes-for-envs]
-  #   if: ${{ needs.get-changes-for-envs.outputs.matrix != '[]' && needs.get-changes-for-envs.outputs.matrix != '' }}
   #   steps:
+
+  #     - name: Checkout
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Set up Helm
+  #       uses: azure/setup-helm@v3
+
+  #     - name: Set up chart-testing
+  #       uses: helm/[email protected]
+
+
   #     - name: Create kind cluster
-  #       uses: helm/kind-action@v1.4.0
-  #       if: steps.list-changed.outputs.changed == 'true'
+  #       uses: helm/kind-action@v1.8.0
+
 
-  #     - name: Run chart-testing (install)
-  #       run: ct install
+  #     - name: Run chart install + testing
+  #       run: ct install --charts ./helm/gen3 --config .github/ct.yaml

.gitignore

@@ -1,4 +1,6 @@
 postgres.txt
 **/charts/
 notes/
-Chart.lock
+Chart.lock
+.DS_Store
+_sample-*/

.pre-commit-config.yaml

@@ -1,36 +1,39 @@
 repos:
   - repo: [email protected]:Yelp/detect-secrets
-    rev: v0.13.1
+    rev: v1.5.0
     hooks:
       - id: detect-secrets
         args: ["--baseline", ".secrets.baseline"]
+        additional_dependencies: ["gibberish-detector"]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
     hooks:
       - id: no-commit-to-branch
         args: [--branch, develop, --branch, master, --pattern, release/.*]
-  
+
   # - repo: https://github.com/gruntwork-io/pre-commit
   #   rev: v0.1.17 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
   #   hooks:
   #   - id: helmlint
 
-  - repo: local 
-    hooks: 
-    - id: helm-docs
-      args: []
-      description: Uses 'helm-docs' to create documentation from the Helm chart's 'values.yaml' file, and inserts the result into a corresponding 'README.md' file.
-      entry: git-hook/helm-docs.sh
-      language: script
-      name: Helm Docs
-      require_serial: true
-
-  - repo: local 
-    hooks: 
-    - id: helm-chart-bump
-      args: []
-      description: Updates the .Chart.yaml with updates version if there are changes since master branch. This is to ensure we bump our charts for updates.
-      entry: git-hook/helm-bump.sh
-      language: script
-      name: Helm Docs
-      require_serial: true
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: "v1.14.2"
+    hooks:
+    #  Use a pinned version of helm-docs in a container to generate consistent documentation.
+      - name: helm-docs
+        id: helm-docs-container
+        entry: jnorwood/helm-docs:v1.14.2
+        args:
+        - "--chart-search-root=helm"
+        - "--skip-version-footer"
+
+  - repo: local
+    hooks:
+      - id: helm-chart-bump
+        args: []
+        description: Updates the .Chart.yaml with updates version if there are changes since master branch. This is to ensure we bump our charts for updates.
+        entry: git-hook/helm-bump.sh
+        language: script
+        name: Helm Docs
+        require_serial: true