From 97e5df2d0258ac077093867fabf508c1fc31f53b Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Thu, 31 Mar 2022 15:54:01 -0700 Subject: [PATCH] fix remove implicit copy of a lock addressing #109197 fix packag enaming Kubernetes-commit: 0706fb72b6dbb807c92326cd7de0e54e956df2d9 --- pkg/util/managedfields/gvkparser.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/util/managedfields/gvkparser.go b/pkg/util/managedfields/gvkparser.go index 0cc228af9..408739c50 100644 --- a/pkg/util/managedfields/gvkparser.go +++ b/pkg/util/managedfields/gvkparser.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kube-openapi/pkg/schemaconv" "k8s.io/kube-openapi/pkg/util/proto" + smdschema "sigs.k8s.io/structured-merge-diff/v4/schema" "sigs.k8s.io/structured-merge-diff/v4/typed" ) @@ -58,7 +59,7 @@ func NewGVKParser(models proto.Models, preserveUnknownFields bool) (*GvkParser, parser := GvkParser{ gvks: map[schema.GroupVersionKind]string{}, } - parser.parser = typed.Parser{Schema: *typeSchema} + parser.parser = typed.Parser{Schema: smdschema.Schema{Types: typeSchema.Types}} for _, modelName := range models.ListModels() { model := models.LookupModel(modelName) if model == nil {