From f2e59b44ad5610bb749901b505305ba16c44fad5 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Tue, 5 Feb 2019 10:29:38 -0800 Subject: [PATCH 1/3] Misc fix for feature-serverside-apply --- .../endpoints/handlers/fieldmanager/internal/gvkparser.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go index 14d90f964f1..b8cf8b849c1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go @@ -55,11 +55,15 @@ func newGVKParser(models proto.Models) (*gvkParser, error) { for _, modelName := range models.ListModels() { model := models.LookupModel(modelName) if model == nil { - panic("ListModels returns a model that can't be looked-up.") + panic(fmt.Sprintf("ListModels returns a model that can't be looked-up for: %v", modelName)) } gvkList := parseGroupVersionKind(model) for _, gvk := range gvkList { if len(gvk.Kind) > 0 { + _, ok := parser.gvks[gvk] + if ok { + return nil, fmt.Errorf("Duplicate entry for %v", gvk) + } parser.gvks[gvk] = modelName } } From 1638e6698403341122cd55df61e6fe12559b0604 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Tue, 5 Feb 2019 11:34:36 -0800 Subject: [PATCH 2/3] change case for error --- .../pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go index b8cf8b849c1..043206bc4bc 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go @@ -62,7 +62,7 @@ func newGVKParser(models proto.Models) (*gvkParser, error) { if len(gvk.Kind) > 0 { _, ok := parser.gvks[gvk] if ok { - return nil, fmt.Errorf("Duplicate entry for %v", gvk) + return nil, fmt.Errorf("duplicate entry for %v", gvk) } parser.gvks[gvk] = modelName } From 4f50eb49eae1e6561263ff4abc00ea956139a2ef Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Tue, 5 Feb 2019 13:58:42 -0800 Subject: [PATCH 3/3] gofmt --- .../endpoints/handlers/fieldmanager/internal/gvkparser.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go index 043206bc4bc..929f1e79a7b 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go @@ -60,10 +60,10 @@ func newGVKParser(models proto.Models) (*gvkParser, error) { gvkList := parseGroupVersionKind(model) for _, gvk := range gvkList { if len(gvk.Kind) > 0 { - _, ok := parser.gvks[gvk] - if ok { - return nil, fmt.Errorf("duplicate entry for %v", gvk) - } + _, ok := parser.gvks[gvk] + if ok { + return nil, fmt.Errorf("duplicate entry for %v", gvk) + } parser.gvks[gvk] = modelName } }