Merge pull request #40906 from du2016/checkAPIVersions

Automatic merge from submit-queue (batch tested with PRs 40906, 40924, 40938, 40902, 40911) Check whether apiversions is empty What this PR does / why we need it: #39719 check whether apisversions get from /api is empty Special notes for your reviewer: @caesarxuchao

Merge pull request #40906 from du2016/checkAPIVersions
b40fed9e · Kubernetes Submit Queue · GitHub · d6a4394b · 4acb99df · b40fed9e
Commit b40fed9e authored Feb 04, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

discovery_client.go staging/src/k8s.io/client-go/discovery/discovery_client.go +5 -3

No files found.
--- a/staging/src/k8s.io/client-go/discovery/discovery_client.go
+++ b/staging/src/k8s.io/client-go/discovery/discovery_client.go
@@ -123,7 +123,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err
 	v := &metav1.APIVersions{}
 	err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v)
 	apiGroup := metav1.APIGroup{}
-	if err == nil {
+	if err == nil && len(v.Versions) != 0 {
 		apiGroup = apiVersionsToAPIGroup(v)
 	}
 	if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) {
@@ -141,8 +141,10 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err
 		apiGroupList = &metav1.APIGroupList{}
 	}

-	// append the group retrieved from /api to the list
-	apiGroupList.Groups = append(apiGroupList.Groups, apiGroup)
+	// append the group retrieved from /api to the list if not empty
+	if len(v.Versions) != 0 {
+		apiGroupList.Groups = append(apiGroupList.Groups, apiGroup)
+	}
 	return apiGroupList, nil
 }