From d5f36a6e3f4d323da72f922c1ebb179c90018d85 Mon Sep 17 00:00:00 2001 From: Drew Minnear Date: Wed, 1 Oct 2025 15:53:09 -0400 Subject: [PATCH 1/3] update super linter to v8 --- .github/linters/.jscpd.json | 16 +++++----- .github/workflows/helm-lint.yml | 21 ++++++------ .github/workflows/helm-unittest.yml | 20 ++++++------ .github/workflows/superlinter.yml | 44 +++++++------------------- .github/workflows/update-helm-repo.yml | 14 +++++--- Chart.yaml | 2 +- Makefile | 9 ++---- README.md | 5 +-- README.md.gotmpl | 2 +- 9 files changed, 58 insertions(+), 75 deletions(-) diff --git a/.github/linters/.jscpd.json b/.github/linters/.jscpd.json index f771907..b19d79a 100644 --- a/.github/linters/.jscpd.json +++ b/.github/linters/.jscpd.json @@ -1,10 +1,10 @@ { - "ignore": [ - "templates/plumbing/applications.yaml", - "templates/imperative/_helpers.tpl", - "templates/core/subscriptions.yaml", - "templates/core/namespaces.yaml", - "templates/core/nodes.yaml", - "templates/_helpers.tpl" - ] + "ignore": [ + "templates/plumbing/applications.yaml", + "templates/imperative/_helpers.tpl", + "templates/core/subscriptions.yaml", + "templates/core/namespaces.yaml", + "templates/core/nodes.yaml", + "templates/_helpers.tpl" + ] } diff --git a/.github/workflows/helm-lint.yml b/.github/workflows/helm-lint.yml index 91516fd..408efbf 100644 --- a/.github/workflows/helm-lint.yml +++ b/.github/workflows/helm-lint.yml @@ -1,14 +1,15 @@ --- name: Helm lint -# -# Documentation: -# https://help.github.com/en/articles/workflow-syntax-for-github-actions -# +on: + push: + branches: ["main"] + tags: ["v*.*.*"] + pull_request: + branches: ["main"] -permissions: read-all - -on: [push, pull_request] +permissions: + contents: read jobs: build: @@ -18,11 +19,13 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v5 + with: + persist-credentials: false - name: Setup helm - uses: azure/setup-helm@v4 + uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1 with: - version: 'v3.14.0' + version: "v3.14.0" - name: Run make helmlint run: | diff --git a/.github/workflows/helm-unittest.yml b/.github/workflows/helm-unittest.yml index c13ed1b..37a5fe6 100644 --- a/.github/workflows/helm-unittest.yml +++ b/.github/workflows/helm-unittest.yml @@ -1,24 +1,26 @@ --- name: Helm Unit Test -# -# Documentation: -# https://help.github.com/en/articles/workflow-syntax-for-github-actions -# +on: + push: + branches: ["main"] + tags: ["v*.*.*"] + pull_request: + branches: ["main"] -permissions: read-all - -on: [push, pull_request] +permissions: + contents: read jobs: build: name: Run helm lint over the chart - # It has to be 24.04 because -latest has a podman version that is too old - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Checkout Code uses: actions/checkout@v5 + with: + persist-credentials: false - name: Run make helmlint run: | diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml index 0fa5c65..bb67637 100644 --- a/.github/workflows/superlinter.yml +++ b/.github/workflows/superlinter.yml @@ -1,38 +1,16 @@ --- name: Super linter -on: [push, pull_request] -permissions: read-all +on: + pull_request: + branches: [main] -jobs: - build: - # Name the Job - name: Super linter - # Set the agent to run on - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v5 - with: - # Full git history is needed to get a proper list of changed files within `super-linter` - fetch-depth: 0 +permissions: + contents: read - ################################ - # Run Linter against code base # - ################################ - - name: Lint Code Base - uses: super-linter/super-linter/slim@v7 - env: - VALIDATE_ALL_CODEBASE: true - DEFAULT_BRANCH: main - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # These are the validation we disable atm - # Temporarily - VALIDATE_CHECKOV: false - VALIDATE_JSON_PRETTIER: false - VALIDATE_KUBERNETES_KUBECONFORM: false - VALIDATE_MARKDOWN: false - VALIDATE_MARKDOWN_PRETTIER: false - VALIDATE_YAML: false - VALIDATE_YAML_PRETTIER: false +jobs: + lint: + uses: validatedpatterns/github-actions-library/.github/workflows/superlinter.yml@v1 + with: + sl_env: | + VALIDATE_BIOME_FORMAT=false diff --git a/.github/workflows/update-helm-repo.yml b/.github/workflows/update-helm-repo.yml index e684b77..4551964 100644 --- a/.github/workflows/update-helm-repo.yml +++ b/.github/workflows/update-helm-repo.yml @@ -12,19 +12,23 @@ # name: vp-patterns/update-helm-repo + on: push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - "v[0-9]+.[0-9]+.[0-9]+" + +permissions: + contents: read jobs: helmlint: - uses: validatedpatterns/helm-charts/.github/workflows/helmlint.yml@workflow-stable + uses: validatedpatterns/helm-charts/.github/workflows/helmlint.yml@b07b2dd0198770abef2a3da1aa022e188d376d5d # September 8, 2025 permissions: contents: read update-helm-repo: needs: [helmlint] - uses: validatedpatterns/helm-charts/.github/workflows/update-helm-repo.yml@workflow-stable - permissions: read-all - secrets: inherit + uses: validatedpatterns/helm-charts/.github/workflows/update-helm-repo.yml@b07b2dd0198770abef2a3da1aa022e188d376d5d # September 8, 2025 + permissions: + contents: read diff --git a/Chart.yaml b/Chart.yaml index 8f8d5c1..4fa33cc 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 description: A Helm chart to serve as the Validated Patterns Template keywords: -- pattern + - pattern name: vp-template version: 0.0.1 diff --git a/Makefile b/Makefile index e2f3ffa..319317a 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,7 @@ test: helm-lint helm-unittest ## Runs helm lint and unit tests super-linter: ## Runs super linter locally rm -rf .mypy_cache podman run -e RUN_LOCAL=true -e USE_FIND_ALGORITHM=true \ - -e VALIDATE_JSON_PRETTIER=false \ - -e VALIDATE_KUBERNETES_KUBECONFORM=false \ - -e VALIDATE_MARKDOWN=false \ - -e VALIDATE_MARKDOWN_PRETTIER=false \ - -e VALIDATE_YAML_PRETTIER=false \ - -e VALIDATE_YAML=false \ + -e VALIDATE_BIOME_FORMAT=false \ -v $(PWD):/tmp/lint:rw,z \ -w /tmp/lint \ - ghcr.io/super-linter/super-linter:slim-v7 + ghcr.io/super-linter/super-linter:slim-v8 diff --git a/README.md b/README.md index fa52bff..b7aa861 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ A Helm chart to serve as the Validated Patterns Template This chart is used to serve as the template for Validated Patterns Charts -### Notable changes +## Notable changes + +--- ----------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/README.md.gotmpl b/README.md.gotmpl index c3fa7f7..bf3762f 100644 --- a/README.md.gotmpl +++ b/README.md.gotmpl @@ -7,7 +7,7 @@ This chart is used to serve as the template for Validated Patterns Charts -### Notable changes +## Notable changes {{ template "chart.homepageLine" . }} From 1935eddeba071884f2a0b630dea181c058e1de19 Mon Sep 17 00:00:00 2001 From: Drew Minnear Date: Wed, 1 Oct 2025 16:57:31 -0400 Subject: [PATCH 2/3] add secrets block to called workflow --- .github/workflows/update-helm-repo.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/update-helm-repo.yml b/.github/workflows/update-helm-repo.yml index 4551964..c5afb06 100644 --- a/.github/workflows/update-helm-repo.yml +++ b/.github/workflows/update-helm-repo.yml @@ -32,3 +32,5 @@ jobs: uses: validatedpatterns/helm-charts/.github/workflows/update-helm-repo.yml@b07b2dd0198770abef2a3da1aa022e188d376d5d # September 8, 2025 permissions: contents: read + secrets: + CHARTS_REPOS_TOKEN: ${{ secrets.CHARTS_REPOS_TOKEN }} From ba977a4592c111e53b8b59ddcf12b69615854ba6 Mon Sep 17 00:00:00 2001 From: Drew Minnear Date: Mon, 6 Oct 2025 14:26:57 -0400 Subject: [PATCH 3/3] update SHA for publish chart workflow --- .github/workflows/update-helm-repo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-helm-repo.yml b/.github/workflows/update-helm-repo.yml index c5afb06..4c62cd1 100644 --- a/.github/workflows/update-helm-repo.yml +++ b/.github/workflows/update-helm-repo.yml @@ -23,13 +23,13 @@ permissions: jobs: helmlint: - uses: validatedpatterns/helm-charts/.github/workflows/helmlint.yml@b07b2dd0198770abef2a3da1aa022e188d376d5d # September 8, 2025 + uses: validatedpatterns/helm-charts/.github/workflows/helmlint.yml@69fd10ef9199eecd093fca715ae9765c78750efc # October 6, 2025 permissions: contents: read update-helm-repo: needs: [helmlint] - uses: validatedpatterns/helm-charts/.github/workflows/update-helm-repo.yml@b07b2dd0198770abef2a3da1aa022e188d376d5d # September 8, 2025 + uses: validatedpatterns/helm-charts/.github/workflows/update-helm-repo.yml@69fd10ef9199eecd093fca715ae9765c78750efc # October 6, 2025 permissions: contents: read secrets: