Skip to content

K
k3s
Commit da3d03f6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35492 from madhusudancs/federation-kubefed-00

Automatic merge from submit-queue Make the fake RESTClient usable by all the API groups, not just core. cc @kubernetes/sig-cluster-federation @quinton-hoole @nikhiljindal
parents cee8645d 63e31759
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
pkg/client/unversioned/fake/fake.go
View file @ da3d03f6
...@@ -47,6 +47,7 @@ func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) { ...@@ -47,6 +47,7 @@ func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
type RESTClient struct { type RESTClient struct {
Client *http.Client Client *http.Client
NegotiatedSerializer runtime.NegotiatedSerializer NegotiatedSerializer runtime.NegotiatedSerializer
GroupName string
Req *http.Request Req *http.Request
Resp *http.Response Resp *http.Response
...@@ -94,8 +95,14 @@ func (c *RESTClient) request(verb string) *restclient.Request { ...@@ -94,8 +95,14 @@ func (c *RESTClient) request(verb string) *restclient.Request {
ns := c.NegotiatedSerializer ns := c.NegotiatedSerializer
serializer, _ := ns.SerializerForMediaType(runtime.ContentTypeJSON, nil) serializer, _ := ns.SerializerForMediaType(runtime.ContentTypeJSON, nil)
streamingSerializer, _ := ns.StreamingSerializerForMediaType(runtime.ContentTypeJSON, nil) streamingSerializer, _ := ns.StreamingSerializerForMediaType(runtime.ContentTypeJSON, nil)
groupName := api.GroupName
if c.GroupName != "" {
groupName = c.GroupName
}
internalVersion := unversioned.GroupVersion{ internalVersion := unversioned.GroupVersion{
Group: registered.GroupOrDie(api.GroupName).GroupVersion.Group, Group: registered.GroupOrDie(groupName).GroupVersion.Group,
Version: runtime.APIVersionInternal, Version: runtime.APIVersionInternal,
} }
internalVersion.Version = runtime.APIVersionInternal internalVersion.Version = runtime.APIVersionInternal
......
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