github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 10:17:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109212 from alexzielenski/copylock-fix

Browse Source 
apimachinery: remove implicit copy of a lock
This commit is contained in:
Kubernetes Prow Robot
2022-04-05 17:16:55 -07:00
committed by GitHub
parent 8cd689e40d 0706fb72b6
commit e9497e5999
1 changed files with 2 additions and 1 deletions
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 {