diff --git a/pkg/api/latest/latest_test.go b/pkg/api/latest/latest_test.go index 300b4518d96..de6e378ee51 100644 --- a/pkg/api/latest/latest_test.go +++ b/pkg/api/latest/latest_test.go @@ -70,11 +70,11 @@ func TestInterfacesFor(t *testing.T) { } func TestRESTMapper(t *testing.T) { - if v, k, err := RESTMapper.VersionAndKindForResource("replicationcontrollers"); err != nil || v != "v1beta3" || k != "ReplicationController" { + if v, k, err := RESTMapper.VersionAndKindForResource("replicationcontrollers"); err != nil || v != "v1" || k != "ReplicationController" { t.Errorf("unexpected version mapping: %s %s %v", v, k, err) } - if m, err := RESTMapper.RESTMapping("PodTemplate", ""); err != nil || m.APIVersion != "v1beta3" || m.Resource != "podtemplates" { + if m, err := RESTMapper.RESTMapping("PodTemplate", ""); err != nil || m.APIVersion != "v1" || m.Resource != "podtemplates" { t.Errorf("unexpected version mapping: %#v %v", m, err) } diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index d68b4d2a095..613d8326558 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -162,9 +162,9 @@ func TestGetUnknownSchemaObjectListGeneric(t *testing.T) { }, "handles second specific version": { output: "unlikelyversion", - list: "v1beta3", + list: "v1", obj1: "unlikelyversion", // doesn't have v1beta3 - obj2: "v1beta3", // version of the API response + obj2: "v1", // version of the API response }, "handles common version": { output: "v1beta3", diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 8374bd433d2..790d49d127d 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -672,7 +672,7 @@ func TestUpdateWithRetries(t *testing.T) { Codec: codec, Client: client.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { - case p == "/api/v1beta3/namespaces/default/replicationcontrollers/rc" && m == "PUT": + case p == "/api/"+latest.Version+"/namespaces/default/replicationcontrollers/rc" && m == "PUT": update := updates[0] updates = updates[1:] // We should always get an update with a valid rc even when the get fails. The rc should always @@ -685,7 +685,7 @@ func TestUpdateWithRetries(t *testing.T) { delete(c.Spec.Selector, "baz") } return update, nil - case p == "/api/v1beta3/namespaces/default/replicationcontrollers/rc" && m == "GET": + case p == "/api/"+latest.Version+"/namespaces/default/replicationcontrollers/rc" && m == "GET": get := gets[0] gets = gets[1:] return get, nil @@ -763,27 +763,27 @@ func TestAddDeploymentHash(t *testing.T) { Codec: codec, Client: client.HTTPClientFunc(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { - case p == "/api/v1beta3/namespaces/default/pods" && m == "GET": + case p == "/api/"+latest.Version+"/namespaces/default/pods" && m == "GET": if req.URL.RawQuery != "labelSelector=foo%3Dbar" { t.Errorf("Unexpected query string: %s", req.URL.RawQuery) } return &http.Response{StatusCode: 200, Body: objBody(codec, podList)}, nil - case p == "/api/v1beta3/namespaces/default/pods/foo" && m == "PUT": + case p == "/api/"+latest.Version+"/namespaces/default/pods/foo" && m == "PUT": seen.Insert("foo") obj := readOrDie(t, req, codec) podList.Items[0] = *(obj.(*api.Pod)) return &http.Response{StatusCode: 200, Body: objBody(codec, &podList.Items[0])}, nil - case p == "/api/v1beta3/namespaces/default/pods/bar" && m == "PUT": + case p == "/api/"+latest.Version+"/namespaces/default/pods/bar" && m == "PUT": seen.Insert("bar") obj := readOrDie(t, req, codec) podList.Items[1] = *(obj.(*api.Pod)) return &http.Response{StatusCode: 200, Body: objBody(codec, &podList.Items[1])}, nil - case p == "/api/v1beta3/namespaces/default/pods/baz" && m == "PUT": + case p == "/api/"+latest.Version+"/namespaces/default/pods/baz" && m == "PUT": seen.Insert("baz") obj := readOrDie(t, req, codec) podList.Items[2] = *(obj.(*api.Pod)) return &http.Response{StatusCode: 200, Body: objBody(codec, &podList.Items[2])}, nil - case p == "/api/v1beta3/namespaces/default/replicationcontrollers/rc" && m == "PUT": + case p == "/api/"+latest.Version+"/namespaces/default/replicationcontrollers/rc" && m == "PUT": updatedRc = true return &http.Response{StatusCode: 200, Body: objBody(codec, rc)}, nil default: