Reduce linting severity for users of out-of-date kubernetes (#8608)

* Reduce linting severity for users of out-of-date kubernetes

Fixes #8596

Signed-off-by: Joe Julian <me@joejulian.name>

* add more verbose deprecation info

Signed-off-by: Joe Julian <me@joejulian.name>

* use new upstream deprecations

Signed-off-by: Joe Julian <me@joejulian.name>

* do not error for custom resources

Signed-off-by: Joe Julian <me@joejulian.name>

* Define deprecation version in lint rules by LDFLAG

Signed-off-by: Joe Julian <me@joejulian.name>

* make comment clearer

Signed-off-by: Joe Julian <me@joejulian.name>

* Extend the k8s version discovery and constants to chartutil

Signed-off-by: Joe Julian <me@joejulian.name>

* remove awk dependency

Signed-off-by: Joe Julian <me@joejulian.name>

* align k8s version constant names between capabilities.go and deprecations.go

Signed-off-by: Joe Julian <me@joejulian.name>

* show the error if the unexpected happens

Signed-off-by: Joe Julian <me@joejulian.name>

* bump k8sVersionMinor and golden chart templates for k8s 1.20

Signed-off-by: Joe Julian <me@joejulian.name>

* bump for tests to match 1.20.1

Signed-off-by: Joe Julian <me@joejulian.name>
pull/9193/head
Joe Julian 5 years ago committed by GitHub
parent 5eb0e09da9
commit fdcd22ef58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -55,6 +55,16 @@ LDFLAGS += -X helm.sh/helm/v3/internal/version.gitCommit=${GIT_COMMIT}
LDFLAGS += -X helm.sh/helm/v3/internal/version.gitTreeState=${GIT_DIRTY} LDFLAGS += -X helm.sh/helm/v3/internal/version.gitTreeState=${GIT_DIRTY}
LDFLAGS += $(EXT_LDFLAGS) LDFLAGS += $(EXT_LDFLAGS)
# Define constants based on the client-go version
K8S_MODULES_VER=$(subst ., ,$(subst v,,$(shell go list -f '{{.Version}}' -m k8s.io/client-go)))
K8S_MODULES_MAJOR_VER=$(shell echo $$(($(firstword $(K8S_MODULES_VER)) + 1)))
K8S_MODULES_MINOR_VER=$(word 2,$(K8S_MODULES_VER))
LDFLAGS += -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
LDFLAGS += -X helm.sh/helm/v3/pkg/lint/rules.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
LDFLAGS += -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMajor=$(K8S_MODULES_MAJOR_VER)
LDFLAGS += -X helm.sh/helm/v3/pkg/chartutil.k8sVersionMinor=$(K8S_MODULES_MINOR_VER)
.PHONY: all .PHONY: all
all: build all: build

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "foobar-YWJj-baz" app.kubernetes.io/instance: "foobar-YWJj-baz"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:

@ -8,8 +8,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
kube-api-version/test: v1 kube-api-version/test: v1
spec: spec:
type: ClusterIP type: ClusterIP

@ -8,8 +8,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
kube-api-version/test: v1 kube-api-version/test: v1
spec: spec:
type: ClusterIP type: ClusterIP

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
kube-api-version/test: v1 kube-api-version/test: v1
spec: spec:
type: ClusterIP type: ClusterIP

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
kube-api-version/test: v1 kube-api-version/test: v1
spec: spec:
type: ClusterIP type: ClusterIP

@ -89,8 +89,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
kube-api-version/test: v1 kube-api-version/test: v1
spec: spec:
type: ClusterIP type: ClusterIP

@ -72,8 +72,8 @@ metadata:
helm.sh/chart: "subchart-0.1.0" helm.sh/chart: "subchart-0.1.0"
app.kubernetes.io/instance: "RELEASE-NAME" app.kubernetes.io/instance: "RELEASE-NAME"
kube-version/major: "1" kube-version/major: "1"
kube-version/minor: "18" kube-version/minor: "20"
kube-version/version: "v1.18.0" kube-version/version: "v1.20.0"
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:

@ -16,6 +16,9 @@ limitations under the License.
package chartutil package chartutil
import ( import (
"fmt"
"strconv"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@ -24,6 +27,11 @@ import (
helmversion "helm.sh/helm/v3/internal/version" helmversion "helm.sh/helm/v3/internal/version"
) )
const (
k8sVersionMajor = 1
k8sVersionMinor = 20
)
var ( var (
// DefaultVersionSet is the default version set, which includes only Core V1 ("v1"). // DefaultVersionSet is the default version set, which includes only Core V1 ("v1").
DefaultVersionSet = allKnownVersions() DefaultVersionSet = allKnownVersions()
@ -31,9 +39,9 @@ var (
// DefaultCapabilities is the default set of capabilities. // DefaultCapabilities is the default set of capabilities.
DefaultCapabilities = &Capabilities{ DefaultCapabilities = &Capabilities{
KubeVersion: KubeVersion{ KubeVersion: KubeVersion{
Version: "v1.18.0", Version: fmt.Sprintf("v%d.%d.0", k8sVersionMajor, k8sVersionMinor),
Major: "1", Major: strconv.Itoa(k8sVersionMajor),
Minor: "18", Minor: strconv.Itoa(k8sVersionMinor),
}, },
APIVersions: DefaultVersionSet, APIVersions: DefaultVersionSet,
HelmVersion: helmversion.Get(), HelmVersion: helmversion.Get(),

@ -42,20 +42,20 @@ func TestDefaultVersionSet(t *testing.T) {
func TestDefaultCapabilities(t *testing.T) { func TestDefaultCapabilities(t *testing.T) {
kv := DefaultCapabilities.KubeVersion kv := DefaultCapabilities.KubeVersion
if kv.String() != "v1.18.0" { if kv.String() != "v1.20.0" {
t.Errorf("Expected default KubeVersion.String() to be v1.18.0, got %q", kv.String()) t.Errorf("Expected default KubeVersion.String() to be v1.20.0, got %q", kv.String())
} }
if kv.Version != "v1.18.0" { if kv.Version != "v1.20.0" {
t.Errorf("Expected default KubeVersion.Version to be v1.18.0, got %q", kv.Version) t.Errorf("Expected default KubeVersion.Version to be v1.20.0, got %q", kv.Version)
} }
if kv.GitVersion() != "v1.18.0" { if kv.GitVersion() != "v1.20.0" {
t.Errorf("Expected default KubeVersion.GitVersion() to be v1.18.0, got %q", kv.Version) t.Errorf("Expected default KubeVersion.GitVersion() to be v1.20.0, got %q", kv.Version)
} }
if kv.Major != "1" { if kv.Major != "1" {
t.Errorf("Expected default KubeVersion.Major to be 1, got %q", kv.Major) t.Errorf("Expected default KubeVersion.Major to be 1, got %q", kv.Major)
} }
if kv.Minor != "18" { if kv.Minor != "20" {
t.Errorf("Expected default KubeVersion.Minor to be 18, got %q", kv.Minor) t.Errorf("Expected default KubeVersion.Minor to be 20, got %q", kv.Minor)
} }
} }

@ -16,65 +16,69 @@ limitations under the License.
package rules // import "helm.sh/helm/v3/pkg/lint/rules" package rules // import "helm.sh/helm/v3/pkg/lint/rules"
import "fmt" import (
"fmt"
// deprecatedAPIs lists APIs that are deprecated (left) with suggested alternatives (right). "k8s.io/apimachinery/pkg/runtime"
// "k8s.io/apimachinery/pkg/runtime/schema"
// An empty rvalue indicates that the API is completely deprecated. "k8s.io/apiserver/pkg/endpoints/deprecation"
var deprecatedAPIs = map[string]string{ kscheme "k8s.io/client-go/kubernetes/scheme"
"extensions/v1beta1 Deployment": "apps/v1 Deployment", )
"extensions/v1beta1 DaemonSet": "apps/v1 DaemonSet",
"extensions/v1beta1 ReplicaSet": "apps/v1 ReplicaSet", const (
"extensions/v1beta1 PodSecurityPolicy": "policy/v1beta1 PodSecurityPolicy", // This should be set in the Makefile based on the version of client-go being imported.
"extensions/v1beta1 NetworkPolicy": "networking.k8s.io/v1beta1 NetworkPolicy", // These constants will be overwritten with LDFLAGS
"extensions/v1beta1 Ingress": "networking.k8s.io/v1beta1 Ingress", k8sVersionMajor = 1
"apps/v1beta1 Deployment": "apps/v1 Deployment", k8sVersionMinor = 20
"apps/v1beta1 StatefulSet": "apps/v1 StatefulSet", )
"apps/v1beta1 ReplicaSet": "apps/v1 ReplicaSet",
"apps/v1beta2 Deployment": "apps/v1 Deployment",
"apps/v1beta2 StatefulSet": "apps/v1 StatefulSet",
"apps/v1beta2 DaemonSet": "apps/v1 DaemonSet",
"apps/v1beta2 ReplicaSet": "apps/v1 ReplicaSet",
"apiextensions.k8s.io/v1beta1 CustomResourceDefinition": "apiextensions.k8s.io/v1 CustomResourceDefinition",
"rbac.authorization.k8s.io/v1alpha1 ClusterRole": "rbac.authorization.k8s.io/v1 ClusterRole",
"rbac.authorization.k8s.io/v1alpha1 ClusterRoleList": "rbac.authorization.k8s.io/v1 ClusterRoleList",
"rbac.authorization.k8s.io/v1alpha1 ClusterRoleBinding": "rbac.authorization.k8s.io/v1 ClusterRoleBinding",
"rbac.authorization.k8s.io/v1alpha1 ClusterRoleBindingList": "rbac.authorization.k8s.io/v1 ClusterRoleBindingList",
"rbac.authorization.k8s.io/v1alpha1 Role": "rbac.authorization.k8s.io/v1 Role",
"rbac.authorization.k8s.io/v1alpha1 RoleList": "rbac.authorization.k8s.io/v1 RoleList",
"rbac.authorization.k8s.io/v1alpha1 RoleBinding": "rbac.authorization.k8s.io/v1 RoleBinding",
"rbac.authorization.k8s.io/v1alpha1 RoleBindingList": "rbac.authorization.k8s.io/v1 RoleBindingList",
"rbac.authorization.k8s.io/v1beta1 ClusterRole": "rbac.authorization.k8s.io/v1 ClusterRole",
"rbac.authorization.k8s.io/v1beta1 ClusterRoleList": "rbac.authorization.k8s.io/v1 ClusterRoleList",
"rbac.authorization.k8s.io/v1beta1 ClusterRoleBinding": "rbac.authorization.k8s.io/v1 ClusterRoleBinding",
"rbac.authorization.k8s.io/v1beta1 ClusterRoleBindingList": "rbac.authorization.k8s.io/v1 ClusterRoleBindingList",
"rbac.authorization.k8s.io/v1beta1 Role": "rbac.authorization.k8s.io/v1 Role",
"rbac.authorization.k8s.io/v1beta1 RoleList": "rbac.authorization.k8s.io/v1 RoleList",
"rbac.authorization.k8s.io/v1beta1 RoleBinding": "rbac.authorization.k8s.io/v1 RoleBinding",
"rbac.authorization.k8s.io/v1beta1 RoleBindingList": "rbac.authorization.k8s.io/v1 RoleBindingList",
}
// deprecatedAPIError indicates than an API is deprecated in Kubernetes // deprecatedAPIError indicates than an API is deprecated in Kubernetes
type deprecatedAPIError struct { type deprecatedAPIError struct {
Deprecated string Deprecated string
Alternative string Message string
} }
func (e deprecatedAPIError) Error() string { func (e deprecatedAPIError) Error() string {
msg := fmt.Sprintf("the kind %q is deprecated", e.Deprecated) msg := e.Message
if e.Alternative != "" {
msg += fmt.Sprintf(" in favor of %q", e.Alternative)
}
return msg return msg
} }
func validateNoDeprecations(resource *K8sYamlStruct) error { func validateNoDeprecations(resource *K8sYamlStruct) error {
// if `resource` does not have an APIVersion or Kind, we cannot test it for deprecation
if resource.APIVersion == "" {
return nil
}
if resource.Kind == "" {
return nil
}
runtimeObject, err := resourceToRuntimeObject(resource)
if err != nil {
// do not error for non-kubernetes resources
if runtime.IsNotRegisteredError(err) {
return nil
}
return err
}
if !deprecation.IsDeprecated(runtimeObject, k8sVersionMajor, k8sVersionMinor) {
return nil
}
gvk := fmt.Sprintf("%s %s", resource.APIVersion, resource.Kind) gvk := fmt.Sprintf("%s %s", resource.APIVersion, resource.Kind)
if alt, ok := deprecatedAPIs[gvk]; ok {
return deprecatedAPIError{ return deprecatedAPIError{
Deprecated: gvk, Deprecated: gvk,
Alternative: alt, Message: deprecation.WarningMessage(runtimeObject),
} }
} }
return nil
func resourceToRuntimeObject(resource *K8sYamlStruct) (runtime.Object, error) {
scheme := runtime.NewScheme()
kscheme.AddToScheme(scheme)
gvk := schema.FromAPIVersionAndKind(resource.APIVersion, resource.Kind)
out, err := scheme.New(gvk)
if err != nil {
return nil, err
}
out.GetObjectKind().SetGroupVersionKind(gvk)
return out, nil
} }

@ -27,10 +27,9 @@ func TestValidateNoDeprecations(t *testing.T) {
if err == nil { if err == nil {
t.Fatal("Expected deprecated extension to be flagged") t.Fatal("Expected deprecated extension to be flagged")
} }
depErr := err.(deprecatedAPIError) depErr := err.(deprecatedAPIError)
if depErr.Alternative != "apps/v1 Deployment" { if depErr.Message == "" {
t.Errorf("Expected %q to be replaced by %q", depErr.Deprecated, depErr.Alternative) t.Fatalf("Expected error message to be non-blank: %v", err)
} }
if err := validateNoDeprecations(&K8sYamlStruct{ if err := validateNoDeprecations(&K8sYamlStruct{

@ -137,8 +137,11 @@ func Templates(linter *support.Linter, values map[string]interface{}, namespace
linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err)) linter.RunLinterRule(support.ErrorSev, fpath, validateYamlContent(err))
if yamlStruct != nil { if yamlStruct != nil {
linter.RunLinterRule(support.ErrorSev, fpath, validateMetadataName(yamlStruct)) // NOTE: set to warnings to allow users to support out-of-date kubernetes
linter.RunLinterRule(support.ErrorSev, fpath, validateNoDeprecations(yamlStruct)) // Refs https://github.com/helm/helm/issues/8596
linter.RunLinterRule(support.WarningSev, fpath, validateMetadataName(yamlStruct))
linter.RunLinterRule(support.WarningSev, fpath, validateNoDeprecations(yamlStruct))
linter.RunLinterRule(support.ErrorSev, fpath, validateMatchSelector(yamlStruct, renderedContent)) linter.RunLinterRule(support.ErrorSev, fpath, validateMatchSelector(yamlStruct, renderedContent))
} }
} }

Loading…
Cancel
Save