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

update negotiation to reflect current kubectl state

Browse Source
This commit is contained in:
deads2k 2017-02-03 12:12:45 -05:00
parent 2bb1e75815
commit 2b5b04d074
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/client-go/discovery/helper.go
View File

@ -104,8 +104,8 @@ func NegotiateVersion(client DiscoveryInterface, requiredGV *schema.GroupVersion
return &clientRegisteredGVs[0], nil return &clientRegisteredGVs[0], nil
} }
return nil, fmt.Errorf("failed to negotiate an api version; server supports: %v, client supports: %v", // fall back to an empty GroupVersion. Most client commands no longer respect a GroupVersion anyway
serverVersions, clientVersions) return &schema.GroupVersion{}, nil
} }
// GroupVersionResources converts APIResourceLists to the GroupVersionResources. // GroupVersionResources converts APIResourceLists to the GroupVersionResources.

4
staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go
View File

@ -118,8 +118,8 @@ func TestNegotiateVersion(t *testing.T) {
statusCode: http.StatusNotFound, statusCode: http.StatusNotFound,
}, },
{ {
name: "discovery fails due to 403 Forbidden errors and thus serverVersions is empty, no fallback GroupVersion", name: "discovery fails due to 403 Forbidden errors and thus serverVersions is empty, fallback to empty GroupVersion",
expectErr: func(err error) bool { return strings.Contains(err.Error(), "failed to negotiate an api version;") }, expectedVersion: &schema.GroupVersion{},
statusCode: http.StatusForbidden, statusCode: http.StatusForbidden,
}, },
} }