@@ -15,7 +15,6 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util/yaml"

-	"github.com/openshift/origin/pkg/api/latest"

 	"github.com/openshift/origin/pkg/api/validation"

 	buildapi "github.com/openshift/origin/pkg/build/api"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

@@ -23,6 +22,11 @@ import (

 	projectapi "github.com/openshift/origin/pkg/project/api"

 	routeapi "github.com/openshift/origin/pkg/route/api"

 	templateapi "github.com/openshift/origin/pkg/template/api"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"

 )

 type mockService struct{}

@@ -139,7 +143,7 @@ func TestExampleObjectSchemas(t *testing.T) {

 				t.Logf("%q is skipped", path)

 				return

 			}

-			if err := latest.Codec.DecodeInto(data, expectedType); err != nil {

+			if err := runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), data, expectedType); err != nil {

 				t.Errorf("%s did not decode correctly: %v\n%s", path, err, string(data))

 				return

 			}

@@ -189,7 +193,7 @@ func validateObject(path string, obj runtime.Object, t *testing.T) {

 	case *kapi.List, *imageapi.ImageStreamList:

 		if list, err := meta.ExtractList(typedObj); err == nil {

-			runtime.DecodeList(list, kapi.Scheme)

+			runtime.DecodeList(list, kapi.Codecs.UniversalDecoder())

 			for i := range list {

 				validateObject(path, list[i], t)

 			}

@@ -21,7 +21,7 @@ var OldestVersion = unversioned.GroupVersion{Group: "", Version: "v1beta3"}

 // may be assumed to be most preferred to least preferred, and clients may

 // choose to prefer the earlier items in the list over the latter items when presented

 // with a set of versions to choose.

-var Versions = []unversioned.GroupVersion{unversioned.GroupVersion{Group: "", Version: "v1"}, unversioned.GroupVersion{Group: "", Version: "v1beta3"}}

+var Versions = []unversioned.GroupVersion{{Group: "", Version: "v1"}, {Group: "", Version: "v1beta3"}}

 // originTypes are the hardcoded types defined by the OpenShift API.

 var originTypes map[unversioned.GroupVersionKind]bool

@@ -4,6 +4,7 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

+	_ "k8s.io/kubernetes/pkg/api/install"

 	"k8s.io/kubernetes/pkg/api/meta"

 	"k8s.io/kubernetes/pkg/apimachinery/registered"

@@ -26,7 +27,7 @@ func TestRESTRootScope(t *testing.T) {

 func TestResourceToKind(t *testing.T) {

 	// Ensure we resolve to latest.Version

 	expectedGVK := Version.WithKind("User")

-	gvk, err := kapi.RESTMapper.KindFor(userapi.SchemeGroupVersion.WithResource("user"))

+	gvk, err := kapi.RESTMapper.KindFor(userapi.SchemeGroupVersion.WithResource("User"))

 	if err != nil {

 		t.Fatalf("Unexpected error: %v", err)

 	}

@@ -27,6 +27,10 @@ import (

 )

 func init() {

+	RegisterAll()

+}

+

+func RegisterAll() {

 	Validator.Register(&authorizationapi.SubjectAccessReview{}, authorizationvalidation.ValidateSubjectAccessReview, nil)

 	Validator.Register(&authorizationapi.ResourceAccessReview{}, authorizationvalidation.ValidateResourceAccessReview, nil)

 	Validator.Register(&authorizationapi.LocalSubjectAccessReview{}, authorizationvalidation.ValidateLocalSubjectAccessReview, nil)

@@ -1,9 +1,10 @@

-package v1

+package v1_test

 import (

 	"testing"

 	"github.com/openshift/origin/pkg/authorization/api"

+	_ "github.com/openshift/origin/pkg/authorization/api/install"

 	testutil "github.com/openshift/origin/test/util/api"

 )

@@ -10,6 +10,7 @@ import (

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

+	_ "github.com/openshift/origin/pkg/authorization/api/install"

 	"github.com/openshift/origin/pkg/client/testclient"

 )

@@ -81,7 +81,7 @@ func TestConflictingNamespace(t *testing.T) {

 	if err == nil {

 		t.Fatalf("unexpected non-error: %v", err)

 	}

-	if e, a := "namespace: invalid value 'foo', Details: namespace must be: bar", err.Error(); e != a {

+	if e, a := `namespace: Invalid value: "foo": namespace must be: bar`, err.Error(); e != a {

 		t.Fatalf("expected %v, got %v", e, a)

 	}

 }

@@ -89,7 +89,7 @@ func TestConflictingNamespace(t *testing.T) {

 	if err == nil {

 		t.Fatalf("unexpected non-error: %v", err)

 	}

-	if e, a := "namespace: invalid value 'foo', Details: namespace must be: bar", err.Error(); e != a {

+	if e, a := `namespace: Invalid value: "foo": namespace must be: bar`, err.Error(); e != a {

 		t.Fatalf("expected %v, got %v", e, a)

 	}

 }

@@ -10,6 +10,7 @@ import (

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

+	_ "github.com/openshift/origin/pkg/authorization/api/install"

 	clusterpolicyregistry "github.com/openshift/origin/pkg/authorization/registry/clusterpolicy"

 	roleregistry "github.com/openshift/origin/pkg/authorization/registry/role"

 	"github.com/openshift/origin/pkg/authorization/registry/test"

@@ -13,6 +13,7 @@ import (

 	"k8s.io/kubernetes/pkg/util/sets"

 	authorizationapi "github.com/openshift/origin/pkg/authorization/api"

+	_ "github.com/openshift/origin/pkg/authorization/api/install"

 	clusterpolicyregistry "github.com/openshift/origin/pkg/authorization/registry/clusterpolicy"

 	clusterpolicybindingregistry "github.com/openshift/origin/pkg/authorization/registry/clusterpolicybinding"

 	rolebindingregistry "github.com/openshift/origin/pkg/authorization/registry/rolebinding"

@@ -165,7 +165,7 @@ func TestBuildAdmission(t *testing.T) {

 type fakeObject struct{}

-func (*fakeObject) IsAnAPIObject() {}

+func (*fakeObject) GetObjectKind() unversioned.ObjectKind { return nil }

 func fakeUser() user.Info {

 	return &user.DefaultInfo{

@@ -8,6 +8,7 @@ import (

 	"k8s.io/kubernetes/pkg/conversion/queryparams"

 	newer "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	older "github.com/openshift/origin/pkg/build/api/v1"

 	testutil "github.com/openshift/origin/test/util/api"

 )

@@ -7,6 +7,7 @@ import (

 	kolder "k8s.io/kubernetes/pkg/api/v1beta3"

 	newer "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	older "github.com/openshift/origin/pkg/build/api/v1beta3"

 )

@@ -8,15 +8,17 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/resource"

+	"k8s.io/kubernetes/pkg/apimachinery/registered"

+	"k8s.io/kubernetes/pkg/runtime"

-	"github.com/openshift/origin/pkg/api/latest"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 )

 func TestCustomCreateBuildPod(t *testing.T) {

 	strategy := CustomBuildStrategy{

-		Codec: latest.Codec,

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

 	}

 	expectedBad := mockCustomBuild(false)

@@ -67,7 +69,7 @@ func TestCustomCreateBuildPod(t *testing.T) {

 	if len(actual.Spec.Volumes) != 3 {

 		t.Fatalf("Expected 3 volumes in Build pod, got %d", len(actual.Spec.Volumes))

 	}

-	buildJSON, _ := latest.Codec.Encode(expected)

+	buildJSON, _ := runtime.Encode(kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion), expected)

 	errorCases := map[int][]string{

 		0: {"BUILD", string(buildJSON)},

 	}

@@ -92,7 +94,7 @@ func TestCustomCreateBuildPod(t *testing.T) {

 func TestCustomCreateBuildPodExpectedForcePull(t *testing.T) {

 	strategy := CustomBuildStrategy{

-		Codec: latest.Codec,

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

 	}

 	expected := mockCustomBuild(true)

@@ -108,10 +110,10 @@ func TestCustomCreateBuildPodExpectedForcePull(t *testing.T) {

 func TestCustomCreateBuildPodWithCustomCodec(t *testing.T) {

 	strategy := CustomBuildStrategy{

-		Codec: latest.Codec,

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

 	}

-	for _, version := range latest.Versions {

+	for _, version := range registered.GroupOrDie(buildapi.GroupName).GroupVersions {

 		// Create new Build specification and modify Spec API version

 		build := mockCustomBuild(false)

 		build.Spec.Strategy.CustomStrategy.BuildAPIVersion = fmt.Sprintf("%s/%s", version.Group, version.Version)

@@ -6,16 +6,17 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/resource"

+	"k8s.io/kubernetes/pkg/runtime"

-	"github.com/openshift/origin/pkg/api/latest"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 )

 func TestDockerCreateBuildPod(t *testing.T) {

 	strategy := DockerBuildStrategy{

 		Image: "docker-test-image",

-		Codec: latest.Codec,

+		Codec: kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

 	}

 	expected := mockDockerBuild()

@@ -80,7 +81,7 @@ func TestDockerCreateBuildPod(t *testing.T) {

 		t.Fatalf("Found illegal environment variable 'ILLEGAL' defined on container")

 	}

-	buildJSON, _ := latest.Codec.Encode(expected)

+	buildJSON, _ := runtime.Encode(kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion), expected)

 	errorCases := map[int][]string{

 		0: {"BUILD", string(buildJSON)},

 	}

@@ -8,9 +8,10 @@ import (

 	"k8s.io/kubernetes/pkg/admission"

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/resource"

+	"k8s.io/kubernetes/pkg/runtime"

-	"github.com/openshift/origin/pkg/api/latest"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 )

@@ -47,7 +48,7 @@ func testSTICreateBuildPod(t *testing.T, rootAllowed bool) {

 	strategy := &SourceBuildStrategy{

 		Image:                "sti-test-image",

 		TempDirectoryCreator: &FakeTempDirCreator{},

-		Codec:                latest.Codec,

+		Codec:                kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion),

 		AdmissionControl:     &FakeAdmissionControl{admit: rootAllowed},

 	}

@@ -128,7 +129,7 @@ func testSTICreateBuildPod(t *testing.T, rootAllowed bool) {

 	if !foundAllowedUIDs && !rootAllowed {

 		t.Fatalf("Expected ALLLOWED_UIDS when root is not allowed")

 	}

-	buildJSON, _ := latest.Codec.Encode(expected)

+	buildJSON, _ := runtime.Encode(kapi.Codecs.LegacyCodec(buildapi.SchemeGroupVersion), expected)

 	errorCases := map[int][]string{

 		0: {"BUILD", string(buildJSON)},

 	}

@@ -13,6 +13,7 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	buildutil "github.com/openshift/origin/pkg/build/util"

 	"github.com/openshift/origin/pkg/client/testclient"

 )

@@ -105,7 +106,7 @@ func actionsAreEqual(a, b ktestclient.Action) bool {

 func TestStop(t *testing.T) {

 	notFound := func() runtime.Object {

-		return &(kerrors.NewNotFound("BuildConfig", "config").(*kerrors.StatusError).ErrStatus)

+		return &(kerrors.NewNotFound(buildapi.Resource("BuildConfig"), "config").(*kerrors.StatusError).ErrStatus)

 	}

 	tests := map[string]struct {

@@ -6,6 +6,7 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	"github.com/openshift/origin/pkg/build/generator"

 )

@@ -8,6 +8,7 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	buildapi "github.com/openshift/origin/pkg/build/api"

+	_ "github.com/openshift/origin/pkg/build/api/install"

 	"github.com/openshift/origin/pkg/build/generator"

 	mocks "github.com/openshift/origin/pkg/build/generator/test"

 	imageapi "github.com/openshift/origin/pkg/image/api"

@@ -11,7 +11,6 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/rest"

-	"k8s.io/kubernetes/pkg/api/unversioned"

 	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"

 	genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"

 	"k8s.io/kubernetes/pkg/runtime"

@@ -6,13 +6,14 @@ import (

 	"net/http"

 	"testing"

+	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/api/unversioned"

-	"k8s.io/kubernetes/pkg/apimachinery/registered"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	"k8s.io/kubernetes/pkg/runtime"

 	"github.com/openshift/origin/pkg/image/api"

+	_ "github.com/openshift/origin/pkg/image/api/install"

 )

 type roundTripFunc func(req *http.Request) (*http.Response, error)

@@ -27,26 +28,26 @@ func TestImageStreamImportUnsupported(t *testing.T) {

 		errFn  func(err error) bool

 	}{

 		{

-			status: errors.NewNotFound("", "").(errors.APIStatus).Status(),

+			status: errors.NewNotFound(api.Resource(""), "").(errors.APIStatus).Status(),

 			errFn:  func(err error) bool { return err == ErrImageStreamImportUnsupported },

 		},

 		{

-			status: errors.NewNotFound("Other", "").(errors.APIStatus).Status(),

+			status: errors.NewNotFound(api.Resource("ImageStreamImport"), "").(errors.APIStatus).Status(),

 			errFn:  func(err error) bool { return err != ErrImageStreamImportUnsupported && errors.IsNotFound(err) },

 		},

 		{

-			status: errors.NewConflict("Other", "", nil).(errors.APIStatus).Status(),

+			status: errors.NewConflict(api.Resource("ImageStreamImport"), "", nil).(errors.APIStatus).Status(),

 			errFn:  func(err error) bool { return err != ErrImageStreamImportUnsupported && errors.IsConflict(err) },

 		},

 		{

-			status: errors.NewForbidden("Any", "", nil).(errors.APIStatus).Status(),

+			status: errors.NewForbidden(api.Resource("ImageStreamImport"), "", nil).(errors.APIStatus).Status(),

 			errFn:  func(err error) bool { return err == ErrImageStreamImportUnsupported },

 		},

 	}

 	for i, test := range testCases {

 		c, err := New(&kclient.Config{

 			Transport: roundTripFunc(func(req *http.Request) (*http.Response, error) {

-				buf := bytes.NewBuffer([]byte(runtime.EncodeOrDie(registered.GroupOrDie(api.GroupName).Codec, &test.status)))

+				buf := bytes.NewBuffer([]byte(runtime.EncodeOrDie(kapi.Codecs.LegacyCodec(api.SchemeGroupVersion), &test.status)))

 				return &http.Response{StatusCode: http.StatusNotFound, Body: ioutil.NopCloser(buf)}, nil

 			}),

 		})

@@ -9,11 +9,12 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	_ "github.com/openshift/origin/pkg/deploy/api/install"

 )

 func TestNewClient(t *testing.T) {

-	o := testclient.NewObjects(kapi.Scheme, kapi.Scheme)

-	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.yaml", o, kapi.Scheme); err != nil {

+	o := testclient.NewObjects(kapi.Scheme, kapi.Codecs.UniversalDecoder())

+	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.yaml", o, kapi.Codecs.UniversalDecoder()); err != nil {

 		t.Fatal(err)

 	}

 	oc, _ := NewFixtureClients(o)

@@ -37,7 +38,7 @@ func TestNewClient(t *testing.T) {

 }

 func TestErrors(t *testing.T) {

-	o := testclient.NewObjects(kapi.Scheme, kapi.Scheme)

+	o := testclient.NewObjects(kapi.Scheme, kapi.Codecs.UniversalDecoder())

 	o.Add(&kapi.List{

 		Items: []runtime.Object{

 			&(errors.NewNotFound(deployapi.Resource("DeploymentConfigList"), "").(*errors.StatusError).ErrStatus),

@@ -12,6 +12,7 @@ import (

 	"github.com/openshift/origin/pkg/auth/ldaputil"

 	"github.com/openshift/origin/pkg/client/testclient"

 	userapi "github.com/openshift/origin/pkg/user/api"

+	_ "github.com/openshift/origin/pkg/user/api/install"

 )

 func TestListAllOpenShiftGroups(t *testing.T) {

@@ -12,15 +12,21 @@ import (

 	ktc "k8s.io/kubernetes/pkg/client/unversioned/testclient"

 	"k8s.io/kubernetes/pkg/runtime"

-	api "github.com/openshift/origin/pkg/api/latest"

 	tc "github.com/openshift/origin/pkg/client/testclient"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

 )

 func deploymentFor(config *deployapi.DeploymentConfig, status deployapi.DeploymentStatus) *kapi.ReplicationController {

-	d, _ := deployutil.MakeDeployment(config, kapi.Codec)

+	d, err := deployutil.MakeDeployment(config, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+	if err != nil {

+		panic(err)

+	}

 	d.Annotations[deployapi.DeploymentStatusAnnotation] = string(status)

 	return d

 }

@@ -235,7 +241,7 @@ func TestCmdDeploy_cancelOk(t *testing.T) {

 		config := deploytest.OkDeploymentConfig(scenario.version)

 		existingDeployments := &kapi.ReplicationControllerList{}

 		for _, e := range scenario.existing {

-			d, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(e.version), api.Codec)

+			d, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(e.version), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

 			d.Annotations[deployapi.DeploymentStatusAnnotation] = string(e.status)

 			existingDeployments.Items = append(existingDeployments.Items, *d)

 		}

@@ -77,7 +77,7 @@ func TestRollbackOptions_findTargetDeployment(t *testing.T) {

 		existingControllers := &kapi.ReplicationControllerList{}

 		for _, existing := range test.existing {

 			config := deploytest.OkDeploymentConfig(existing.version)

-			deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

+			deployment, _ := deployutil.MakeDeployment(config, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

 			deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(existing.status)

 			existingControllers.Items = append(existingControllers.Items, *deployment)

 		}

@@ -164,9 +164,9 @@ func TestChainDescriber(t *testing.T) {

 	}

 	for _, test := range tests {

-		o := ktestclient.NewObjects(kapi.Scheme, kapi.Scheme)

+		o := ktestclient.NewObjects(kapi.Scheme, kapi.Codecs.UniversalDecoder())

 		if len(test.path) > 0 {

-			if err := ktestclient.AddObjectsFromPath(test.path, o, kapi.Scheme); err != nil {

+			if err := ktestclient.AddObjectsFromPath(test.path, o, kapi.Codecs.UniversalDecoder()); err != nil {

 				t.Fatal(err)

 			}

 		}

@@ -24,6 +24,11 @@ import (

 	oauthapi "github.com/openshift/origin/pkg/oauth/api"

 	projectapi "github.com/openshift/origin/pkg/project/api"

 	sdnapi "github.com/openshift/origin/pkg/sdn/api"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"

 )

 type describeClient struct {

@@ -136,7 +141,7 @@ func TestDescribers(t *testing.T) {

 func TestDeploymentConfigDescriber(t *testing.T) {

 	config := deployapitest.OkDeploymentConfig(1)

-	deployment, _ := deployutil.MakeDeployment(config, kapi.Codec)

+	deployment, _ := deployutil.MakeDeployment(config, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

 	podList := &kapi.PodList{}

 	eventList := &kapi.EventList{}

 	deploymentList := &kapi.ReplicationControllerList{}

@@ -286,9 +286,9 @@ func TestProjectStatus(t *testing.T) {

 			}

 			return time.Now()

 		}

-		o := ktestclient.NewObjects(kapi.Scheme, kapi.Scheme)

+		o := ktestclient.NewObjects(kapi.Scheme, kapi.Codecs.UniversalDecoder())

 		if len(test.Path) > 0 {

-			if err := ktestclient.AddObjectsFromPath(test.Path, o, kapi.Scheme); err != nil {

+			if err := ktestclient.AddObjectsFromPath(test.Path, o, kapi.Codecs.UniversalDecoder()); err != nil {

 				t.Fatal(err)

 			}

 		}

@@ -21,6 +21,9 @@ var MissingCommands = sets.NewString(

 	"cluster-info", "api-versions",

 	"autoscale", // TODO

 	"stop",

+	"cordon",

+	"drain",

+	"uncordon",

 )

 // WhitelistedCommands is the list of commands we're never going to have in oc

@@ -12,6 +12,10 @@ import (

 	scalertest "github.com/openshift/origin/pkg/deploy/scaler/test"

 	"github.com/openshift/origin/pkg/deploy/strategy"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

 )

 func TestDeployer_getDeploymentFail(t *testing.T) {

@@ -190,7 +194,7 @@ func TestDeployer_deployScenarios(t *testing.T) {

 }

 func mkdeployment(version int, status deployapi.DeploymentStatus) *kapi.ReplicationController {

-	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(version), kapi.Codec)

+	deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(version), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

 	deployment.Annotations[deployapi.DeploymentStatusAnnotation] = string(status)

 	return deployment

 }

@@ -8,6 +8,10 @@ import (

 	"github.com/spf13/cobra"

 	"k8s.io/kubernetes/pkg/util/sets"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

 )

 func TestNodeConfigNonTLS(t *testing.T) {

@@ -22,7 +22,7 @@ var OldestVersion = unversioned.GroupVersion{Group: "", Version: "v1"}

 // may be assumed to be least feature rich to most feature rich, and clients may

 // choose to prefer the latter items in the list over the former items when presented

 // with a set of versions to choose.

-var Versions = []unversioned.GroupVersion{unversioned.GroupVersion{Group: "", Version: "v1"}}

+var Versions = []unversioned.GroupVersion{{Group: "", Version: "v1"}}

 var Codec = serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(unversioned.GroupVersion{Group: "", Version: "v1"})

@@ -1,14 +1,21 @@

-package v1

+package v1_test

 import (

 	"testing"

 	"github.com/ghodss/yaml"

+

 	"k8s.io/kubernetes/pkg/api/unversioned"

 	"k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/runtime/serializer"

 	"k8s.io/kubernetes/pkg/util"

 	internal "github.com/openshift/origin/pkg/cmd/server/api"

+	"github.com/openshift/origin/pkg/cmd/server/api/v1"

+

+	// install all APIs

+	_ "github.com/openshift/origin/pkg/api/install"

+	_ "k8s.io/kubernetes/pkg/api/install"

 )

 const (

@@ -367,10 +374,10 @@ type AdmissionPluginTestConfig struct {

 	Data string `json:"data"`

 }

-func (*AdmissionPluginTestConfig) IsAnAPIObject() {}

+func (obj *AdmissionPluginTestConfig) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }

 func TestMasterConfig(t *testing.T) {

-	internal.Scheme.AddKnownTypes(SchemeGroupVersion, &AdmissionPluginTestConfig{})

+	internal.Scheme.AddKnownTypes(v1.SchemeGroupVersion, &AdmissionPluginTestConfig{})

 	internal.Scheme.AddKnownTypes(internal.SchemeGroupVersion, &AdmissionPluginTestConfig{})

 	config := &internal.MasterConfig{

 		ServingInfo: internal.HTTPServingInfo{

@@ -382,7 +389,7 @@ func TestMasterConfig(t *testing.T) {

 			AdmissionConfig: internal.AdmissionConfig{

 				PluginConfig: map[string]internal.AdmissionPluginConfig{ // test config as an embedded object

 					"plugin": {

-						Configuration: runtime.EmbeddedObject{Object: &AdmissionPluginTestConfig{}},

+						Configuration: &AdmissionPluginTestConfig{},

 					},

 				},

 				PluginOrderOverride: []string{"plugin"}, // explicitly set this field because it's omitempty

@@ -391,17 +398,17 @@ func TestMasterConfig(t *testing.T) {

 		EtcdConfig: &internal.EtcdConfig{},

 		OAuthConfig: &internal.OAuthConfig{

 			IdentityProviders: []internal.IdentityProvider{

-				{Provider: runtime.EmbeddedObject{Object: &internal.BasicAuthPasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.AllowAllPasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.DenyAllPasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.HTPasswdPasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.LDAPPasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.RequestHeaderIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.KeystonePasswordIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.GitHubIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.GitLabIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.GoogleIdentityProvider{}}},

-				{Provider: runtime.EmbeddedObject{Object: &internal.OpenIDIdentityProvider{}}},

+				{Provider: &internal.BasicAuthPasswordIdentityProvider{}},

+				{Provider: &internal.AllowAllPasswordIdentityProvider{}},

+				{Provider: &internal.DenyAllPasswordIdentityProvider{}},

+				{Provider: &internal.HTPasswdPasswordIdentityProvider{}},

+				{Provider: &internal.LDAPPasswordIdentityProvider{}},

+				{Provider: &internal.RequestHeaderIdentityProvider{}},

+				{Provider: &internal.KeystonePasswordIdentityProvider{}},

+				{Provider: &internal.GitHubIdentityProvider{}},

+				{Provider: &internal.GitLabIdentityProvider{}},

+				{Provider: &internal.GoogleIdentityProvider{}},

+				{Provider: &internal.OpenIDIdentityProvider{}},

 			},

 			SessionConfig: &internal.SessionConfig{},

 			Templates:     &internal.OAuthTemplates{},

@@ -413,7 +420,7 @@ func TestMasterConfig(t *testing.T) {

 		AdmissionConfig: internal.AdmissionConfig{

 			PluginConfig: map[string]internal.AdmissionPluginConfig{ // test config as an embedded object

 				"plugin": {

-					Configuration: runtime.EmbeddedObject{Object: &AdmissionPluginTestConfig{}},

+					Configuration: &AdmissionPluginTestConfig{},

 				},

 			},

 			PluginOrderOverride: []string{"plugin"}, // explicitly set this field because the it's omitempty

@@ -430,7 +437,8 @@ func TestMasterConfig(t *testing.T) {

 }

 func writeYAML(obj runtime.Object) ([]byte, error) {

-	json, err := Codec.Encode(obj)

+

+	json, err := runtime.Encode(serializer.NewCodecFactory(internal.Scheme).LegacyCodec(v1.SchemeGroupVersion), obj)

 	if err != nil {

 		return nil, err

 	}

@@ -9,8 +9,8 @@ import (

 	"strings"

 	"time"

-	kapp "k8s.io/kubernetes/cmd/kube-apiserver/app"

-	cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"

+	apiserveroptions "k8s.io/kubernetes/cmd/kube-apiserver/app/options"

+	controlleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options"

 	kvalidation "k8s.io/kubernetes/pkg/api/validation"

 	"k8s.io/kubernetes/pkg/serviceaccount"

 	knet "k8s.io/kubernetes/pkg/util/net"

@@ -547,11 +547,11 @@ func ValidateRoutingConfig(config api.RoutingConfig, fldPath *field.Path) field.

 }

 func ValidateAPIServerExtendedArguments(config api.ExtendedArguments, fldPath *field.Path) field.ErrorList {

-	return ValidateExtendedArguments(config, kapp.NewAPIServer().AddFlags, fldPath)

+	return ValidateExtendedArguments(config, apiserveroptions.NewAPIServer().AddFlags, fldPath)

 }

 func ValidateControllerExtendedArguments(config api.ExtendedArguments, fldPath *field.Path) field.ErrorList {

-	return ValidateExtendedArguments(config, cmapp.NewCMServer().AddFlags, fldPath)

+	return ValidateExtendedArguments(config, controlleroptions.NewCMServer().AddFlags, fldPath)

 }

 func ValidateAdmissionPluginConfig(pluginConfig map[string]api.AdmissionPluginConfig, fieldPath *field.Path) field.ErrorList {

@@ -4,7 +4,6 @@ import (

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

-	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util"

 	"k8s.io/kubernetes/pkg/util/validation/field"

@@ -205,15 +204,11 @@ func TestValidateAdmissionPluginConfig(t *testing.T) {

 		Location: "/some/location",

 	}

 	configOnly := configapi.AdmissionPluginConfig{

-		Configuration: runtime.EmbeddedObject{

-			Object: &configapi.AdmissionPluginConfig{},

-		},

+		Configuration: &configapi.NodeConfig{},

 	}

 	locationAndConfig := configapi.AdmissionPluginConfig{

-		Location: "/some/location",

-		Configuration: runtime.EmbeddedObject{

-			Object: &configapi.AdmissionPluginConfig{},

-		},

+		Location:      "/some/location",

+		Configuration: &configapi.NodeConfig{},

 	}

 	bothEmpty := configapi.AdmissionPluginConfig{}

@@ -5,7 +5,7 @@ import (

 	"strings"

 	"time"

-	kapp "k8s.io/kubernetes/cmd/kubelet/app"

+	kubeletoptions "k8s.io/kubernetes/cmd/kubelet/app/options"

 	"k8s.io/kubernetes/pkg/util/validation/field"

 	"github.com/openshift/origin/pkg/cmd/server/api"

@@ -111,5 +111,5 @@ func ValidateDockerConfig(config api.DockerConfig, fldPath *field.Path) field.Er

 }

 func ValidateKubeletExtendedArguments(config api.ExtendedArguments, fldPath *field.Path) field.ErrorList {

-	return ValidateExtendedArguments(config, kapp.NewKubeletServer().AddFlags, fldPath)

+	return ValidateExtendedArguments(config, kubeletoptions.NewKubeletServer().AddFlags, fldPath)

 }

@@ -45,7 +45,7 @@ func TestValidateServingInfo(t *testing.T) {

 					CertFile: certFileName,

 				},

 			},

-			ExpectedErrors: []string{"keyFile: required"},

+			ExpectedErrors: []string{"keyFile: Required value"},

 		},

 		"namedCertificates valid": {

@@ -68,7 +68,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{"example.com"}, CertInfo: api.CertInfo{CertFile: certFileName, KeyFile: keyFileName}},

 				},

 			},

-			ExpectedErrors: []string{"namedCertificates: invalid"},

+			ExpectedErrors: []string{"namedCertificates: Invalid value"},

 		},

 		"namedCertificates with missing names": {

@@ -80,7 +80,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{ /*"example.com"*/ }, CertInfo: api.CertInfo{CertFile: certFileName, KeyFile: keyFileName}},

 				},

 			},

-			ExpectedErrors: []string{"namedCertificates[0].names: required"},

+			ExpectedErrors: []string{"namedCertificates[0].names: Required value"},

 		},

 		"namedCertificates with missing key": {

 			ServingInfo: api.ServingInfo{

@@ -91,7 +91,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{"example.com"}, CertInfo: api.CertInfo{CertFile: certFileName /*, KeyFile: keyFileName*/}},

 				},

 			},

-			ExpectedErrors: []string{"namedCertificates[0].keyFile: required"},

+			ExpectedErrors: []string{"namedCertificates[0].keyFile: Required value"},

 		},

 		"namedCertificates with duplicate names": {

 			ServingInfo: api.ServingInfo{

@@ -103,7 +103,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{"example.com"}, CertInfo: api.CertInfo{CertFile: certFileName, KeyFile: keyFileName}},

 				},

 			},

-			ExpectedErrors: []string{"namedCertificates[1].names[0]: invalid"},

+			ExpectedErrors: []string{"namedCertificates[1].names[0]: Invalid value"},

 		},

 		"namedCertificates with empty name": {

 			ServingInfo: api.ServingInfo{

@@ -114,7 +114,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{""}, CertInfo: api.CertInfo{CertFile: certFileName, KeyFile: keyFileName}},

 				},

 			},

-			ExpectedErrors: []string{"namedCertificates[0].names[0]: required"},

+			ExpectedErrors: []string{"namedCertificates[0].names[0]: Required value"},

 		},

 		"namedCertificates with unmatched DNS name": {

@@ -126,7 +126,7 @@ func TestValidateServingInfo(t *testing.T) {

 					{Names: []string{"badexample.com"}, CertInfo: api.CertInfo{CertFile: certFileName, KeyFile: keyFileName}},

 				},

 			},

-			ExpectedWarnings: []string{"namedCertificates[0].names[0]: invalid"},

+			ExpectedWarnings: []string{"namedCertificates[0].names[0]: Invalid value"},

 		},

 		"namedCertificates with non-DNS names": {

 			ServingInfo: api.ServingInfo{

@@ -138,7 +138,7 @@ func TestValidateServingInfo(t *testing.T) {

 				},

 			},

 			ExpectedErrors: []string{

-				"namedCertificates[0].names[0]: invalid value 'foo bar.com', Details: must be a valid DNS name",

+				`namedCertificates[0].names[0]: Invalid value: "foo bar.com": must be a valid DNS name`,

 			},

 		},

 	}

@@ -9,6 +9,7 @@ import (

 	"github.com/ghodss/yaml"

 	"k8s.io/kubernetes/pkg/api"

+	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util"

 	"github.com/openshift/origin/pkg/api/v1"

@@ -1,7 +1,7 @@

 package bootstrappolicy

 import (

-	"k8s.io/kubernetes/pkg/controller/serviceaccount"

+	"k8s.io/kubernetes/pkg/serviceaccount"

 	"reflect"

 	"testing"

 )

@@ -4,7 +4,7 @@ import (

 	"reflect"

 	"testing"

-	"k8s.io/kubernetes/pkg/master"

+	"k8s.io/kubernetes/pkg/genericapiserver"

 	configapi "github.com/openshift/origin/pkg/cmd/server/api"

 )

@@ -12,27 +12,27 @@ import (

 func TestGetAPIGroupVersionOverrides(t *testing.T) {

 	testcases := map[string]struct {

 		DisabledVersions  map[string][]string

-		ExpectedOverrides map[string]master.APIGroupVersionOverride

+		ExpectedOverrides map[string]genericapiserver.APIGroupVersionOverride

 	}{

 		"empty": {

 			DisabledVersions:  nil,

-			ExpectedOverrides: map[string]master.APIGroupVersionOverride{},

+			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{},

 		},

 		"* -> v1": {

 			DisabledVersions:  map[string][]string{"": {"*"}},

-			ExpectedOverrides: map[string]master.APIGroupVersionOverride{"api/v1": {Disable: true}},

+			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"api/v1": {Disable: true}},

 		},

 		"v1": {

 			DisabledVersions:  map[string][]string{"": {"v1"}},

-			ExpectedOverrides: map[string]master.APIGroupVersionOverride{"api/v1": {Disable: true}},

+			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"api/v1": {Disable: true}},

 		},

 		"* -> v1beta1": {

 			DisabledVersions:  map[string][]string{"extensions": {"*"}},

-			ExpectedOverrides: map[string]master.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

+			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

 		},

 		"extensions/v1beta1": {

 			DisabledVersions:  map[string][]string{"extensions": {"v1beta1"}},

-			ExpectedOverrides: map[string]master.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

+			ExpectedOverrides: map[string]genericapiserver.APIGroupVersionOverride{"extensions/v1beta1": {Disable: true}},

 		},

 	}