Merge pull request #58466 from juanvallejo/jvallejo/update-openapi-ext-gvk-parsing

Automatic merge from submit-queue (batch tested with PRs 53895, 58013, 58466, 58531, 58535). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. tolerate more than one gvklist item Some third-party resources could be part of more than one api group. Allow this to be the case when adding openapi models to openapi data, and default to the first item as the gvk key for that model. Related downstream issue: https://github.com/openshift/origin/issues/17872 **Release note**: ```release-note NONE ``` cc @deads2k @soltysh

Merge pull request #58466 from juanvallejo/jvallejo/update-openapi-ext-gvk-parsing
0a427a99 · Kubernetes Submit Queue · GitHub · bd1738ac · 13add66f · 0a427a99
Unverified Commit 0a427a99 authored Jan 19, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 33 deletions

openapi.go pkg/kubectl/cmd/util/openapi/openapi.go +36 -33

No files found.
--- a/pkg/kubectl/cmd/util/openapi/openapi.go
+++ b/pkg/kubectl/cmd/util/openapi/openapi.go
@@ -56,9 +56,11 @@ func NewOpenAPIData(doc *openapi_v2.Document) (Resources, error) {
 		if model == nil {
 			panic("ListModels returns a model that can't be looked-up.")
 		}
-		gvk := parseGroupVersionKind(model)
+		gvkList := parseGroupVersionKind(model)
-		if len(gvk.Kind) > 0 {
+		for _, gvk := range gvkList {
-			resources[gvk] = modelName
+			if len(gvk.Kind) > 0 {
+				resources[gvk] = modelName
+			}
 		}
 	}
@@ -77,48 +79,49 @@ func (d *document) LookupResource(gvk schema.GroupVersionKind) proto.Schema {
 }
 // Get and parse GroupVersionKind from the extension. Returns empty if it doesn't have one.
-func parseGroupVersionKind(s proto.Schema) schema.GroupVersionKind {
+func parseGroupVersionKind(s proto.Schema) []schema.GroupVersionKind {
 	extensions := s.GetExtensions()
+	gvkListResult := []schema.GroupVersionKind{}
 	// Get the extensions
 	gvkExtension, ok := extensions[groupVersionKindExtensionKey]
 	if !ok {
-		return schema.GroupVersionKind{}
+		return []schema.GroupVersionKind{}
 	}
-	// gvk extension must be a list of 1 element.
+	// gvk extension must be a list of at least 1 element.
 	gvkList, ok := gvkExtension.([]interface{})
 	if !ok {
-		return schema.GroupVersionKind{}
+		return []schema.GroupVersionKind{}
 	}
-	if len(gvkList) != 1 {
-		return schema.GroupVersionKind{}
-	}
+	for _, gvk := range gvkList {
-	gvk := gvkList[0]
+		// gvk extension list must be a map with group, version, and
+		// kind fields
+		gvkMap, ok := gvk.(map[interface{}]interface{})
+		if !ok {
+			continue
+		}
+		group, ok := gvkMap["group"].(string)
+		if !ok {
+			continue
+		}
+		version, ok := gvkMap["version"].(string)
+		if !ok {
+			continue
+		}
+		kind, ok := gvkMap["kind"].(string)
+		if !ok {
+			continue
+		}
-	// gvk extension list must be a map with group, version, and
+		gvkListResult = append(gvkListResult, schema.GroupVersionKind{
-	// kind fields
+			Group:   group,
-	gvkMap, ok := gvk.(map[interface{}]interface{})
+			Version: version,
-	if !ok {
+			Kind:    kind,
-		return schema.GroupVersionKind{}
+		})
-	}
-	group, ok := gvkMap["group"].(string)
-	if !ok {
-		return schema.GroupVersionKind{}
-	}
-	version, ok := gvkMap["version"].(string)
-	if !ok {
-		return schema.GroupVersionKind{}
-	}
-	kind, ok := gvkMap["kind"].(string)
-	if !ok {
-		return schema.GroupVersionKind{}
 	}
-	return schema.GroupVersionKind{
+	return gvkListResult
-		Group:   group,
-		Version: version,
-		Kind:    kind,
-	}
 }