From 95c9c39843ccf0da8fbd0c867a3ba9fb69f3e7e4 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Thu, 18 Nov 2021 08:20:12 -0800 Subject: [PATCH] Revert "allow ldflags to overwrite k8s version" Signed-off-by: Matthew Fisher --- pkg/chartutil/capabilities.go | 4 +++- pkg/lint/rules/deprecations.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/chartutil/capabilities.go b/pkg/chartutil/capabilities.go index ec517817b..d24228056 100644 --- a/pkg/chartutil/capabilities.go +++ b/pkg/chartutil/capabilities.go @@ -28,10 +28,12 @@ import ( helmversion "helm.sh/helm/v3/internal/version" ) -var ( +const ( k8sVersionMajor = 1 k8sVersionMinor = 20 +) +var ( // DefaultVersionSet is the default version set, which includes only Core V1 ("v1"). DefaultVersionSet = allKnownVersions() diff --git a/pkg/lint/rules/deprecations.go b/pkg/lint/rules/deprecations.go index b1a516cef..384c17973 100644 --- a/pkg/lint/rules/deprecations.go +++ b/pkg/lint/rules/deprecations.go @@ -25,7 +25,7 @@ import ( kscheme "k8s.io/client-go/kubernetes/scheme" ) -var ( +const ( // This should be set in the Makefile based on the version of client-go being imported. // These constants will be overwritten with LDFLAGS k8sVersionMajor = 1