Merge pull request #143 from adberger/master

[vcluster]: chore - switch dependency to oci helm chart

.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

.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]

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"
 

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

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
 

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"