From b6a8c6521614f99d54752110a955b4f6fb5b8f5a Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Fri, 14 Nov 2025 21:11:45 +0100 Subject: [PATCH] fix: correct LDFLAGS path for default Kubernetes version The Makefile LDFLAGS were pointing to an incorrect package path (helm.sh/helm/v4/pkg/chart/common/util) that doesn't exist, causing the k8sVersionMajor and k8sVersionMinor variables to silently fail to be set. This left the hardcoded defaults (1.20) in place. After this fix, `helm template` now correctly defaults to Kubernetes v1.34.0 (matching the bundled client-go version) instead of v1.20.0, ensuring charts render with current stable API versions. Testing scenario: ```sh cat > /tmp/test-chart/Chart.yaml << 'EOF' apiVersion: v2 name: test-chart version: 1.0.0 kubeVersion: ">= 1.28.0-0" EOF ./bin/helm template test-release /tmp/test-chart cat > /tmp/test-chart-fail/Chart.yaml << 'EOF' apiVersion: v2 name: test-chart-fail version: 1.0.0 kubeVersion: ">= 1.35.0-0" EOF ./bin/helm template test-release /tmp/test-chart-fail Exit code 1 Error: chart requires kubeVersion: >= 1.35.0-0 which is incompatible with Kubernetes v1.34.0 ``` Fixes #31508 Closes #31501 Closes #31502 Signed-off-by: Benoit Tigeot --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4cf779438..d7422bf23 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,8 @@ LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMajor=$(K8S_MODU LDFLAGS += -X helm.sh/helm/v4/pkg/chart/v2/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER) LDFLAGS += -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER) LDFLAGS += -X helm.sh/helm/v4/pkg/internal/v3/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER) -LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER) -LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common/util.k8sVersionMinor=$(K8S_MODULES_MINOR_VER) +LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER) +LDFLAGS += -X helm.sh/helm/v4/pkg/chart/common.k8sVersionMinor=$(K8S_MODULES_MINOR_VER) LDFLAGS += -X helm.sh/helm/v4/internal/version.kubeClientVersionMajor=$(K8S_MODULES_MAJOR_VER) LDFLAGS += -X helm.sh/helm/v4/internal/version.kubeClientVersionMinor=$(K8S_MODULES_MINOR_VER)