Skip to content

Commit 97e5df2

Browse files
Alexander Zielenskik8s-publishing-bot
Alexander Zielenski
authored andcommitted
fix remove implicit copy of a lock
addressing #109197 fix packag enaming Kubernetes-commit: 0706fb72b6dbb807c92326cd7de0e54e956df2d9
1 parent 6550efd commit 97e5df2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: pkg/util/managedfields/gvkparser.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"k8s.io/apimachinery/pkg/runtime/schema"
2323
"k8s.io/kube-openapi/pkg/schemaconv"
2424
"k8s.io/kube-openapi/pkg/util/proto"
25+
smdschema "sigs.k8s.io/structured-merge-diff/v4/schema"
2526
"sigs.k8s.io/structured-merge-diff/v4/typed"
2627
)
2728

@@ -58,7 +59,7 @@ func NewGVKParser(models proto.Models, preserveUnknownFields bool) (*GvkParser,
5859
parser := GvkParser{
5960
gvks: map[schema.GroupVersionKind]string{},
6061
}
61-
parser.parser = typed.Parser{Schema: *typeSchema}
62+
parser.parser = typed.Parser{Schema: smdschema.Schema{Types: typeSchema.Types}}
6263
for _, modelName := range models.ListModels() {
6364
model := models.LookupModel(modelName)
6465
if model == nil {

0 commit comments

Comments
 (0)