github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

fix remove implicit copy of a lock

Browse Source 
addressing #109197

fix packag enaming
This commit is contained in:
Alexander Zielenski 2022-03-31 15:54:01 -07:00 committed by Alexander Zielenski
parent cc3a250f6a
commit 0706fb72b6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apimachinery/pkg/util/managedfields/gvkparser.go
View File

@ -22,6 +22,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kube-openapi/pkg/schemaconv" "k8s.io/kube-openapi/pkg/schemaconv"
"k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/util/proto"
smdschema "sigs.k8s.io/structured-merge-diff/v4/schema"
"sigs.k8s.io/structured-merge-diff/v4/typed" "sigs.k8s.io/structured-merge-diff/v4/typed"
) )
@ -58,7 +59,7 @@ func NewGVKParser(models proto.Models, preserveUnknownFields bool) (*GvkParser,
parser := GvkParser{ parser := GvkParser{
gvks: map[schema.GroupVersionKind]string{}, 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() { for _, modelName := range models.ListModels() {
model := models.LookupModel(modelName) model := models.LookupModel(modelName)
if model == nil { if model == nil {