From cdd65830fd1e71f7ffeb00d41d06d305f55ed0a7 Mon Sep 17 00:00:00 2001
From: Ted Yu <yuzhihong@gmail.com>
Date: Tue, 5 Feb 2019 10:29:38 -0800
Subject: [PATCH] Misc fix for feature-serverside-apply

Kubernetes-commit: f2e59b44ad5610bb749901b505305ba16c44fad5
---
 pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go b/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go
index 704097329..763968fc3 100644
--- a/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go
+++ b/pkg/endpoints/handlers/fieldmanager/internal/gvkparser.go
@@ -57,11 +57,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
 			}
 		}