published by bot

(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is 122bf004bf5d03f96d9f205d4008b6ea8b47d209
This commit is contained in:
Kubernetes Publisher
2017-01-26 15:19:41 +00:00
parent fcdf37233b
commit f427d46f91
150 changed files with 3321 additions and 2392 deletions

View File

@@ -22,11 +22,10 @@ import (
"net/http"
"net/url"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/pkg/api/testapi"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/util/flowcontrol"
)
@@ -48,6 +47,7 @@ type RESTClient struct {
Client *http.Client
NegotiatedSerializer runtime.NegotiatedSerializer
GroupName string
APIRegistry *registered.APIRegistrationManager
Req *http.Request
Resp *http.Response
@@ -79,7 +79,7 @@ func (c *RESTClient) Verb(verb string) *restclient.Request {
}
func (c *RESTClient) APIVersion() schema.GroupVersion {
return *(testapi.Default.GroupVersion())
return c.APIRegistry.GroupOrDie("").GroupVersion
}
func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter {
@@ -88,24 +88,22 @@ func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter {
func (c *RESTClient) request(verb string) *restclient.Request {
config := restclient.ContentConfig{
ContentType: runtime.ContentTypeJSON,
GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
ContentType: runtime.ContentTypeJSON,
// TODO this was hardcoded before, but it doesn't look right
GroupVersion: &c.APIRegistry.GroupOrDie("").GroupVersion,
NegotiatedSerializer: c.NegotiatedSerializer,
}
groupName := api.GroupName
if c.GroupName != "" {
groupName = c.GroupName
}
ns := c.NegotiatedSerializer
info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
internalVersion := schema.GroupVersion{
Group: api.Registry.GroupOrDie(groupName).GroupVersion.Group,
Group: c.APIRegistry.GroupOrDie(c.GroupName).GroupVersion.Group,
Version: runtime.APIVersionInternal,
}
internalVersion.Version = runtime.APIVersionInternal
serializers := restclient.Serializers{
Encoder: ns.EncoderForVersion(info.Serializer, api.Registry.GroupOrDie(api.GroupName).GroupVersion),
// TODO this was hardcoded before, but it doesn't look right
Encoder: ns.EncoderForVersion(info.Serializer, c.APIRegistry.GroupOrDie("").GroupVersion),
Decoder: ns.DecoderToVersion(info.Serializer, internalVersion),
}
if info.StreamSerializer != nil {