Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Dec 16, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
576db64
chore: Update pre-commit hooks
adberger Dec 16, 2024
06a06f9
chore: Update helm-docs & chart-testing
adberger Dec 16, 2024
eec5f2b
[vcluster]: chore - switch dependency to oci helm chart
adberger Dec 16, 2024
37305bd
fix: unresolvable version of chart-testing-action
adberger Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion charts/vcluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion charts/vcluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion ct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading