unkin/argocd-apps
3
0
Fork 0
Code Issues 7 Pull Requests 6 Actions Packages Projects Releases Wiki Activity

Pin helm capabilities version to the validation target

Browse Source 
Render charts with --helm-kube-version from ci/kube-version so kustomize
no longer inherits the local helm binary's default Kubernetes version.
This commit is contained in:
Unkin Agent
2026-09-19 12:28:16 +10:00
parent fe51aa07be
commit fb458ea90e
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -1
View File
@@ -1,10 +1,12 @@
.PHONY: build clean schemas .PHONY: build clean schemas
KUBE_VERSION := $(shell cat ci/kube-version)
# Build a kustomization path to manifests directory # Build a kustomization path to manifests directory
# Usage: make build clusters/au-syd1/bootstrap # Usage: make build clusters/au-syd1/bootstrap
build: build:
@mkdir -p manifests/$(filter-out $@,$(MAKECMDGOALS)) @mkdir -p manifests/$(filter-out $@,$(MAKECMDGOALS))
@kustomize build --enable-helm $(filter-out $@,$(MAKECMDGOALS)) --output manifests/$(filter-out $@,$(MAKECMDGOALS)) @kustomize build --enable-helm --helm-kube-version $(KUBE_VERSION) $(filter-out $@,$(MAKECMDGOALS)) --output manifests/$(filter-out $@,$(MAKECMDGOALS))
# Generate JSON schemas from CRDs and Kubernetes swagger spec (run manually, results committed) # Generate JSON schemas from CRDs and Kubernetes swagger spec (run manually, results committed)
schemas: schemas:
ci/kube-version
+1
View File
@@ -0,0 +1 @@
1.33.7
ci/validate-apps.sh
+3 -2
View File
@@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
KUBE_VERSION="1.33.7" REPO_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
KUBE_VERSION="$(cat "$REPO_ROOT/ci/kube-version")"
SCHEMA_DIR="${SCHEMA_DIR:-schemas}" SCHEMA_DIR="${SCHEMA_DIR:-schemas}"
@@ -15,7 +16,7 @@ while IFS= read -r -d "" k; do
dir="$(dirname "$k")" dir="$(dirname "$k")"
echo "==> kubeconform: $dir" >&2 echo "==> kubeconform: $dir" >&2
kustomize build --enable-helm "$dir" \ kustomize build --enable-helm --helm-kube-version "$KUBE_VERSION" "$dir" \
| kubeconform \ | kubeconform \
-kubernetes-version "$KUBE_VERSION" \ -kubernetes-version "$KUBE_VERSION" \
-summary \ -summary \
ci/validate-clusters.sh
+3 -2
View File
@@ -1,7 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
KUBE_VERSION="1.33.7" REPO_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
KUBE_VERSION="$(cat "$REPO_ROOT/ci/kube-version")"
SCHEMA_DIR="${SCHEMA_DIR:-schemas}" SCHEMA_DIR="${SCHEMA_DIR:-schemas}"
@@ -15,7 +16,7 @@ while IFS= read -r -d "" k; do
dir="$(dirname "$k")" dir="$(dirname "$k")"
echo "==> kubeconform: $dir" >&2 echo "==> kubeconform: $dir" >&2
kustomize build --enable-helm "$dir" \ kustomize build --enable-helm --helm-kube-version "$KUBE_VERSION" "$dir" \
| kubeconform \ | kubeconform \
-kubernetes-version "$KUBE_VERSION" \ -kubernetes-version "$KUBE_VERSION" \
-summary \ -summary \