From 576db642ec29622f6d905bf33c6f21b2abb9be4f Mon Sep 17 00:00:00 2001 From: Adrian Berger Date: Mon, 16 Dec 2024 12:49:23 +0100 Subject: [PATCH 1/4] chore: Update pre-commit hooks Signed-off-by: Adrian Berger --- .pre-commit-config.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c05adede..b5b6f441 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,20 +2,20 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks.git - rev: v4.3.0 + rev: v5.0.0 hooks: - id: end-of-file-fixer exclude_types: ['markdown'] - stages: [commit] + stages: [pre-commit] - id: trailing-whitespace exclude_types: ['markdown'] - stages: [commit] + stages: [pre-commit] - id: mixed-line-ending - stages: [commit] + stages: [pre-commit] - id: check-byte-order-marker - stages: [commit] + stages: [pre-commit] - id: check-executables-have-shebangs - stages: [commit] + stages: [pre-commit] - id: check-merge-conflict - repo: local @@ -26,11 +26,11 @@ repos: args: ["helm-docs"] language: system pass_filenames: false - stages: [commit] + stages: [pre-commit] - id: ct-lint name: ct-lint entry: make args: ["helm-lint"] language: system pass_filenames: false - stages: [commit] + stages: [pre-commit] From 06a06f971356fb8d8b697770a5fce579ac2b1f04 Mon Sep 17 00:00:00 2001 From: Adrian Berger Date: Mon, 16 Dec 2024 12:54:35 +0100 Subject: [PATCH 2/4] chore: Update helm-docs & chart-testing Signed-off-by: Adrian Berger --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 74a3552b..09eb8861 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,11 @@ # Helm SRC_ROOT = $(shell git rev-parse --show-toplevel) -helm-docs: HELMDOCS_VERSION := v1.11.0 +helm-docs: HELMDOCS_VERSION := v1.14.2 helm-docs: docker @docker run -v "$(SRC_ROOT):/helm-docs" jnorwood/helm-docs:$(HELMDOCS_VERSION) --chart-search-root /helm-docs -helm-lint: CT_VERSION := v3.3.1 +helm-lint: CT_VERSION := v3.11.0 helm-lint: docker @docker run -v "$(SRC_ROOT):/workdir" --entrypoint /bin/sh quay.io/helmpack/chart-testing:$(CT_VERSION) -c "cd /workdir; ct lint --config ct.yaml --lint-conf lintconf.yaml --all --debug" From eec5f2ba0998b0bfbad70a998d92a86eee4a04a0 Mon Sep 17 00:00:00 2001 From: Adrian Berger Date: Mon, 16 Dec 2024 13:02:36 +0100 Subject: [PATCH 3/4] [vcluster]: chore - switch dependency to oci helm chart Signed-off-by: Adrian Berger --- charts/vcluster/Chart.yaml | 2 +- charts/vcluster/README.md | 2 +- ct.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/vcluster/Chart.yaml b/charts/vcluster/Chart.yaml index 65f977b5..e8ae17b2 100644 --- a/charts/vcluster/Chart.yaml +++ b/charts/vcluster/Chart.yaml @@ -16,4 +16,4 @@ maintainers: dependencies: - name: common version: 2.14.1 - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts diff --git a/charts/vcluster/README.md b/charts/vcluster/README.md index 2e042f1d..b3a16c8f 100644 --- a/charts/vcluster/README.md +++ b/charts/vcluster/README.md @@ -18,7 +18,7 @@ Virtual Kubernetes Cluster | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | common | 2.14.1 | +| oci://registry-1.docker.io/bitnamicharts | common | 2.14.1 | # Major Changes diff --git a/ct.yaml b/ct.yaml index 51efbc90..102502f5 100644 --- a/ct.yaml +++ b/ct.yaml @@ -7,10 +7,11 @@ chart-dirs: chart-repos: - buttahtoast=https://buttahtoast.github.io/helm-charts/ - bedag=https://bedag.github.io/helm-charts/ - - bitnami=https://charts.bitnami.com/bitnami + # - bitnami=registry-1.docker.io/bitnamicharts validate-chart-schema: true validate-maintainers: false validate-yaml: true exclude-deprecated: true excluded-charts: - "manifests" + - "vcluster" From 37305bdf13993ec6418ebe7c0ff2ccbda289a905 Mon Sep 17 00:00:00 2001 From: Adrian Berger Date: Mon, 16 Dec 2024 13:05:07 +0100 Subject: [PATCH 4/4] fix: unresolvable version of chart-testing-action Signed-off-by: Adrian Berger --- .github/workflows/lint-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 0dfed7f3..0413c49e 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -28,7 +28,7 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.7.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed