From cac3c1a5947ec68a369325172031b8a3bd3cda7c Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Tue, 12 May 2026 10:54:28 +0100 Subject: [PATCH 1/3] update superlinter from known-vulnerable version --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d985292..eda8471 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -41,7 +41,7 @@ jobs: if: always() - name: Run super-linter - uses: super-linter/super-linter@4e8a7c2bf106c4c766c816b35ec612638dc9b6b2 # v7.3.0 + uses: super-linter/super-linter/slim@9e863354e3ff62e0727d37183162c4a88873df41 # v8.6.0 if: always() env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ade7f02797897274fc01a7f69961fc044614056d Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 13 May 2026 13:45:29 +0100 Subject: [PATCH 2/3] fix superlinter errors --- .github/linters/.yamllint.yml | 1 + .github/linters/actionlint.yml | 16 ++++--- .github/workflows/lint.yml | 1 + .github/workflows/pr.yml | 42 +++++++++---------- roles/cluster_infra/templates/resources.tf.j2 | 2 +- super-linter.env | 26 +++++++++--- 6 files changed, 54 insertions(+), 34 deletions(-) create mode 120000 .github/linters/.yamllint.yml diff --git a/.github/linters/.yamllint.yml b/.github/linters/.yamllint.yml new file mode 120000 index 0000000..54a3654 --- /dev/null +++ b/.github/linters/.yamllint.yml @@ -0,0 +1 @@ +../../.yamllint.yml \ No newline at end of file diff --git a/.github/linters/actionlint.yml b/.github/linters/actionlint.yml index a423db9..2ab5afc 100644 --- a/.github/linters/actionlint.yml +++ b/.github/linters/actionlint.yml @@ -10,17 +10,21 @@ paths: # ignore: [] .github/workflows/cleanup-ci-resources.yml: - ignore: [ "string should not be empty" ] + ignore: + - "string should not be empty" .github/workflows/test-backup-restore.yml: - ignore: [ "string should not be empty" ] + ignore: + - "string should not be empty" .github/workflows/test-ha.yml: - ignore: [ "string should not be empty" ] + ignore: + - "string should not be empty" .github/workflows/test-singlenode.yml: - ignore: [ "string should not be empty" ] + ignore: + - "string should not be empty" .github/workflows/test-upgrade.yml: - ignore: [ "string should not be empty" ] - + ignore: + - "string should not be empty" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eda8471..1dcb89e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,6 +27,7 @@ jobs: # list of files that changed across commits fetch-depth: 0 submodules: true + persist-credentials: false - name: Run ansible-lint uses: ansible/ansible-lint@e98f9b38769d45cbe3c55a23b2eb25631babe7c4 # v25.4.0 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d890bff..7257fbe 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,26 +1,26 @@ --- - name: Build and test PR +name: Build and test PR - permissions: - contents: read - packages: read - # To report GitHub Actions status checks - statuses: write +permissions: + contents: read + packages: read + # To report GitHub Actions status checks + statuses: write - concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true - on: - pull_request: - types: - - opened - - synchronize - - ready_for_review - - reopened - branches: - - main +'on': + pull_request: + types: + - opened + - synchronize + - ready_for_review + - reopened + branches: + - main - jobs: - lint: - uses: ./.github/workflows/lint.yml +jobs: + lint: + uses: ./.github/workflows/lint.yml diff --git a/roles/cluster_infra/templates/resources.tf.j2 b/roles/cluster_infra/templates/resources.tf.j2 index f2a8d55..8d5e79c 100644 --- a/roles/cluster_infra/templates/resources.tf.j2 +++ b/roles/cluster_infra/templates/resources.tf.j2 @@ -1,6 +1,6 @@ ##### ##### The identity scope we are operating in -##### Used to add tge OpenStack user name to instance metadata +##### Used to add the OpenStack user name to instance metadata ##### data "openstack_identity_auth_scope_v3" "scope" { name = "{{ cluster_name }}" diff --git a/super-linter.env b/super-linter.env index 4e0e168..9e740a4 100644 --- a/super-linter.env +++ b/super-linter.env @@ -1,17 +1,31 @@ -# Detect that default branch is devel when running locally +# Exclude vendor submodules +FILTER_REGEX_EXCLUDE=.*vendor/.* + +# Detect that default branch is main when running locally DEFAULT_BRANCH=main # Don't validate JSCPD VALIDATE_JSCPD=false -# Don't validate JS standard because it conflicts with JS prettier -VALIDATE_JAVASCRIPT_STANDARD=false - # Don't validate Ansible because ansible-lint is more flexible VALIDATE_ANSIBLE=false # Don't validate YAML prettier because yamllint is sufficient VALIDATE_YAML_PRETTIER=false -# Don't validate using kubeconform because it wants an appTemplate schema -VALIDATE_KUBERNETES_KUBECONFORM=false +# Set to the default filename for yamllint +YAML_CONFIG_FILE=.yamllint.yml + +VALIDATE_BIOME_FORMAT=false + +VALIDATE_BIOME_LINT=false + +VALIDATE_TRIVY=false + +# Only use ruff for python linting and formatting +VALIDATE_PYTHON=false +VALIDATE_PYTHON_BLACK=false +VALIDATE_PYTHON_FLAKE8=false +VALIDATE_PYTHON_ISORT=false +VALIDATE_PYTHON_MYPY=false +VALIDATE_PYTHON_PYLINT=false From 2d47def1cc53fc9ddaf80643d7fc9e4ada230b53 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Thu, 28 May 2026 15:04:13 +0100 Subject: [PATCH 3/3] Don't stringyfy "on" and disable yamllint for truthy values --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7257fbe..01d913d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,7 +11,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -'on': +on: # yamllint disable-line rule:truthy pull_request: types: - opened