Skip to content

Commit

Permalink
fix remove implicit copy of a lock
Browse files Browse the repository at this point in the history
addressing #109197

fix packag enaming

Kubernetes-commit: 0706fb72b6dbb807c92326cd7de0e54e956df2d9
  • Loading branch information
Alexander Zielenski authored and k8s-publishing-bot committed Mar 31, 2022
1 parent 6550efd commit 97e5df2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/util/managedfields/gvkparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 97e5df2

Please sign in to comment.