diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 089f8a20a7..56f39fce6b 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -136,7 +136,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string // TODO: caesarxuchao: hacky way to specify version of Experimental client. // We will fix this by supporting multiple group versions in Config - cl.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()}) + cl.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()}) storageVersions := make(map[string]string) etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.GroupAndVersion(), etcdtest.PathPrefix()) @@ -986,7 +986,7 @@ func main() { kubeClient := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Default.GroupAndVersion()}) // TODO: caesarxuchao: hacky way to specify version of Experimental client. // We will fix this by supporting multiple group versions in Config - kubeClient.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()}) + kubeClient.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()}) // Run tests in parallel testFuncs := []testFunc{ diff --git a/pkg/client/unversioned/client.go b/pkg/client/unversioned/client.go index 8e79d684be..ca3dbc8023 100644 --- a/pkg/client/unversioned/client.go +++ b/pkg/client/unversioned/client.go @@ -128,7 +128,7 @@ type APIStatus interface { // Client is the implementation of a Kubernetes client. type Client struct { *RESTClient - *ExperimentalClient + *ExtensionsClient } // ServerVersion retrieves and parses the server's version. @@ -244,5 +244,5 @@ func IsTimeout(err error) bool { } func (c *Client) Experimental() ExtensionsInterface { - return c.ExperimentalClient + return c.ExtensionsClient } diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go index 746fe19fe9..7b0ff6ad7f 100644 --- a/pkg/client/unversioned/client_test.go +++ b/pkg/client/unversioned/client_test.go @@ -95,7 +95,7 @@ func (c *testClient) Setup(t *testing.T) *testClient { if len(version) == 0 { version = testapi.Extensions.Version() } - c.ExperimentalClient = NewExperimentalOrDie(&Config{ + c.ExtensionsClient = NewExperimentalOrDie(&Config{ Host: c.server.URL, Version: version, }) diff --git a/pkg/client/unversioned/daemon_sets.go b/pkg/client/unversioned/daemon_sets.go index 56cc0d8f08..d966251b3f 100644 --- a/pkg/client/unversioned/daemon_sets.go +++ b/pkg/client/unversioned/daemon_sets.go @@ -40,11 +40,11 @@ type DaemonSetInterface interface { // daemonSets implements DaemonsSetsNamespacer interface type daemonSets struct { - r *ExperimentalClient + r *ExtensionsClient ns string } -func newDaemonSets(c *ExperimentalClient, namespace string) *daemonSets { +func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { return &daemonSets{c, namespace} } diff --git a/pkg/client/unversioned/deployment.go b/pkg/client/unversioned/deployment.go index eed4482ad8..878f5ee1f2 100644 --- a/pkg/client/unversioned/deployment.go +++ b/pkg/client/unversioned/deployment.go @@ -41,12 +41,12 @@ type DeploymentInterface interface { // deployments implements DeploymentInterface type deployments struct { - client *ExperimentalClient + client *ExtensionsClient ns string } // newDeployments returns a Deployments -func newDeployments(c *ExperimentalClient, namespace string) *deployments { +func newDeployments(c *ExtensionsClient, namespace string) *deployments { return &deployments{ client: c, ns: namespace, diff --git a/pkg/client/unversioned/helper.go b/pkg/client/unversioned/helper.go index aa9a0b025d..85aaed57ab 100644 --- a/pkg/client/unversioned/helper.go +++ b/pkg/client/unversioned/helper.go @@ -147,14 +147,14 @@ func New(c *Config) (*Client, error) { } if _, err := latest.Group("extensions"); err != nil { - return &Client{RESTClient: client, ExperimentalClient: nil}, nil + return &Client{RESTClient: client, ExtensionsClient: nil}, nil } experimentalConfig := *c experimentalClient, err := NewExperimental(&experimentalConfig) if err != nil { return nil, err } - return &Client{RESTClient: client, ExperimentalClient: experimentalClient}, nil + return &Client{RESTClient: client, ExtensionsClient: experimentalClient}, nil } // MatchesServerVersion queries the server to compares the build version diff --git a/pkg/client/unversioned/horizontalpodautoscaler.go b/pkg/client/unversioned/horizontalpodautoscaler.go index 93352c6aff..af98c99df9 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/unversioned/horizontalpodautoscaler.go @@ -42,12 +42,12 @@ type HorizontalPodAutoscalerInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalersNamespacer interface type horizontalPodAutoscalers struct { - client *ExperimentalClient + client *ExtensionsClient ns string } // newHorizontalPodAutoscalers returns a horizontalPodAutoscalers -func newHorizontalPodAutoscalers(c *ExperimentalClient, namespace string) *horizontalPodAutoscalers { +func newHorizontalPodAutoscalers(c *ExtensionsClient, namespace string) *horizontalPodAutoscalers { return &horizontalPodAutoscalers{ client: c, ns: namespace, diff --git a/pkg/client/unversioned/ingress.go b/pkg/client/unversioned/ingress.go index 884f2ea8c4..8c8544c5c4 100644 --- a/pkg/client/unversioned/ingress.go +++ b/pkg/client/unversioned/ingress.go @@ -42,12 +42,12 @@ type IngressInterface interface { // ingress implements IngressNamespacer interface type ingress struct { - r *ExperimentalClient + r *ExtensionsClient ns string } // newIngress returns a ingress -func newIngress(c *ExperimentalClient, namespace string) *ingress { +func newIngress(c *ExtensionsClient, namespace string) *ingress { return &ingress{c, namespace} } diff --git a/pkg/client/unversioned/jobs.go b/pkg/client/unversioned/jobs.go index 40b66e2b9c..d6a88edb17 100644 --- a/pkg/client/unversioned/jobs.go +++ b/pkg/client/unversioned/jobs.go @@ -43,12 +43,12 @@ type JobInterface interface { // jobs implements JobsNamespacer interface type jobs struct { - r *ExperimentalClient + r *ExtensionsClient ns string } // newJobs returns a jobs -func newJobs(c *ExperimentalClient, namespace string) *jobs { +func newJobs(c *ExtensionsClient, namespace string) *jobs { return &jobs{c, namespace} } diff --git a/pkg/client/unversioned/scale.go b/pkg/client/unversioned/scale.go index 486a021357..7663325b48 100644 --- a/pkg/client/unversioned/scale.go +++ b/pkg/client/unversioned/scale.go @@ -33,12 +33,12 @@ type ScaleInterface interface { // horizontalPodAutoscalers implements HorizontalPodAutoscalersNamespacer interface type scales struct { - client *ExperimentalClient + client *ExtensionsClient ns string } // newHorizontalPodAutoscalers returns a horizontalPodAutoscalers -func newScales(c *ExperimentalClient, namespace string) *scales { +func newScales(c *ExtensionsClient, namespace string) *scales { return &scales{ client: c, ns: namespace, diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index 5bfdd44c09..6fd4118818 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -143,7 +143,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory { case "": return client.RESTClient, nil case "extensions": - return client.ExperimentalClient.RESTClient, nil + return client.ExtensionsClient.RESTClient, nil } return nil, fmt.Errorf("unable to get RESTClient for resource '%s'", mapping.Resource) }, @@ -407,10 +407,10 @@ func (c *clientSwaggerSchema) ValidateBytes(data []byte) error { return fmt.Errorf("could not find api group for %s: %v", kind, err) } if group == "extensions" { - if c.c.ExperimentalClient == nil { + if c.c.ExtensionsClient == nil { return errors.New("unable to validate: no experimental client") } - return getSchemaAndValidate(c.c.ExperimentalClient.RESTClient, data, "apis/", version, c.cacheDir) + return getSchemaAndValidate(c.c.ExtensionsClient.RESTClient, data, "apis/", version, c.cacheDir) } return getSchemaAndValidate(c.c.RESTClient, data, "api", version, c.cacheDir) } diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 727c1e3baa..b308c37180 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -78,12 +78,12 @@ func (c *ErrorJobClient) Jobs(namespace string) client.JobInterface { return &ErrorJobs{testclient.FakeJobs{Fake: &c.FakeExperimental, Namespace: namespace}, c.invalid} } -type ErrorExperimentalClient struct { +type ErrorExtensionsClient struct { testclient.Fake invalid bool } -func (c *ErrorExperimentalClient) Experimental() client.ExtensionsInterface { +func (c *ErrorExtensionsClient) Experimental() client.ExtensionsInterface { return &ErrorJobClient{testclient.FakeExperimental{&c.Fake}, c.invalid} } @@ -287,7 +287,7 @@ func TestValidateReplicationController(t *testing.T) { } func TestJobScaleRetry(t *testing.T) { - fake := &ErrorExperimentalClient{Fake: testclient.Fake{}, invalid: false} + fake := &ErrorExtensionsClient{Fake: testclient.Fake{}, invalid: false} scaler := JobScaler{fake} preconditions := ScalePrecondition{-1, ""} count := uint(3) @@ -331,7 +331,7 @@ func TestJobScale(t *testing.T) { } func TestJobScaleInvalid(t *testing.T) { - fake := &ErrorExperimentalClient{Fake: testclient.Fake{}, invalid: true} + fake := &ErrorExtensionsClient{Fake: testclient.Fake{}, invalid: true} scaler := JobScaler{fake} preconditions := ScalePrecondition{-1, ""} count := uint(3)