From f3caff2a795dcf625dac319e6d542a25c1c147e3 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 9 Oct 2015 15:15:35 -0700 Subject: [PATCH] testapi.Experimental -> testapi.Extensions --- cmd/integration/integration.go | 8 ++++---- pkg/client/unversioned/client_test.go | 6 +++--- pkg/client/unversioned/daemon_sets_test.go | 12 ++++++------ pkg/client/unversioned/deployment_test.go | 12 ++++++------ .../unversioned/horizontalpodautoscaler_test.go | 12 ++++++------ pkg/client/unversioned/ingress_test.go | 12 ++++++------ pkg/client/unversioned/jobs_test.go | 12 ++++++------ pkg/controller/daemon/controller_test.go | 2 +- pkg/conversion/unversioned_test.go | 4 ++-- pkg/master/master_test.go | 14 +++++++------- pkg/registry/deployment/etcd/etcd_test.go | 6 +++--- .../experimental/controller/etcd/etcd_test.go | 2 +- pkg/registry/registrytest/etcd.go | 4 ++-- test/integration/framework/master_utils.go | 4 ++-- 14 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 14359423a54..676e0c5faaa 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -135,7 +135,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.Experimental.GroupAndVersion()}) + cl.ExperimentalClient = 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()) @@ -143,8 +143,8 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string if err != nil { glog.Fatalf("Unable to get etcd storage: %v", err) } - expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, testapi.Experimental.GroupAndVersion(), etcdtest.PathPrefix()) - storageVersions["extensions"] = testapi.Experimental.GroupAndVersion() + expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, testapi.Extensions.GroupAndVersion(), etcdtest.PathPrefix()) + storageVersions["extensions"] = testapi.Extensions.GroupAndVersion() if err != nil { glog.Fatalf("Unable to get etcd storage for experimental: %v", err) } @@ -985,7 +985,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.Experimental.GroupAndVersion()}) + kubeClient.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()}) // Run tests in parallel testFuncs := []testFunc{ diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go index 61b13fc44d2..5eec4ffca8a 100644 --- a/pkg/client/unversioned/client_test.go +++ b/pkg/client/unversioned/client_test.go @@ -92,7 +92,7 @@ func (c *testClient) Setup(t *testing.T) *testClient { // We will fix this by supporting multiple group versions in Config version = c.Version if len(version) == 0 { - version = testapi.Experimental.Version() + version = testapi.Extensions.Version() } c.ExperimentalClient = NewExperimentalOrDie(&Config{ Host: c.server.URL, @@ -229,8 +229,8 @@ func body(t *testing.T, obj runtime.Object, raw *string) *string { if err != nil { t.Errorf("unexpected encoding error: %v", err) } - } else if api.Scheme.Recognizes(testapi.Experimental.GroupAndVersion(), kind) { - bs, err = testapi.Experimental.Codec().Encode(obj) + } else if api.Scheme.Recognizes(testapi.Extensions.GroupAndVersion(), kind) { + bs, err = testapi.Extensions.Codec().Encode(obj) if err != nil { t.Errorf("unexpected encoding error: %v", err) } diff --git a/pkg/client/unversioned/daemon_sets_test.go b/pkg/client/unversioned/daemon_sets_test.go index 5e1b1f123f9..2e8523cdf58 100644 --- a/pkg/client/unversioned/daemon_sets_test.go +++ b/pkg/client/unversioned/daemon_sets_test.go @@ -34,7 +34,7 @@ func TestListDaemonSets(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, ""), }, Response: Response{StatusCode: 200, Body: &experimental.DaemonSetList{ @@ -63,7 +63,7 @@ func TestListDaemonSets(t *testing.T) { func TestGetDaemonSet(t *testing.T) { ns := api.NamespaceDefault c := &testClient{ - Request: testRequest{Method: "GET", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, + Request: testRequest{Method: "GET", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, Response: Response{ StatusCode: 200, Body: &experimental.DaemonSet{ @@ -101,7 +101,7 @@ func TestUpdateDaemonSet(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"}, } c := &testClient{ - Request: testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, + Request: testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, Response: Response{ StatusCode: 200, Body: &experimental.DaemonSet{ @@ -128,7 +128,7 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"}, } c := &testClient{ - Request: testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil)}, + Request: testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil)}, Response: Response{ StatusCode: 200, Body: &experimental.DaemonSet{ @@ -153,7 +153,7 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) { func TestDeleteDaemon(t *testing.T) { ns := api.NamespaceDefault c := &testClient{ - Request: testRequest{Method: "DELETE", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, + Request: testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)}, Response: Response{StatusCode: 200}, } err := c.Setup(t).Experimental().DaemonSets(ns).Delete("foo") @@ -166,7 +166,7 @@ func TestCreateDaemonSet(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "foo"}, } c := &testClient{ - Request: testRequest{Method: "POST", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, ""), Body: requestDaemonSet, Query: buildQueryValues(nil)}, + Request: testRequest{Method: "POST", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, ""), Body: requestDaemonSet, Query: buildQueryValues(nil)}, Response: Response{ StatusCode: 200, Body: &experimental.DaemonSet{ diff --git a/pkg/client/unversioned/deployment_test.go b/pkg/client/unversioned/deployment_test.go index 0dcc9fd901c..83c0dd126dc 100644 --- a/pkg/client/unversioned/deployment_test.go +++ b/pkg/client/unversioned/deployment_test.go @@ -42,7 +42,7 @@ func TestDeploymentCreate(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "POST", - Path: testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, ""), Query: buildQueryValues(nil), Body: &deployment, }, @@ -67,7 +67,7 @@ func TestDeploymentGet(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "abc"), + Path: testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "abc"), Query: buildQueryValues(nil), Body: nil, }, @@ -93,7 +93,7 @@ func TestDeploymentList(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, ""), Query: buildQueryValues(nil), Body: nil, }, @@ -115,7 +115,7 @@ func TestDeploymentUpdate(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "PUT", - Path: testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "abc"), + Path: testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "abc"), Query: buildQueryValues(nil), }, Response: Response{StatusCode: 200, Body: deployment}, @@ -129,7 +129,7 @@ func TestDeploymentDelete(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "DELETE", - Path: testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{StatusCode: 200}, @@ -142,7 +142,7 @@ func TestDeploymentWatch(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePathWithPrefix("watch", getDeploymentsResoureName(), "", ""), + Path: testapi.Extensions.ResourcePathWithPrefix("watch", getDeploymentsResoureName(), "", ""), Query: url.Values{"resourceVersion": []string{}}, }, Response: Response{StatusCode: 200}, diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go index a1dd80279e3..061c7f2c460 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler_test.go +++ b/pkg/client/unversioned/horizontalpodautoscaler_test.go @@ -42,7 +42,7 @@ func TestHorizontalPodAutoscalerCreate(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "POST", - Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""), Query: buildQueryValues(nil), Body: &horizontalPodAutoscaler, }, @@ -67,7 +67,7 @@ func TestHorizontalPodAutoscalerGet(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), + Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil), Body: nil, }, @@ -93,7 +93,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""), Query: buildQueryValues(nil), Body: nil, }, @@ -113,7 +113,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) { }, } c := &testClient{ - Request: testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil)}, + Request: testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil)}, Response: Response{StatusCode: 200, Body: horizontalPodAutoscaler}, } response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Update(horizontalPodAutoscaler) @@ -123,7 +123,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) { func TestHorizontalPodAutoscalerDelete(t *testing.T) { ns := api.NamespaceDefault c := &testClient{ - Request: testRequest{Method: "DELETE", Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "foo"), Query: buildQueryValues(nil)}, + Request: testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "foo"), Query: buildQueryValues(nil)}, Response: Response{StatusCode: 200}, } err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Delete("foo", nil) @@ -134,7 +134,7 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePathWithPrefix("watch", getHorizontalPodAutoscalersResoureName(), "", ""), + Path: testapi.Extensions.ResourcePathWithPrefix("watch", getHorizontalPodAutoscalersResoureName(), "", ""), Query: url.Values{"resourceVersion": []string{}}}, Response: Response{StatusCode: 200}, } diff --git a/pkg/client/unversioned/ingress_test.go b/pkg/client/unversioned/ingress_test.go index 8a360607ac4..b76dd607a9c 100644 --- a/pkg/client/unversioned/ingress_test.go +++ b/pkg/client/unversioned/ingress_test.go @@ -35,7 +35,7 @@ func TestListIngress(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""), }, Response: Response{StatusCode: 200, Body: &experimental.IngressList{ @@ -65,7 +65,7 @@ func TestGetIngress(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{ @@ -111,7 +111,7 @@ func TestUpdateIngress(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "PUT", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{ @@ -154,7 +154,7 @@ func TestUpdateIngressStatus(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "PUT", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo") + "/status", + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil), }, Response: Response{ @@ -185,7 +185,7 @@ func TestDeleteIngress(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "DELETE", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{StatusCode: 200}, @@ -205,7 +205,7 @@ func TestCreateIngress(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "POST", - Path: testapi.Experimental.ResourcePath(getIngressResourceName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""), Body: requestIngress, Query: buildQueryValues(nil), }, diff --git a/pkg/client/unversioned/jobs_test.go b/pkg/client/unversioned/jobs_test.go index f2ace7574c9..86de76639d8 100644 --- a/pkg/client/unversioned/jobs_test.go +++ b/pkg/client/unversioned/jobs_test.go @@ -35,7 +35,7 @@ func TestListJobs(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, ""), }, Response: Response{StatusCode: 200, Body: &experimental.JobList{ @@ -65,7 +65,7 @@ func TestGetJob(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "GET", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{ @@ -111,7 +111,7 @@ func TestUpdateJob(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "PUT", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{ @@ -146,7 +146,7 @@ func TestUpdateJobStatus(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "PUT", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo") + "/status", + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil), }, Response: Response{ @@ -177,7 +177,7 @@ func TestDeleteJob(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "DELETE", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"), + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"), Query: buildQueryValues(nil), }, Response: Response{StatusCode: 200}, @@ -197,7 +197,7 @@ func TestCreateJob(t *testing.T) { c := &testClient{ Request: testRequest{ Method: "POST", - Path: testapi.Experimental.ResourcePath(getJobResourceName(), ns, ""), + Path: testapi.Extensions.ResourcePath(getJobResourceName(), ns, ""), Body: requestJob, Query: buildQueryValues(nil), }, diff --git a/pkg/controller/daemon/controller_test.go b/pkg/controller/daemon/controller_test.go index 56a933710ff..70bb3d7b031 100644 --- a/pkg/controller/daemon/controller_test.go +++ b/pkg/controller/daemon/controller_test.go @@ -53,7 +53,7 @@ func getKey(ds *experimental.DaemonSet, t *testing.T) string { func newDaemonSet(name string) *experimental.DaemonSet { return &experimental.DaemonSet{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Experimental.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Extensions.Version()}, ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, diff --git a/pkg/conversion/unversioned_test.go b/pkg/conversion/unversioned_test.go index e481e8df51b..a637ee09fe7 100644 --- a/pkg/conversion/unversioned_test.go +++ b/pkg/conversion/unversioned_test.go @@ -64,9 +64,9 @@ func TestV1EncodeDecodeStatus(t *testing.T) { } func TestExperimentalEncodeDecodeStatus(t *testing.T) { - // TODO: caesarxuchao: use the testapi.Experimental.Codec() once the PR that + // TODO: caesarxuchao: use the testapi.Extensions.Codec() once the PR that // moves experimental from v1 to v1beta1 got merged. - // expCodec := testapi.Experimental.Codec() + // expCodec := testapi.Extensions.Codec() expCodec := runtime.CodecFor(api.Scheme, "extensions/v1beta1") encoded, err := expCodec.Encode(status) if err != nil { diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index ec2df04067b..fe026d50e1e 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -67,10 +67,10 @@ func setUp(t *testing.T) (Master, Config, *assert.Assertions) { storageVersions := make(map[string]string) storageDestinations := NewStorageDestinations() storageDestinations.AddAPIGroup("", etcdstorage.NewEtcdStorage(fakeClient, testapi.Default.Codec(), etcdtest.PathPrefix())) - storageDestinations.AddAPIGroup("extensions", etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix())) + storageDestinations.AddAPIGroup("extensions", etcdstorage.NewEtcdStorage(fakeClient, testapi.Extensions.Codec(), etcdtest.PathPrefix())) config.StorageDestinations = storageDestinations storageVersions[""] = testapi.Default.Version() - storageVersions["extensions"] = testapi.Experimental.GroupAndVersion() + storageVersions["extensions"] = testapi.Extensions.GroupAndVersion() config.StorageVersions = storageVersions master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{}) @@ -474,8 +474,8 @@ func TestDiscoveryAtAPIS(t *testing.T) { expectGroupName := "extensions" expectVersions := []api.GroupVersion{ { - GroupVersion: testapi.Experimental.GroupAndVersion(), - Version: testapi.Experimental.Version(), + GroupVersion: testapi.Extensions.GroupAndVersion(), + Version: testapi.Extensions.Version(), }, } expectPreferredVersion := api.GroupVersion{ @@ -522,7 +522,7 @@ func initThirdParty(t *testing.T, version string) (*Master, *tools.FakeEtcdClien fakeClient := tools.NewFakeEtcdClient(t) fakeClient.Machines = []string{"http://machine1:4001", "http://machine2", "http://machine3:4003"} - master.thirdPartyStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix()) + master.thirdPartyStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Extensions.Codec(), etcdtest.PathPrefix()) if !assert.NoError(master.InstallThirdPartyResource(api)) { t.FailNow() @@ -634,7 +634,7 @@ func encodeToThirdParty(name string, obj interface{}) ([]byte, error) { ObjectMeta: api.ObjectMeta{Name: name}, Data: serial, } - return testapi.Experimental.Codec().Encode(&thirdPartyData) + return testapi.Extensions.Codec().Encode(&thirdPartyData) } func storeToEtcd(fakeClient *tools.FakeEtcdClient, path, name string, obj interface{}) error { @@ -774,7 +774,7 @@ func testInstallThirdPartyAPIPostForVersion(t *testing.T, version string) { t.FailNow() } - obj, err := testapi.Experimental.Codec().Decode([]byte(etcdResp.Node.Value)) + obj, err := testapi.Extensions.Codec().Decode([]byte(etcdResp.Node.Value)) if err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/registry/deployment/etcd/etcd_test.go b/pkg/registry/deployment/etcd/etcd_test.go index 642c7f86568..9f1184dc859 100755 --- a/pkg/registry/deployment/etcd/etcd_test.go +++ b/pkg/registry/deployment/etcd/etcd_test.go @@ -191,7 +191,7 @@ func TestScaleGet(t *testing.T) { ctx := api.WithNamespace(api.NewContext(), namespace) key := etcdtest.AddPrefix("/deployments/" + namespace + "/" + name) - if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Experimental.Codec(), &validDeployment), 0); err != nil { + if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Extensions.Codec(), &validDeployment), 0); err != nil { t.Fatalf("unexpected error: %v", err) } @@ -211,7 +211,7 @@ func TestScaleUpdate(t *testing.T) { ctx := api.WithNamespace(api.NewContext(), namespace) key := etcdtest.AddPrefix("/deployments/" + namespace + "/" + name) - if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Experimental.Codec(), &validDeployment), 0); err != nil { + if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Extensions.Codec(), &validDeployment), 0); err != nil { t.Fatalf("unexpected error: %v", err) } replicas := 12 @@ -231,7 +231,7 @@ func TestScaleUpdate(t *testing.T) { } var deployment experimental.Deployment - testapi.Experimental.Codec().DecodeInto([]byte(response.Node.Value), &deployment) + testapi.Extensions.Codec().DecodeInto([]byte(response.Node.Value), &deployment) if deployment.Spec.Replicas != replicas { t.Errorf("wrong replicas count expected: %d got: %d", replicas, deployment.Spec.Replicas) } diff --git a/pkg/registry/experimental/controller/etcd/etcd_test.go b/pkg/registry/experimental/controller/etcd/etcd_test.go index 425a8bdf82f..66d05bdf406 100644 --- a/pkg/registry/experimental/controller/etcd/etcd_test.go +++ b/pkg/registry/experimental/controller/etcd/etcd_test.go @@ -122,7 +122,7 @@ func TestUpdate(t *testing.T) { } var controller api.ReplicationController - testapi.Experimental.Codec().DecodeInto([]byte(response.Node.Value), &controller) + testapi.Extensions.Codec().DecodeInto([]byte(response.Node.Value), &controller) if controller.Spec.Replicas != replicas { t.Errorf("wrong replicas count expected: %d got: %d", replicas, controller.Spec.Replicas) } diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index c22a393dd1b..9072a4918d1 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -163,8 +163,8 @@ func getCodec(obj runtime.Object) (runtime.Codec, error) { var codec runtime.Codec if api.Scheme.Recognizes(testapi.Default.GroupAndVersion(), kind) { codec = testapi.Default.Codec() - } else if api.Scheme.Recognizes(testapi.Experimental.GroupAndVersion(), kind) { - codec = testapi.Experimental.Codec() + } else if api.Scheme.Recognizes(testapi.Extensions.GroupAndVersion(), kind) { + codec = testapi.Extensions.Codec() } else { return nil, fmt.Errorf("unexpected kind: %v", kind) } diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index a706e635041..c34a7de846d 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -275,8 +275,8 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) { if err != nil { t.Fatalf("unexpected error: %v", err) } - expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, testapi.Experimental.GroupAndVersion(), etcdtest.PathPrefix()) - storageVersions["extensions"] = testapi.Experimental.GroupAndVersion() + expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, testapi.Extensions.GroupAndVersion(), etcdtest.PathPrefix()) + storageVersions["extensions"] = testapi.Extensions.GroupAndVersion() if err != nil { t.Fatalf("unexpected error: %v", err) }