Commit 2b5b04d0 authored by deads2k's avatar deads2k

update negotiation to reflect current kubectl state

parent 2bb1e758
...@@ -104,8 +104,8 @@ func NegotiateVersion(client DiscoveryInterface, requiredGV *schema.GroupVersion ...@@ -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.
......
...@@ -118,9 +118,9 @@ func TestNegotiateVersion(t *testing.T) { ...@@ -118,9 +118,9 @@ 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,
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment