From f04190b91ddc45b245a6a7c8fc3e42bc3fa10648 Mon Sep 17 00:00:00 2001 From: Mikhail Mazurskiy Date: Fri, 12 Sep 2025 10:42:05 +1000 Subject: [PATCH] Use pre-constructed scheme, do not create a new one for each object Signed-off-by: Mikhail Mazurskiy --- internal/chart/v3/lint/rules/deprecations.go | 7 ++----- pkg/chart/v2/lint/rules/deprecations.go | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/internal/chart/v3/lint/rules/deprecations.go b/internal/chart/v3/lint/rules/deprecations.go index 6f86bdbbd..8e42c9585 100644 --- a/internal/chart/v3/lint/rules/deprecations.go +++ b/internal/chart/v3/lint/rules/deprecations.go @@ -21,11 +21,11 @@ import ( "strconv" "helm.sh/helm/v4/pkg/chart/common" + "helm.sh/helm/v4/pkg/kube" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/endpoints/deprecation" - kscheme "k8s.io/client-go/kubernetes/scheme" ) var ( @@ -93,11 +93,8 @@ func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *common.KubeVer } 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) + out, err := kube.NativeScheme.New(gvk) if err != nil { return nil, err } diff --git a/pkg/chart/v2/lint/rules/deprecations.go b/pkg/chart/v2/lint/rules/deprecations.go index 6eba316bc..5365a307e 100644 --- a/pkg/chart/v2/lint/rules/deprecations.go +++ b/pkg/chart/v2/lint/rules/deprecations.go @@ -21,11 +21,11 @@ import ( "strconv" "helm.sh/helm/v4/pkg/chart/common" + "helm.sh/helm/v4/pkg/kube" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/endpoints/deprecation" - kscheme "k8s.io/client-go/kubernetes/scheme" ) var ( @@ -93,11 +93,8 @@ func validateNoDeprecations(resource *k8sYamlStruct, kubeVersion *common.KubeVer } 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) + out, err := kube.NativeScheme.New(gvk) if err != nil { return nil, err }