Use pre-constructed scheme, do not create a new one for each object

Signed-off-by: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
2 weeks ago · f04190b91d
parent 515bab1c87
commit f04190b91d
2 changed files with 4 additions and 10 deletions
--- 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
 	}
--- 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
 	}