@@ -8,9 +8,9 @@ items:

     labels:

       app: mysql

     name: mysql

-    namespace: default

+    namespace: example

     resourceVersion: "6790"

-    selfLink: /apis/apps/v1alpha1/namespaces/default/petsets/mysql

+    selfLink: /apis/apps/v1alpha1/namespaces/example/petsets/mysql

     uid: 3900c985-4f5b-11e6-b8a1-080027242396

   spec:

     replicas: 3

@@ -99,9 +99,9 @@ items:

     labels:

       app: mysql

     name: galera

-    namespace: default

+    namespace: example

     resourceVersion: "343"

-    selfLink: /api/v1/namespaces/default/services/galera

+    selfLink: /api/v1/namespaces/example/services/galera

     uid: 38fb3915-4f5b-11e6-b8a1-080027242396

   spec:

     clusterIP: None

@@ -121,7 +121,7 @@ items:

   metadata:

     annotations:

       kubernetes.io/created-by: |

-        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"default","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6784"}}

+        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"example","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6784"}}

       openshift.io/scc: anyuid

       pod.alpha.kubernetes.io/init-container-statuses: '[{"name":"install","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:12Z","finishedAt":"2016-07-27T02:41:12Z","containerID":"docker://5c727d8732899605fcfe3eecbeeb02576f18f5b989496073340427a8d2134622"}},"lastState":{},"ready":true,"restartCount":0,"image":"gcr.io/google_containers/galera-install:0.1","imageID":"docker://sha256:56ef857005d0ce479f2db0e4ee0ece05e0766ebfa7e79e27e1513915262a18ec","containerID":"docker://5c727d8732899605fcfe3eecbeeb02576f18f5b989496073340427a8d2134622"},{"name":"bootstrap","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:14Z","finishedAt":"2016-07-27T02:41:15Z","containerID":"docker://ab4ca0b3b6ec4860cd55c615534e1e2b11f4c3a33746783aab145919feb2446e"}},"lastState":{},"ready":true,"restartCount":0,"image":"debian:jessie","imageID":"docker://sha256:1b088884749bd93867ddb48ff404d4bbff09a17af8d95bc863efa5d133f87b78","containerID":"docker://ab4ca0b3b6ec4860cd55c615534e1e2b11f4c3a33746783aab145919feb2446e"}]'

       pod.alpha.kubernetes.io/init-containers: '[{"name":"install","image":"gcr.io/google_containers/galera-install:0.1","args":["--work-dir=/work-dir"],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always"},{"name":"bootstrap","image":"debian:jessie","command":["/work-dir/peer-finder"],"args":["-on-start=\"/work-dir/on-start.sh\"","-service=galera"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"apiVersion":"v1","fieldPath":"metadata.namespace"}}}],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent"}]'

@@ -133,9 +133,9 @@ items:

     labels:

       app: mysql

     name: mysql-0

-    namespace: default

+    namespace: example

     resourceVersion: "7191"

-    selfLink: /api/v1/namespaces/default/pods/mysql-0

+    selfLink: /api/v1/namespaces/example/pods/mysql-0

     uid: 92e49e79-53a3-11e6-b45a-080027242396

   spec:

     containers:

@@ -244,7 +244,7 @@ items:

   metadata:

     annotations:

       kubernetes.io/created-by: |

-        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"default","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6790"}}

+        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"example","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6790"}}

       openshift.io/scc: anyuid

       pod.alpha.kubernetes.io/init-container-statuses: '[{"name":"install","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:42Z","finishedAt":"2016-07-27T02:41:42Z","containerID":"docker://2538c65f65557955c02745ef4021181cf322c8dc0db62144dd1e1f8ea9f7fa54"}},"lastState":{},"ready":true,"restartCount":0,"image":"gcr.io/google_containers/galera-install:0.1","imageID":"docker://sha256:56ef857005d0ce479f2db0e4ee0ece05e0766ebfa7e79e27e1513915262a18ec","containerID":"docker://2538c65f65557955c02745ef4021181cf322c8dc0db62144dd1e1f8ea9f7fa54"},{"name":"bootstrap","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T02:41:44Z","finishedAt":"2016-07-27T02:41:45Z","containerID":"docker://4df7188d37033c182e675d45179941766bd1e6a013469038f43fa3fecc2cc06d"}},"lastState":{},"ready":true,"restartCount":0,"image":"debian:jessie","imageID":"docker://sha256:1b088884749bd93867ddb48ff404d4bbff09a17af8d95bc863efa5d133f87b78","containerID":"docker://4df7188d37033c182e675d45179941766bd1e6a013469038f43fa3fecc2cc06d"}]'

       pod.alpha.kubernetes.io/init-containers: '[{"name":"install","image":"gcr.io/google_containers/galera-install:0.1","args":["--work-dir=/work-dir"],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always"},{"name":"bootstrap","image":"debian:jessie","command":["/work-dir/peer-finder"],"args":["-on-start=\"/work-dir/on-start.sh\"","-service=galera"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"apiVersion":"v1","fieldPath":"metadata.namespace"}}}],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent"}]'

@@ -256,9 +256,9 @@ items:

     labels:

       app: mysql

     name: mysql-1

-    namespace: default

+    namespace: example

     resourceVersion: "7195"

-    selfLink: /api/v1/namespaces/default/pods/mysql-1

+    selfLink: /api/v1/namespaces/example/pods/mysql-1

     uid: a4da4725-53a3-11e6-b45a-080027242396

   spec:

     containers:

@@ -373,7 +373,7 @@ items:

   metadata:

     annotations:

       kubernetes.io/created-by: |

-        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"default","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6790"}}

+        {"kind":"SerializedReference","apiVersion":"v1","reference":{"kind":"PetSet","namespace":"example","name":"mysql","uid":"3900c985-4f5b-11e6-b8a1-080027242396","apiVersion":"apps","resourceVersion":"6790"}}

       openshift.io/scc: anyuid

       pod.alpha.kubernetes.io/init-container-statuses: '[{"name":"install","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T03:01:01Z","finishedAt":"2016-07-27T03:01:01Z","containerID":"docker://af008b4ce59d36695fbabf40ae2f7431b51441eb2e9c6962378937c06ac69a35"}},"lastState":{},"ready":true,"restartCount":0,"image":"gcr.io/google_containers/galera-install:0.1","imageID":"docker://sha256:56ef857005d0ce479f2db0e4ee0ece05e0766ebfa7e79e27e1513915262a18ec","containerID":"docker://af008b4ce59d36695fbabf40ae2f7431b51441eb2e9c6962378937c06ac69a35"},{"name":"bootstrap","state":{"terminated":{"exitCode":0,"reason":"Completed","startedAt":"2016-07-27T03:01:02Z","finishedAt":"2016-07-27T03:01:03Z","containerID":"docker://ee97005854130335b54a65429865956260b7729e51e6363ab05e63d5c7c9ee48"}},"lastState":{},"ready":true,"restartCount":0,"image":"debian:jessie","imageID":"docker://sha256:1b088884749bd93867ddb48ff404d4bbff09a17af8d95bc863efa5d133f87b78","containerID":"docker://ee97005854130335b54a65429865956260b7729e51e6363ab05e63d5c7c9ee48"}]'

       pod.alpha.kubernetes.io/init-containers: '[{"name":"install","image":"gcr.io/google_containers/galera-install:0.1","args":["--work-dir=/work-dir"],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"Always"},{"name":"bootstrap","image":"debian:jessie","command":["/work-dir/peer-finder"],"args":["-on-start=\"/work-dir/on-start.sh\"","-service=galera"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"apiVersion":"v1","fieldPath":"metadata.namespace"}}}],"resources":{},"volumeMounts":[{"name":"workdir","mountPath":"/work-dir"},{"name":"config","mountPath":"/etc/mysql"},{"name":"default-token-au2xq","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent"}]'

@@ -385,9 +385,9 @@ items:

     labels:

       app: mysql

     name: mysql-2

-    namespace: default

+    namespace: example

     resourceVersion: "7226"

-    selfLink: /api/v1/namespaces/default/pods/mysql-2

+    selfLink: /api/v1/namespaces/example/pods/mysql-2

     uid: 57e618f1-53a6-11e6-b215-080027242396

   spec:

     containers:

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

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

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

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

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

+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

 	"k8s.io/kubernetes/pkg/serviceaccount"

 	"github.com/openshift/origin/pkg/bootstrap/docker/errors"

@@ -31,8 +31,8 @@ const (

 )

 // InstallRegistry checks whether a registry is installed and installs one if not already installed

-func (h *Helper) InstallRegistry(kubeClient kclient.Interface, f *clientcmd.Factory, configDir, images string, out, errout io.Writer) error {

-	_, err := kubeClient.Services(DefaultNamespace).Get(SvcDockerRegistry)

+func (h *Helper) InstallRegistry(kubeClient kclientset.Interface, f *clientcmd.Factory, configDir, images string, out, errout io.Writer) error {

+	_, err := kubeClient.Core().Services(DefaultNamespace).Get(SvcDockerRegistry)

 	if err == nil {

 		// If there's no error, the registry already exists

 		return nil

@@ -69,8 +69,8 @@ func (h *Helper) InstallRegistry(kubeClient kclient.Interface, f *clientcmd.Fact

 }

 // InstallRouter installs a default router on the OpenShift server

-func (h *Helper) InstallRouter(kubeClient kclient.Interface, f *clientcmd.Factory, configDir, images, hostIP string, portForwarding bool, out, errout io.Writer) error {

-	_, err := kubeClient.Services(DefaultNamespace).Get(SvcRouter)

+func (h *Helper) InstallRouter(kubeClient kclientset.Interface, f *clientcmd.Factory, configDir, images, hostIP string, portForwarding bool, out, errout io.Writer) error {

+	_, err := kubeClient.Core().Services(DefaultNamespace).Get(SvcRouter)

 	if err == nil {

 		// Router service already exists, nothing to do

 		return nil

@@ -84,18 +84,18 @@ func (h *Helper) InstallRouter(kubeClient kclient.Interface, f *clientcmd.Factor

 	// Create service account for router

 	routerSA := &kapi.ServiceAccount{}

 	routerSA.Name = "router"

-	_, err = kubeClient.ServiceAccounts("default").Create(routerSA)

+	_, err = kubeClient.Core().ServiceAccounts("default").Create(routerSA)

 	if err != nil {

 		return errors.NewError("cannot create router service account").WithCause(err).WithDetails(h.OriginLog())

 	}

 	// Add router SA to privileged SCC

-	privilegedSCC, err := kubeClient.SecurityContextConstraints().Get("privileged")

+	privilegedSCC, err := kubeClient.Core().SecurityContextConstraints().Get("privileged")

 	if err != nil {

 		return errors.NewError("cannot retrieve privileged SCC").WithCause(err).WithDetails(h.OriginLog())

 	}

 	privilegedSCC.Users = append(privilegedSCC.Users, serviceaccount.MakeUsername("default", "router"))

-	_, err = kubeClient.SecurityContextConstraints().Update(privilegedSCC)

+	_, err = kubeClient.Core().SecurityContextConstraints().Update(privilegedSCC)

 	if err != nil {

 		return errors.NewError("cannot update privileged SCC").WithCause(err).WithDetails(h.OriginLog())

 	}

@@ -186,10 +186,10 @@ func AddRoleToServiceAccount(osClient client.Interface, role, sa, namespace stri

 	return addRole.AddRole()

 }

-func AddSCCToServiceAccount(kubeClient kclient.Interface, scc, sa, namespace string) error {

+func AddSCCToServiceAccount(kubeClient kclientset.Interface, scc, sa, namespace string) error {

 	modifySCC := policy.SCCModificationOptions{

 		SCCName:      scc,

-		SCCInterface: kubeClient,

+		SCCInterface: kubeClient.Core(),

 		Subjects: []kapi.ObjectReference{

 			{

 				Namespace: namespace,

@@ -51,12 +51,12 @@ func instantiateTemplate(client client.Interface, mapper configcmd.Mapper, templ

 // InstallLogging checks whether logging is installed and installs it if not already installed

 func (h *Helper) InstallLogging(f *clientcmd.Factory, publicHostname, loggerHost, imagePrefix, imageVersion string) error {

-	osClient, kubeClient, err := f.Clients()

+	osClient, _, kubeClient, err := f.Clients()

 	if err != nil {

 		return errors.NewError("cannot obtain API clients").WithCause(err).WithDetails(h.OriginLog())

 	}

-	_, err = kubeClient.Namespaces().Get(loggingNamespace)

+	_, err = kubeClient.Core().Namespaces().Get(loggingNamespace)

 	if err == nil {

 		// If there's no error, the logging namespace already exists and we won't initialize it

 		return nil

@@ -91,7 +91,7 @@ func (h *Helper) InstallLogging(f *clientcmd.Factory, publicHostname, loggerHost

 	}

 	// Label all nodes with default fluentd label

-	nodeList, err := kubeClient.Nodes().List(kapi.ListOptions{})

+	nodeList, err := kubeClient.Core().Nodes().List(kapi.ListOptions{})

 	if err != nil {

 		return errors.NewError("cannot retrieve nodes").WithCause(err).WithDetails(h.OriginLog())

 	}

@@ -99,7 +99,7 @@ func (h *Helper) InstallLogging(f *clientcmd.Factory, publicHostname, loggerHost

 	// Iterate through all nodes (there should only be one)

 	for _, node := range nodeList.Items {

 		node.Labels["logging-infra-fluentd"] = "true"

-		if _, err = kubeClient.Nodes().Update(&node); err != nil {

+		if _, err = kubeClient.Core().Nodes().Update(&node); err != nil {

 			return errors.NewError("cannot update labels on node %s", node.Name).WithCause(err)

 		}

 	}

@@ -113,7 +113,7 @@ func (h *Helper) InstallLogging(f *clientcmd.Factory, publicHostname, loggerHost

 		"es-cluster-size":   "1",

 		"es-instance-ram":   "1024M",

 	}

-	kubeClient.ConfigMaps(loggingNamespace).Create(loggingConfig)

+	kubeClient.Core().ConfigMaps(loggingNamespace).Create(loggingConfig)

 	// Instantiate logging deployer

 	deployerParams := map[string]string{

@@ -20,7 +20,7 @@ const (

 // InstallMetrics checks whether metrics is installed and installs it if not already installed

 func (h *Helper) InstallMetrics(f *clientcmd.Factory, hostName, imagePrefix, imageVersion string) error {

-	osClient, kubeClient, err := f.Clients()

+	osClient, kubeClient, _, err := f.Clients()

 	if err != nil {

 		return errors.NewError("cannot obtain API clients").WithCause(err).WithDetails(h.OriginLog())

 	}

@@ -14,7 +14,7 @@ import (

 // CreateProject creates a project

 func CreateProject(f *clientcmd.Factory, name, display, desc, basecmd string, out io.Writer) error {

-	client, _, err := f.Clients()

+	client, _, _, err := f.Clients()

 	if err != nil {

 		return nil

 	}

@@ -98,7 +98,7 @@ func (c *ClientStatusConfig) Status(f *clientcmd.Factory, out io.Writer) error {

 }

 func isHealthy(f *clientcmd.Factory) (bool, error) {

-	osClient, _, err := f.Clients()

+	osClient, _, _, err := f.Clients()

 	if err != nil {

 		return false, err

 	}

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

 	"github.com/spf13/cobra"

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

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

+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

@@ -795,12 +795,16 @@ func (c *ClientStartConfig) Factory() (*clientcmd.Factory, error) {

 }

 // Clients returns clients for OpenShift and Kube

-func (c *ClientStartConfig) Clients() (*client.Client, *kclient.Client, error) {

+func (c *ClientStartConfig) Clients() (*client.Client, *kclientset.Clientset, error) {

 	f, err := c.Factory()

 	if err != nil {

 		return nil, nil, err

 	}

-	return f.Clients()

+	oc, _, kcset, err := f.Clients()

+	if err != nil {

+		return nil, nil, err

+	}

+	return oc, kcset, nil

 }

 // OpenShiftHelper returns a helper object to work with OpenShift on the server

@@ -943,7 +947,7 @@ func (c *ClientStartConfig) ShouldInitializeData() bool {

 			return true

 		}

-		if _, err = kclient.Services(openshift.DefaultNamespace).Get(openshift.SvcDockerRegistry); err != nil {

+		if _, err = kclient.Core().Services(openshift.DefaultNamespace).Get(openshift.SvcDockerRegistry); err != nil {

 			return true

 		}

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

 	"github.com/golang/glog"

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

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

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

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

 	"k8s.io/kubernetes/pkg/kubectl"

 	ktypes "k8s.io/kubernetes/pkg/types"

 	kutilerrors "k8s.io/kubernetes/pkg/util/errors"

@@ -84,7 +84,7 @@ func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Durat

 	if len(bcBuilds) > 0 {

 		// Add paused annotation to the build config pending the deletion

-		err = unversioned.RetryOnConflict(unversioned.DefaultRetry, func() error {

+		err = kclient.RetryOnConflict(kclient.DefaultRetry, func() error {

 			bc, err := reaper.oc.BuildConfigs(namespace).Get(name)

 			if err != nil {

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

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

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

 	"k8s.io/kubernetes/pkg/client/cache"

+	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"

 	"k8s.io/kubernetes/pkg/client/record"

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

 	builddefaults "github.com/openshift/origin/pkg/build/admission/defaults"

 	buildoverrides "github.com/openshift/origin/pkg/build/admission/overrides"

@@ -269,7 +269,7 @@ func (bc *BuildController) resolveOutputDockerImageReference(build *buildapi.Bui

 type BuildPodController struct {

 	BuildStore   cache.Store

 	BuildUpdater buildclient.BuildUpdater

-	SecretClient kclient.SecretsNamespacer

+	SecretClient kcoreclient.SecretsGetter

 	PodManager   podManager

 }

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

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

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

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

+	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"

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

 	buildtest "github.com/openshift/origin/pkg/build/controller/test"

@@ -305,7 +305,8 @@ func mockBuildConfig(baseImage, triggerImage, repoName, repoTag string) *buildap

 	dockerfile := "FROM foo"

 	return &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: "testBuildCfg",

+			Name:      "testBuildCfg",

+			Namespace: kapi.NamespaceDefault,

 		},

 		Spec: buildapi.BuildConfigSpec{

 			CommonSpec: buildapi.CommonSpec{

@@ -346,7 +347,8 @@ func mockImageStream(repoName, dockerImageRepo string, tags map[string]string) *

 	return &imageapi.ImageStream{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: repoName,

+			Name:      repoName,

+			Namespace: kapi.NamespaceDefault,

 		},

 		Status: imageapi.ImageStreamStatus{

 			DockerImageRepository: dockerImageRepo,

@@ -379,14 +381,14 @@ func (i *buildConfigInstantiator) Instantiate(namespace string, request *buildap

 func mockBuildConfigInstantiator(buildcfg *buildapi.BuildConfig, imageStream *imageapi.ImageStream, image *imageapi.Image) *buildConfigInstantiator {

 	builderAccount := kapi.ServiceAccount{

-		ObjectMeta: kapi.ObjectMeta{Name: bootstrappolicy.BuilderServiceAccountName},

+		ObjectMeta: kapi.ObjectMeta{Name: bootstrappolicy.BuilderServiceAccountName, Namespace: kapi.NamespaceDefault},

 		Secrets:    []kapi.ObjectReference{},

 	}

 	instantiator := &buildConfigInstantiator{}

 	instantiator.buildConfigUpdater = &mockBuildConfigUpdater{}

 	generator := buildgenerator.BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(),

-		ServiceAccounts: testclient.NewSimpleFake(&builderAccount),

+		Secrets:         fake.NewSimpleClientset().Core(),

+		ServiceAccounts: fake.NewSimpleClientset(&builderAccount).Core(),

 		Client: buildgenerator.Client{

 			GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

 				return buildcfg, nil

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

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

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

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

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

+	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"

 	"k8s.io/kubernetes/pkg/credentialprovider"

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

@@ -47,8 +47,8 @@ func IsFatal(err error) bool {

 type BuildGenerator struct {

 	Client                    GeneratorClient

 	DefaultServiceAccountName string

-	ServiceAccounts           kclient.ServiceAccountsNamespacer

-	Secrets                   kclient.SecretsNamespacer

+	ServiceAccounts           kcoreclient.ServiceAccountsGetter

+	Secrets                   kcoreclient.SecretsGetter

 }

 // GeneratorClient is the API client used by the generator

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

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

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

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

-

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

+	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"

 	"k8s.io/kubernetes/pkg/runtime"

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

@@ -239,7 +238,7 @@ func TestInstantiateGenerateBuildError(t *testing.T) {

 		fakeSecrets = append(fakeSecrets, s)

 	}

 	generator := BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: Client{

 			GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

@@ -339,6 +338,7 @@ func TestInstantiateWithImageTrigger(t *testing.T) {

 	source := mocks.MockSource()

 	for _, tc := range tests {

 		bc := &buildapi.BuildConfig{

+			ObjectMeta: kapi.ObjectMeta{Namespace: kapi.NamespaceDefault},

 			Spec: buildapi.BuildConfigSpec{

 				CommonSpec: buildapi.CommonSpec{

 					Strategy: buildapi.BuildStrategy{

@@ -741,7 +741,7 @@ func TestGenerateBuildFromConfig(t *testing.T) {

 	bc := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

 			Name:      "test-build-config",

-			Namespace: "test-namespace",

+			Namespace: kapi.NamespaceDefault,

 			Labels:    map[string]string{"testlabel": "testvalue"},

 		},

 		Spec: buildapi.BuildConfigSpec{

@@ -829,7 +829,8 @@ func TestGenerateBuildWithImageTagForSourceStrategyImageRepository(t *testing.T)

 	output := mocks.MockOutput()

 	bc := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: "test-build-config",

+			Name:      "test-build-config",

+			Namespace: kapi.NamespaceDefault,

 		},

 		Spec: buildapi.BuildConfigSpec{

 			CommonSpec: buildapi.CommonSpec{

@@ -849,7 +850,7 @@ func TestGenerateBuildWithImageTagForSourceStrategyImageRepository(t *testing.T)

 		fakeSecrets = append(fakeSecrets, s)

 	}

 	generator := BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: Client{

 			GetImageStreamFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) {

@@ -907,7 +908,8 @@ func TestGenerateBuildWithImageTagForDockerStrategyImageRepository(t *testing.T)

 	output := mocks.MockOutput()

 	bc := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: "test-build-config",

+			Name:      "test-build-config",

+			Namespace: kapi.NamespaceDefault,

 		},

 		Spec: buildapi.BuildConfigSpec{

 			CommonSpec: buildapi.CommonSpec{

@@ -927,7 +929,7 @@ func TestGenerateBuildWithImageTagForDockerStrategyImageRepository(t *testing.T)

 		fakeSecrets = append(fakeSecrets, s)

 	}

 	generator := BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: Client{

 			GetImageStreamFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) {

@@ -984,7 +986,8 @@ func TestGenerateBuildWithImageTagForCustomStrategyImageRepository(t *testing.T)

 	output := mocks.MockOutput()

 	bc := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: "test-build-config",

+			Name:      "test-build-config",

+			Namespace: kapi.NamespaceDefault,

 		},

 		Spec: buildapi.BuildConfigSpec{

 			CommonSpec: buildapi.CommonSpec{

@@ -1004,7 +1007,7 @@ func TestGenerateBuildWithImageTagForCustomStrategyImageRepository(t *testing.T)

 		fakeSecrets = append(fakeSecrets, s)

 	}

 	generator := BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: Client{

 			GetImageStreamFunc: func(ctx kapi.Context, name string) (*imageapi.ImageStream, error) {

@@ -1562,7 +1565,7 @@ func mockBuildGenerator() *BuildGenerator {

 	}

 	var b *buildapi.Build

 	return &BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: Client{

 			GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

@@ -3,13 +3,13 @@ package test

 import (

 	"fmt"

-	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

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

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

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

+	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"

+	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"

 	"k8s.io/kubernetes/pkg/runtime"

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

+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"

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

 )

@@ -32,41 +32,48 @@ var (

 	}

 )

-func MockBuilderSecrets() (secrets []*kapi.Secret) {

-	i := 1

+func MockBuilderSecrets() []*kapi.Secret {

+	var secrets []*kapi.Secret

 	for name, conf := range SampleDockerConfigs {

 		secrets = append(secrets, &kapi.Secret{

 			ObjectMeta: kapi.ObjectMeta{

-				Name: name,

+				Name:      name,

+				Namespace: kapi.NamespaceDefault,

 			},

 			Type: kapi.SecretTypeDockercfg,

 			Data: map[string][]byte{".dockercfg": conf},

 		})

-		i++

 	}

 	return secrets

 }

-func MockBuilderServiceAccount(secrets []*kapi.Secret) kclient.ServiceAccountsNamespacer {

+func MockBuilderServiceAccount(secrets []*kapi.Secret) kcoreclient.ServiceAccountsGetter {

 	var (

 		secretRefs  []kapi.ObjectReference

 		fakeObjects []runtime.Object

 	)

 	for _, secret := range secrets {

-		secretRefs = append(secretRefs, kapi.ObjectReference{Name: secret.Name, Kind: "Secret"})

+		secretRefs = append(secretRefs, kapi.ObjectReference{

+			Name: secret.Name,

+			Kind: "Secret",

+		})

 		fakeObjects = append(fakeObjects, secret)

 	}

 	fakeObjects = append(fakeObjects, &kapi.ServiceAccount{

-		ObjectMeta: kapi.ObjectMeta{Name: bootstrappolicy.BuilderServiceAccountName},

-		Secrets:    secretRefs,

+		ObjectMeta: kapi.ObjectMeta{

+			Name:      bootstrappolicy.BuilderServiceAccountName,

+			Namespace: kapi.NamespaceDefault,

+		},

+		Secrets: secretRefs,

 	})

-	return testclient.NewSimpleFake(fakeObjects...)

+	return fake.NewSimpleClientset(fakeObjects...).Core()

 }

 func MockBuildConfig(source buildapi.BuildSource, strategy buildapi.BuildStrategy, output buildapi.BuildOutput) *buildapi.BuildConfig {

 	return &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

-			Name: "test-build-config",

+			Name:      "test-build-config",

+			Namespace: kapi.NamespaceDefault,

 			Labels: map[string]string{

 				"testbclabel": "testbcvalue",

 			},

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

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

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

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

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

+	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"

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

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

 	kubeletremotecommand "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"

@@ -61,7 +61,7 @@ func (s *InstantiateREST) Create(ctx kapi.Context, obj runtime.Object) (runtime.

 	return s.generator.Instantiate(ctx, request)

 }

-func NewBinaryStorage(generator *generator.BuildGenerator, watcher rest.Watcher, podClient unversioned.PodsNamespacer, info kubeletclient.ConnectionInfoGetter) *BinaryInstantiateREST {

+func NewBinaryStorage(generator *generator.BuildGenerator, watcher rest.Watcher, podClient kcoreclient.PodsGetter, info kubeletclient.ConnectionInfoGetter) *BinaryInstantiateREST {

 	return &BinaryInstantiateREST{

 		Generator:      generator,

 		Watcher:        watcher,

@@ -230,7 +230,7 @@ func (h *binaryInstantiateHandler) handle(r io.Reader) (runtime.Object, error) {

 }

 type podGetter struct {

-	podsNamespacer unversioned.PodsNamespacer

+	podsNamespacer kcoreclient.PodsGetter

 }

 func (g *podGetter) Get(ctx kapi.Context, name string) (runtime.Object, error) {

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

 	"testing"

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

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

+	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"

 	"k8s.io/kubernetes/pkg/runtime"

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

@@ -22,7 +22,7 @@ func TestCreateInstantiate(t *testing.T) {

 		fakeSecrets = append(fakeSecrets, s)

 	}

 	rest := InstantiateREST{&generator.BuildGenerator{

-		Secrets:         testclient.NewSimpleFake(fakeSecrets...),

+		Secrets:         fake.NewSimpleClientset(fakeSecrets...).Core(),

 		ServiceAccounts: mocks.MockBuilderServiceAccount(mocks.MockBuilderSecrets()),

 		Client: generator.Client{

 			GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

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

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

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

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

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

+	kcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"

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

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

 	"k8s.io/kubernetes/pkg/registry/pod"

@@ -31,7 +31,7 @@ type REST struct {

 }

 type podGetter struct {

-	podsNamespacer unversioned.PodsNamespacer

+	kcoreclient.PodsGetter

 }

 func (g *podGetter) Get(ctx kapi.Context, name string) (runtime.Object, error) {

@@ -39,7 +39,7 @@ func (g *podGetter) Get(ctx kapi.Context, name string) (runtime.Object, error) {

 	if !ok {

 		return nil, errors.NewBadRequest("namespace parameter required.")

 	}

-	return g.podsNamespacer.Pods(ns).Get(name)

+	return g.Pods(ns).Get(name)

 }

 const defaultTimeout time.Duration = 10 * time.Second

@@ -47,7 +47,7 @@ const defaultTimeout time.Duration = 10 * time.Second

 // NewREST creates a new REST for BuildLog

 // Takes build registry and pod client to get necessary attributes to assemble

 // URL to which the request shall be redirected in order to get build logs.

-func NewREST(getter rest.Getter, watcher rest.Watcher, pn unversioned.PodsNamespacer, connectionInfo kubeletclient.ConnectionInfoGetter) *REST {

+func NewREST(getter rest.Getter, watcher rest.Watcher, pn kcoreclient.PodsGetter, connectionInfo kubeletclient.ConnectionInfoGetter) *REST {

 	return &REST{

 		Getter:         getter,

 		Watcher:        watcher,

@@ -5,30 +5,29 @@ import (

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

 	"k8s.io/kubernetes/pkg/apis/extensions"

-	unversioned_extensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned"

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

+	kextensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned"

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

 )

 type delegatingScaleInterface struct {

 	dcs    DeploymentConfigInterface

-	scales kclient.ScaleInterface

+	scales kextensionsclient.ScaleInterface

 }

 type delegatingScaleNamespacer struct {

 	dcNS    DeploymentConfigsNamespacer

-	scaleNS kclient.ScaleNamespacer

+	scaleNS kextensionsclient.ScalesGetter

 }

-func (c *delegatingScaleNamespacer) Scales(namespace string) unversioned_extensions.ScaleInterface {

+func (c *delegatingScaleNamespacer) Scales(namespace string) kextensionsclient.ScaleInterface {

 	return &delegatingScaleInterface{

 		dcs:    c.dcNS.DeploymentConfigs(namespace),

 		scales: c.scaleNS.Scales(namespace),

 	}

 }

-func NewDelegatingScaleNamespacer(dcNamespacer DeploymentConfigsNamespacer, sNamespacer kclient.ScaleNamespacer) unversioned_extensions.ScalesGetter {

+func NewDelegatingScaleNamespacer(dcNamespacer DeploymentConfigsNamespacer, sNamespacer kextensionsclient.ScalesGetter) kextensionsclient.ScalesGetter {

 	return &delegatingScaleNamespacer{

 		dcNS:    dcNamespacer,

 		scaleNS: sNamespacer,

@@ -22,7 +22,7 @@ var (

 func (o DiagnosticsOptions) buildClientDiagnostics(rawConfig *clientcmdapi.Config) ([]types.Diagnostic, bool, error) {

 	available := availableClientDiagnostics

-	osClient, kubeClient, clientErr := o.Factory.Clients()

+	osClient, _, kubeClient, clientErr := o.Factory.Clients()

 	if clientErr != nil {

 		o.Logger.Notice("CED0001", "Could not configure a client, so client diagnostics are limited to testing configuration and connection")

 		available = sets.NewString(clientdiags.ConfigContextsName)

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

 	"regexp"

 	"strings"

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

+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"

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

 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"

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

@@ -44,7 +44,7 @@ func (o DiagnosticsOptions) buildClusterDiagnostics(rawConfig *clientcmdapi.Conf

 	var (

 		clusterClient  *client.Client

-		kclusterClient *kclient.Client

+		kclusterClient *kclientset.Clientset

 	)

 	clusterClient, kclusterClient, found, serverUrl, err := o.findClusterClients(rawConfig)

@@ -84,7 +84,7 @@ func (o DiagnosticsOptions) buildClusterDiagnostics(rawConfig *clientcmdapi.Conf

 }

 // attempts to find which context in the config might be a cluster-admin for the server in the current context.

-func (o DiagnosticsOptions) findClusterClients(rawConfig *clientcmdapi.Config) (*client.Client, *kclient.Client, bool, string, error) {

+func (o DiagnosticsOptions) findClusterClients(rawConfig *clientcmdapi.Config) (*client.Client, *kclientset.Clientset, bool, string, error) {

 	if o.ClientClusterContext != "" { // user has specified cluster context to use

 		if context, exists := rawConfig.Contexts[o.ClientClusterContext]; exists {

 			configErr := fmt.Errorf("Specified '%s' as cluster-admin context, but it was not found in your client configuration.", o.ClientClusterContext)

@@ -120,13 +120,13 @@ func (o DiagnosticsOptions) findClusterClients(rawConfig *clientcmdapi.Config) (

 }

 // makes the client from the specified context and determines whether it is a cluster-admin.

-func (o DiagnosticsOptions) makeClusterClients(rawConfig *clientcmdapi.Config, contextName string, context *clientcmdapi.Context) (*client.Client, *kclient.Client, bool, string, error) {

+func (o DiagnosticsOptions) makeClusterClients(rawConfig *clientcmdapi.Config, contextName string, context *clientcmdapi.Context) (*client.Client, *kclientset.Clientset, bool, string, error) {

 	overrides := &clientcmd.ConfigOverrides{Context: *context}

 	clientConfig := clientcmd.NewDefaultClientConfig(*rawConfig, overrides)

 	serverUrl := rawConfig.Clusters[context.Cluster].Server

 	factory := osclientcmd.NewFactory(clientConfig)

 	o.Logger.Debug("CED1005", fmt.Sprintf("Checking if context is cluster-admin: '%s'", contextName))

-	if osClient, kubeClient, err := factory.Clients(); err != nil {

+	if osClient, _, kubeClient, err := factory.Clients(); err != nil {

 		o.Logger.Debug("CED1006", fmt.Sprintf("Error creating client for context '%s':\n%v", contextName, err))

 		return nil, nil, false, "", nil

 	} else {

@@ -134,7 +134,7 @@ func (o NetworkPodDiagnosticsOptions) buildNetworkPodDiagnostics() ([]types.Diag

 	clientFlags := flag.NewFlagSet("client", flag.ContinueOnError) // hide the extensive set of client flags

 	factory := osclientcmd.New(clientFlags)                        // that would otherwise be added to this command

-	osClient, kubeClient, clientErr := factory.Clients()

+	osClient, _, kubeClient, clientErr := factory.Clients()

 	if clientErr != nil {

 		return diagnostics, false, []error{clientErr}

 	}

@@ -95,7 +95,7 @@ func (o *GroupModificationOptions) Complete(f *clientcmd.Factory, args []string)

 	o.Group = args[0]

 	o.Users = append(o.Users, args[1:]...)

-	osClient, _, err := f.Clients()

+	osClient, _, _, err := f.Clients()

 	if err != nil {

 		return err

 	}

@@ -79,7 +79,7 @@ func (o *NewGroupOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command, arg

 		o.Users = append(o.Users, args[1:]...)

 	}

-	osClient, _, err := f.Clients()

+	osClient, _, _, err := f.Clients()

 	if err != nil {

 		return err

 	}

@@ -147,7 +147,7 @@ func (o *PruneOptions) Complete(whitelistFile, blacklistFile, configFile string,

 		return err

 	}

-	osClient, _, err := f.Clients()

+	osClient, _, _, err := f.Clients()

 	if err != nil {

 		return err

 	}

@@ -220,7 +220,7 @@ func (o *SyncOptions) Complete(typeArg, whitelistFile, blacklistFile, configFile

 		return err

 	}

-	osClient, _, err := f.Clients()

+	osClient, _, _, err := f.Clients()

 	if err != nil {