@@ -30,6 +30,10 @@ func (s FakeBuildConfigStore) List() []interface{} {

 	return []interface{}{s.Build}

 }

+func (s FakeBuildConfigStore) ListKeys() []string {

+	return []string{"config"}

+}

+

 func (s FakeBuildConfigStore) ContainedIDs() util.StringSet {

 	return util.NewStringSet()

 }

@@ -30,6 +30,10 @@ func (s FakeBuildStore) List() []interface{} {

 	return []interface{}{s.Build}

 }

+func (s FakeBuildStore) ListKeys() []string {

+	return []string{"build"}

+}

+

 func (s FakeBuildStore) ContainedIDs() util.StringSet {

 	return util.NewStringSet()

 }

@@ -123,9 +123,9 @@ func mockPod(podPhase kapi.PodPhase) *kapi.Pod {

 					Name: "foo-container",

 				},

 			},

+			Host: "foo-host",

 		},

 		Status: kapi.PodStatus{

-			Host:  "foo-host",

 			Phase: podPhase,

 		},

 	}

@@ -1,8 +1,9 @@

 package webhook

 import (

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

 	"strings"

+

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

 )

 // GitRefMatches determines if the ref from a webhook event matches a build configuration

@@ -5,11 +5,11 @@ import (

 	"testing"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

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

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

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

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

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

@@ -30,7 +30,7 @@ func TestDescribeFor(t *testing.T) {

 		"Route", "Project",

 	}

 	for _, o := range testTypesList {

-		_, ok := DescriberFor(o, c, &kclient.Fake{}, "")

+		_, ok := DescriberFor(o, c, &testclient.Fake{}, "")

 		if !ok {

 			t.Errorf("Unable to obtain describer for %s", o)

 		}

@@ -716,9 +716,12 @@ func expectedService(name string, port int, proto kapi.Protocol) map[string]kapi

 				Name: name,

 			},

 			Spec: kapi.ServiceSpec{

-				Port:       port,

-				Protocol:   proto,

-				TargetPort: util.NewIntOrStringFromInt(port),

+				Ports: []kapi.ServicePort{{

+					Name:       fmt.Sprintf("%s-%s-%d", name, strings.ToLower(string(proto)), port),

+					Port:       port,

+					Protocol:   proto,

+					TargetPort: util.NewIntOrStringFromInt(port),

+				}},

 				Selector: map[string]string{

 					"deploymentconfig": name,

 				},

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

 package bootstrappolicy

-import ()

-

 // known namespaces

 const (

 	DefaultMasterAuthorizationNamespace      = "master"

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

 	"io"

 	"strings"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

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

 )

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

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

@@ -15,6 +14,8 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

 	"github.com/coreos/go-etcd/etcd"

+

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

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

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

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

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

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"

-	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

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

 )

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

 			},

 		},

 	}

-	mockKubeClient := &kclient.Fake{NamespacesList: namespaceList}

+	mockKubeClient := testclient.NewSimpleFake(&namespaceList)

 	mockOriginClient := &client.Fake{}

 	reviewer := &mockReviewer{

@@ -4,14 +4,14 @@ import (

 	"testing"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

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

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

 )

 func TestSyncNamespaceThatIsTerminating(t *testing.T) {

-	mockKubeClient := &kclient.Fake{}

+	mockKubeClient := &testclient.Fake{}

 	mockOriginClient := &osclient.Fake{}

 	nm := NamespaceController{

 		KubeClient: mockKubeClient,

@@ -61,7 +61,7 @@ func TestSyncNamespaceThatIsTerminating(t *testing.T) {

 }

 func TestSyncNamespaceThatIsActive(t *testing.T) {

-	mockKubeClient := &kclient.Fake{}

+	mockKubeClient := &testclient.Fake{}

 	mockOriginClient := &osclient.Fake{}

 	nm := NamespaceController{

 		KubeClient: mockKubeClient,

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

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/auth/user"

-	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/fields"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"

+

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

 )

@@ -31,9 +32,7 @@ func TestListProjects(t *testing.T) {

 			},

 		},

 	}

-	mockClient := &kclient.Fake{

-		NamespacesList: namespaceList,

-	}

+	mockClient := testclient.NewSimpleFake(&namespaceList)

 	storage := REST{

 		client: mockClient.Namespaces(),

 		lister: &mockLister{&namespaceList},

@@ -71,7 +70,7 @@ func TestCreateProjectBadObject(t *testing.T) {

 }

 func TestCreateInvalidProject(t *testing.T) {

-	mockClient := &kclient.Fake{}

+	mockClient := &testclient.Fake{}

 	storage := NewREST(mockClient.Namespaces(), &mockLister{})

 	_, err := storage.Create(nil, &api.Project{

 		DisplayName: "h\t\ni",

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

 }

 func TestCreateProjectOK(t *testing.T) {

-	mockClient := &kclient.Fake{}

+	mockClient := &testclient.Fake{}

 	storage := NewREST(mockClient.Namespaces(), &mockLister{})

 	_, err := storage.Create(kapi.NewContext(), &api.Project{

 		ObjectMeta: kapi.ObjectMeta{Name: "foo"},

@@ -99,7 +98,7 @@ func TestCreateProjectOK(t *testing.T) {

 }

 func TestGetProjectOK(t *testing.T) {

-	mockClient := &kclient.Fake{}

+	mockClient := testclient.NewSimpleFake(&kapi.Namespace{ObjectMeta: kapi.ObjectMeta{Name: "foo"}})

 	storage := NewREST(mockClient.Namespaces(), &mockLister{})

 	project, err := storage.Get(kapi.NewContext(), "foo")

 	if project == nil {

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

 }

 func TestDeleteProject(t *testing.T) {

-	mockClient := &kclient.Fake{}

+	mockClient := &testclient.Fake{}

 	storage := REST{

 		client: mockClient.Namespaces(),

 	}

@@ -5,11 +5,18 @@ import (

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/testclient"

 )

 func TestServiceResolverCacheEmpty(t *testing.T) {

-	fakeClient := &client.Fake{}

+	fakeClient := testclient.NewSimpleFake(&api.Service{

+		ObjectMeta: api.ObjectMeta{

+			Name: "foo",

+		},

+		Spec: api.ServiceSpec{

+			Ports: []api.ServicePort{{Port: 80}},

+		},

+	})

 	cache := NewServiceResolverCache(fakeClient.Services("default").Get)

 	if v, ok := cache.resolve("FOO_SERVICE_HOST"); v != "" || !ok {

 		t.Errorf("unexpected cache item")

@@ -49,7 +56,7 @@ func TestServiceResolverCache(t *testing.T) {

 		service: &api.Service{

 			Spec: api.ServiceSpec{

 				PortalIP: "127.0.0.1",

-				Port:     80,

+				Ports:    []api.ServicePort{{Port: 80}},

 			},

 		},

 	}

@@ -171,7 +171,7 @@ func TestValidateTemplate(t *testing.T) {

 							GenerateName: "test",

 						},

 						Spec: kapi.ServiceSpec{

-							Port: 8080,

+							Ports: []kapi.ServicePort{{Port: 8080}},

 						},

 					},

 				},

@@ -69,8 +69,12 @@ func TestNewRESTTemplateLabels(t *testing.T) {

 					Name: "test-service",

 				},

 				Spec: kapi.ServiceSpec{

-					Port:            80,

-					Protocol:        kapi.ProtocolTCP,

+					Ports: []kapi.ServicePort{

+						{

+							Port:     80,

+							Protocol: kapi.ProtocolTCP,

+						},

+					},

 					SessionAffinity: kapi.AffinityTypeNone,

 				},

 			},

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

 	"fmt"

 	"io/ioutil"

 	"math/rand"

+	"strings"

 	"testing"

 	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

-	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/errors"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"

+

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

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

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

@@ -104,7 +106,7 @@ func TestParameterGenerators(t *testing.T) {

 	}

 }

-func ExampleProcessTemplateParameters() {

+func TestProcessTemplateParameters(t *testing.T) {

 	var template api.Template

 	jsonData, _ := ioutil.ReadFile("../../test/templates/fixtures/guestbook.json")

 	latest.Codec.DecodeInto(jsonData, &template)

@@ -118,16 +120,24 @@ func ExampleProcessTemplateParameters() {

 	AddParameter(&template, makeParameter("CUSTOM_PARAM1", "1", ""))

 	// Transform the template config into the result config

-	config, err := processor.Process(&template)

-	fmt.Println(errors.NewAggregate(err))

-	if config != nil {

-		result, err := latest.Codec.Encode(config)

-		if err != nil {

-			fmt.Printf("Unexpected error during encoding Config: %#v", err)

-		}

-		fmt.Println(string(result))

+	config, errs := processor.Process(&template)

+	if len(errs) > 0 {

+		t.Fatalf("unexpected error: %v", errs)

+	}

+	result, err := latest.Codec.Encode(config)

+	if err != nil {

+		t.Fatalf("unexpected error during encoding Config: %#v", err)

+	}

+	expect := `

+{"kind":"Config","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"items":[{"kind":"Route","apiVersion":"v1beta1","metadata":{"name":"frontend-route","creationTimestamp":null},"host":"guestbook.example.com","serviceName":"frontend-service"},

+{"kind":"Service","id":"frontend-service","creationTimestamp":null,"apiVersion":"v1beta1","port":5432,"protocol":"TCP","containerPort":0,"selector":{"name":"frontend-service"},"sessionAffinity":"None","ports":[{"name":"","protocol":"TCP","port":5432,"containerPort":0}]},

+{"kind":"Service","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","port":10000,"protocol":"TCP","containerPort":0,"selector":{"name":"redis-master"},"sessionAffinity":"None","ports":[{"name":"","protocol":"TCP","port":10000,"containerPort":0}]},

+{"kind":"Service","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","port":10001,"protocol":"TCP","containerPort":0,"selector":{"name":"redis-slave"},"sessionAffinity":"None","ports":[{"name":"","protocol":"TCP","port":10001,"containerPort":0}]},

+{"kind":"Pod","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","labels":{"name":"redis-master"},"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"master","image":"dockerfile/redis","ports":[{"containerPort":6379,"protocol":"TCP"}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"currentState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}},

+{"kind":"ReplicationController","id":"guestbook","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":3,"replicaSelector":{"name":"frontend-service"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"php-redis","image":"brendanburns/php-redis","ports":[{"hostPort":8000,"containerPort":80,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminQ3H"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"dwNJiJwW"},{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend-service"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}},

+{"kind":"ReplicationController","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":2,"replicaSelector":{"name":"redis-slave"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"slave","image":"brendanburns/redis-slave","ports":[{"hostPort":6380,"containerPort":6379,"protocol":"TCP"}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"redis-slave"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}}]}`

+	expect = strings.Replace(expect, "\n", "", -1)

+	if string(result) != expect {

+		t.Errorf("unexpected output: %s", util.StringDiff(expect, string(result)))

 	}

-	// Output:

-	//<nil>

-	//{"kind":"Config","apiVersion":"v1beta1","metadata":{"creationTimestamp":null},"items":[{"kind":"Route","apiVersion":"v1beta1","metadata":{"name":"frontend-route","creationTimestamp":null},"host":"guestbook.example.com","serviceName":"frontend-service"},{"kind":"Service","id":"frontend-service","creationTimestamp":null,"apiVersion":"v1beta1","port":5432,"protocol":"TCP","selector":{"name":"frontend-service"},"containerPort":0,"sessionAffinity":"None"},{"kind":"Service","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","port":10000,"protocol":"TCP","selector":{"name":"redis-master"},"containerPort":0,"sessionAffinity":"None"},{"kind":"Service","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","port":10001,"protocol":"TCP","selector":{"name":"redis-slave"},"containerPort":0,"sessionAffinity":"None"},{"kind":"Pod","id":"redis-master","creationTimestamp":null,"apiVersion":"v1beta1","labels":{"name":"redis-master"},"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"master","image":"dockerfile/redis","ports":[{"containerPort":6379,"protocol":"TCP"}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"currentState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}},{"kind":"ReplicationController","id":"guestbook","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":3,"replicaSelector":{"name":"frontend-service"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"php-redis","image":"brendanburns/php-redis","ports":[{"hostPort":8000,"containerPort":80,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminQ3H"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"dwNJiJwW"},{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend-service"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}},{"kind":"ReplicationController","id":"redis-slave","creationTimestamp":null,"apiVersion":"v1beta1","desiredState":{"replicas":2,"replicaSelector":{"name":"redis-slave"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"slave","image":"brendanburns/redis-slave","ports":[{"hostPort":6380,"containerPort":6379,"protocol":"TCP"}],"env":[{"name":"REDIS_PASSWORD","key":"REDIS_PASSWORD","value":"P8vxbV4C"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"redis-slave"}}},"currentState":{"replicas":0,"podTemplate":{"desiredState":{"manifest":{"version":"","id":"","volumes":null,"containers":null,"restartPolicy":{}}}}}}]}

 }

@@ -25,8 +25,10 @@ func makeUser() *api.User {

 func makeUserFromSequence(sequence int) *api.User {

 	userName := fmt.Sprintf("myuser-%d", sequence)

 	userUID := types.UID(fmt.Sprintf("useruid-%d", sequence))

+	userResourceVersion := fmt.Sprintf("%d", sequence+100)

+

 	return &api.User{

-		ObjectMeta: kapi.ObjectMeta{Name: userName, UID: userUID},

+		ObjectMeta: kapi.ObjectMeta{Name: userName, UID: userUID, ResourceVersion: userResourceVersion},

 	}

 }

@@ -40,9 +42,10 @@ func makeIdentityFromSequence(sequence int) *api.Identity {

 	providerUserName := fmt.Sprintf("providerusername-%d", sequence)

 	identityName := fmt.Sprintf("%s:%s", providerName, providerUserName)

 	identityUID := types.UID(fmt.Sprintf("identityuid-%d", sequence))

+	identityResourceVersion := fmt.Sprintf("%d", sequence+200)

 	return &api.Identity{

-		ObjectMeta:       kapi.ObjectMeta{Name: identityName, UID: identityUID},

+		ObjectMeta:       kapi.ObjectMeta{Name: identityName, UID: identityUID, ResourceVersion: identityResourceVersion},

 		ProviderName:     providerName,

 		ProviderUserName: providerUserName,

 	}

@@ -398,8 +401,9 @@ func TestUpdate(t *testing.T) {

 	}

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, _, _, rest := setupRegistries(associatedIdentity1User1, associatedUser1, unassociatedUser2)

@@ -428,8 +432,9 @@ func TestUpdateMissingIdentity(t *testing.T) {

 	}

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, _, _, rest := setupRegistries(nil, associatedUser1, unassociatedUser2)

@@ -460,8 +465,9 @@ func TestUpdateMissingUser(t *testing.T) {

 	}

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, _, _, rest := setupRegistries(associatedIdentity1User1, associatedUser1)

@@ -486,8 +492,9 @@ func TestUpdateOldUserMatches(t *testing.T) {

 	}

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: identity.Name},

-		User:     kapi.ObjectReference{Name: user.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: identity.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: identity.Name},

+		User:       kapi.ObjectReference{Name: user.Name},

 	}

 	actions, _, _, rest := setupRegistries(identity, user)

@@ -503,52 +510,39 @@ func TestUpdateOldUserMatches(t *testing.T) {

 	verifyMapping(createdMapping, user, identity, t)

 }

-func TestUpdateWithMatchingResourceVersion(t *testing.T) {

+func TestUpdateWithEmptyResourceVersion(t *testing.T) {

 	// Starting conditions

 	associatedUser1, associatedIdentity1User1 := makeAssociated()

-	associatedIdentity1User1.ResourceVersion = "ver1"

 	unassociatedUser2 := makeUser()

 	// Finishing conditions

-	unassociatedUser1, unassociatedIdentity1 := disassociate(associatedUser1, associatedIdentity1User1)

-	associatedUser2, associatedIdentity1User2 := associate(unassociatedUser2, unassociatedIdentity1)

+	_, unassociatedIdentity1 := disassociate(associatedUser1, associatedIdentity1User1)

 	expectedActions := []test.Action{

 		// Existing mapping lookup

 		{"GetIdentity", associatedIdentity1User1.Name},

 		{"GetUser", associatedUser1.Name},

-		// New user lookup

-		{"GetUser", unassociatedUser2.Name},

-		// New user update

-		{"UpdateUser", associatedUser2},

-		// Identity update

-		{"UpdateIdentity", associatedIdentity1User2},

-		// Old user cleanup

-		{"UpdateUser", unassociatedUser1},

 	}

 	mapping := &api.UserIdentityMapping{

-		ObjectMeta: kapi.ObjectMeta{ResourceVersion: "ver1"},

-		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

+		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, _, _, rest := setupRegistries(associatedIdentity1User1, associatedUser1, unassociatedUser2)

-	createdMapping, created, err := rest.Update(kapi.NewContext(), mapping)

+	_, _, err := rest.Update(kapi.NewContext(), mapping)

-	if err != nil {

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

+	if err == nil {

+		t.Errorf("Expected error")

 	}

-	if created {

-		t.Errorf("Unexpected created")

+	if !kerrs.IsInvalid(err) {

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

 	}

 	verifyActions(expectedActions, *actions, t)

-	verifyMapping(createdMapping, associatedUser2, associatedIdentity1User2, t)

 }

 func TestUpdateWithMismatchedResourceVersion(t *testing.T) {

 	// Starting conditions

 	associatedUser1, associatedIdentity1User1 := makeAssociated()

-	associatedIdentity1User1.ResourceVersion = "ver1"

 	unassociatedUser2 := makeUser()

 	// Finishing conditions

 	_, unassociatedIdentity1 := disassociate(associatedUser1, associatedIdentity1User1)

@@ -560,7 +554,7 @@ func TestUpdateWithMismatchedResourceVersion(t *testing.T) {

 	}

 	mapping := &api.UserIdentityMapping{

-		ObjectMeta: kapi.ObjectMeta{ResourceVersion: "ver2"},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: "123"},

 		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

 		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

@@ -601,8 +595,9 @@ func TestUpdateOldUserUpdateError(t *testing.T) {

 	expectedErr := errors.New("Couldn't update old user")

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, userRegistry, _, rest := setupRegistries(associatedIdentity1User1, associatedUser1, unassociatedUser2)

@@ -640,8 +635,9 @@ func TestUpdateUserUpdateError(t *testing.T) {

 	expectedErr := errors.New("Couldn't update new user")

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, userRegistry, _, rest := setupRegistries(associatedIdentity1User1, associatedUser1, unassociatedUser2)

@@ -679,8 +675,9 @@ func TestUpdateIdentityUpdateError(t *testing.T) {

 	expectedErr := errors.New("Couldn't update identity")

 	mapping := &api.UserIdentityMapping{

-		Identity: kapi.ObjectReference{Name: unassociatedIdentity1.Name},

-		User:     kapi.ObjectReference{Name: unassociatedUser2.Name},

+		ObjectMeta: kapi.ObjectMeta{ResourceVersion: unassociatedIdentity1.ResourceVersion},

+		Identity:   kapi.ObjectReference{Name: unassociatedIdentity1.Name},

+		User:       kapi.ObjectReference{Name: unassociatedUser2.Name},

 	}

 	actions, _, identityRegistry, rest := setupRegistries(associatedIdentity1User1, associatedUser1, unassociatedUser2)

@@ -119,7 +119,10 @@ func TestHandleEndpoints(t *testing.T) {

 					Namespace: "foo",

 					Name:      "test", //kapi.endpoints inherits the name of the service

 				},

-				Endpoints: []kapi.Endpoint{{IP: "1.1.1.1", Port: 345}}, //not specifying a port to force the port 80 assumption

+				Subsets: []kapi.EndpointSubset{{

+					Addresses: []kapi.EndpointAddress{{IP: "1.1.1.1"}},

+					Ports:     []kapi.EndpointPort{{Port: 345}},

+				}}, //not specifying a port to force the port 80 assumption

 			},

 			expectedServiceUnit: &ServiceUnit{

 				Name: "foo/test", //service name from kapi.endpoints object

@@ -140,7 +143,10 @@ func TestHandleEndpoints(t *testing.T) {

 					Namespace: "foo",

 					Name:      "test",

 				},

-				Endpoints: []kapi.Endpoint{{IP: "2.2.2.2", Port: 8080}},

+				Subsets: []kapi.EndpointSubset{{

+					Addresses: []kapi.EndpointAddress{{IP: "2.2.2.2"}},

+					Ports:     []kapi.EndpointPort{{Port: 8080}},

+				}},

 			},

 			expectedServiceUnit: &ServiceUnit{

 				Name: "foo/test",

@@ -161,7 +167,10 @@ func TestHandleEndpoints(t *testing.T) {

 					Namespace: "foo",

 					Name:      "test",

 				},

-				Endpoints: []kapi.Endpoint{{IP: "3.3.3.3", Port: 0}},

+				Subsets: []kapi.EndpointSubset{{

+					Addresses: []kapi.EndpointAddress{{IP: "3.3.3.3"}},

+					Ports:     []kapi.EndpointPort{{Port: 0}},

+				}},

 			},

 			expectedServiceUnit: &ServiceUnit{

 				Name:          "foo/test",

@@ -10,10 +10,10 @@ import (

 	"testing"

 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	klatest "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

 	kclient "github.com/GoogleCloudPlatform/kubernetes/pkg/client"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"

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

 	"github.com/openshift/origin/pkg/auth/authenticator/request/headerrequest"

 	oauthhandlers "github.com/openshift/origin/pkg/auth/oauth/handlers"

 	oauthregistry "github.com/openshift/origin/pkg/auth/oauth/registry"

@@ -48,7 +48,7 @@ func TestFrontProxyOnAuthorize(t *testing.T) {

 	// setup

 	etcdClient := testutil.NewEtcdClient()

-	etcdHelper, _ := master.NewEtcdHelper(etcdClient, klatest.Version)

+	etcdHelper, _ := master.NewEtcdHelper(etcdClient, latest.Version)

 	oauthEtcd := oauthetcd.New(etcdHelper)

 	userStorage := useretcd.NewREST(etcdHelper)

@@ -173,7 +173,7 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 	openshift.lock.Lock()

 	defer openshift.lock.Unlock()

 	etcdClient := testutil.NewEtcdClient()

-	etcdHelper, _ := master.NewEtcdHelper(etcdClient, klatest.Version)

+	etcdHelper, _ := master.NewEtcdHelper(etcdClient, latest.Version)

 	osMux := http.NewServeMux()

 	openshift.server = httptest.NewServer(osMux)

@@ -240,9 +240,10 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 		Mapper: latest.RESTMapper,

-		Creater: kapi.Scheme,

-		Typer:   kapi.Scheme,

-		Linker:  interfaces.MetadataAccessor,

+		Creater:   kapi.Scheme,

+		Typer:     kapi.Scheme,

+		Convertor: kapi.Scheme,

+		Linker:    interfaces.MetadataAccessor,

 		Admit:   admit.NewAlwaysAdmit(),

 		Context: kapi.NewRequestContextMapper(),

@@ -11,10 +11,10 @@ import (

 	"github.com/spf13/pflag"

-	klatest "github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"

 	"github.com/GoogleCloudPlatform/kubernetes/pkg/master"

 	// for osinserver setup.

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

 	"github.com/openshift/origin/pkg/auth/authenticator/challenger/passwordchallenger"

 	"github.com/openshift/origin/pkg/auth/authenticator/password/allowanypassword"

 	"github.com/openshift/origin/pkg/auth/authenticator/request/basicauthrequest"

@@ -44,7 +44,7 @@ func TestGetToken(t *testing.T) {

 	// setup

 	etcdClient := testutil.NewEtcdClient()

-	etcdHelper, _ := master.NewEtcdHelper(etcdClient, klatest.Version)

+	etcdHelper, _ := master.NewEtcdHelper(etcdClient, latest.Version)

 	oauthEtcd := oauthetcd.New(etcdHelper)

 	userStorage := useretcd.NewREST(etcdHelper)

@@ -60,7 +60,7 @@ func TestDNS(t *testing.T) {

 		},

 		Spec: kapi.ServiceSpec{

 			PortalIP: kapi.PortalIPNone,

-			Port:     443,

+			Ports:    []kapi.ServicePort{{Port: 443}},

 		},

 	}); err != nil {

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

@@ -69,12 +69,10 @@ func TestDNS(t *testing.T) {

 		ObjectMeta: kapi.ObjectMeta{

 			Name: "headless",

 		},

-		Endpoints: []kapi.Endpoint{

-			{

-				IP:   "172.0.0.1",

-				Port: 2345,

-			},

-		},

+		Subsets: []kapi.EndpointSubset{{

+			Addresses: []kapi.EndpointAddress{{IP: "172.0.0.1"}},

+			Ports:     []kapi.EndpointPort{{Port: 2345}},

+		}},

 	}); err != nil {

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

 	}

@@ -84,6 +82,7 @@ func TestDNS(t *testing.T) {

 	tests := []struct {

 		dnsQuestionName   string

 		recursionExpected bool

+		retry             bool

 		expect            *net.IP

 	}{

 		{

@@ -99,6 +98,7 @@ func TestDNS(t *testing.T) {

 		{

 			dnsQuestionName:   "headless.default.local.",

 			recursionExpected: false,

+			retry:             true,

 			expect:            &headlessIP,

 		},

 		{

@@ -106,31 +106,41 @@ func TestDNS(t *testing.T) {

 			recursionExpected: true,

 		},

 	}

-	for _, tc := range tests {

-		m1 := &dns.Msg{

-			MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},

-			Question: []dns.Question{{tc.dnsQuestionName, dns.TypeA, dns.ClassINET}},

-		}

-		in, err := dns.Exchange(m1, masterConfig.DNSConfig.BindAddress)

-		if err != nil {

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

-		}

-		if !tc.recursionExpected && len(in.Answer) != 1 {

-			t.Fatalf("did not resolve or unexpected forward resolution: %#v", in)

-		} else if tc.recursionExpected && len(in.Answer) == 0 {

-			t.Fatalf("expected forward resolution: %#v", in)

-		}

-		if a, ok := in.Answer[0].(*dns.A); ok {

-			if a.A == nil {

-				t.Errorf("expected an A record with an IP: %#v", a)

-			} else {

-				if tc.expect != nil && tc.expect.String() != a.A.String() {

-					t.Errorf("A record has a different IP than the test case: %v / %v", a.A, *tc.expect)

+	for i, tc := range tests {

+		stop := make(chan struct{})

+		util.Until(func() {

+			m1 := &dns.Msg{

+				MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},

+				Question: []dns.Question{{tc.dnsQuestionName, dns.TypeA, dns.ClassINET}},

+			}

+			in, err := dns.Exchange(m1, masterConfig.DNSConfig.BindAddress)

+			if err != nil {

+				t.Errorf("%d: unexpected error: %v", i, err)

+				return

+			}

+			if !tc.recursionExpected && len(in.Answer) != 1 {

+				if !tc.retry {

+					close(stop)

+					t.Errorf("%d: did not resolve or unexpected forward resolution: %#v", i, in)

 				}

+				return

+			} else if tc.recursionExpected && len(in.Answer) == 0 {

+				t.Errorf("%d: expected forward resolution: %#v", i, in)

+				return

 			}

-		} else {

-			t.Errorf("expected an A record: %#v", in)

-		}

-		t.Log(in)

+			if a, ok := in.Answer[0].(*dns.A); ok {

+				if a.A == nil {

+					t.Errorf("expected an A record with an IP: %#v", a)

+				} else {

+					if tc.expect != nil && tc.expect.String() != a.A.String() {

+						t.Errorf("A record has a different IP than the test case: %v / %v", a.A, *tc.expect)

+					}

+				}

+			} else {

+				t.Errorf("expected an A record: %#v", in)

+			}

+			t.Log(in)

+			close(stop)

+		}, 50*time.Millisecond, stop)

 	}

 }

@@ -59,9 +59,10 @@ func TestProjectIsNamespace(t *testing.T) {

 		Mapper: klatest.RESTMapper,

-		Creater: kapi.Scheme,

-		Typer:   kapi.Scheme,

-		Linker:  kubeInterfaces.MetadataAccessor,

+		Creater:   kapi.Scheme,

+		Typer:     kapi.Scheme,

+		Convertor: kapi.Scheme,

+		Linker:    kubeInterfaces.MetadataAccessor,

 		Admit:   admit.NewAlwaysAdmit(),

 		Context: kapi.NewRequestContextMapper(),

@@ -70,7 +71,7 @@ func TestProjectIsNamespace(t *testing.T) {

 		t.Fatalf("unable to install REST: %v", err)

 	}

-	kubeClient, err := kclient.New(&kclient.Config{Host: server.URL})

+	kubeClient, err := kclient.New(&kclient.Config{Host: server.URL, Version: "v1beta1"})

 	if err != nil {

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

 	}

@@ -89,9 +90,10 @@ func TestProjectIsNamespace(t *testing.T) {

 		Mapper: latest.RESTMapper,

-		Creater: kapi.Scheme,

-		Typer:   kapi.Scheme,

-		Linker:  originInterfaces.MetadataAccessor,

+		Creater:   kapi.Scheme,

+		Typer:     kapi.Scheme,

+		Convertor: kapi.Scheme,

+		Linker:    originInterfaces.MetadataAccessor,

 		Admit:   admit.NewAlwaysAdmit(),

 		Context: kapi.NewRequestContextMapper(),

@@ -32,11 +32,12 @@ func TestWebhookGithubPush(t *testing.T) {

 	// create buildconfig

 	buildConfig := mockBuildConfigParms("image", "repo", "tag")

-	if _, err := openshift.Client.BuildConfigs(testutil.Namespace()).Create(buildConfig); err != nil {

+	bc, err := openshift.Client.BuildConfigs(testutil.Namespace()).Create(buildConfig)

+	if err != nil {

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

 	}

-	watch, err := openshift.Client.Builds(testutil.Namespace()).Watch(labels.Everything(), fields.Everything(), "0")

+	watch, err := openshift.Client.Builds(testutil.Namespace()).Watch(labels.Everything(), fields.Everything(), bc.ResourceVersion)

 	if err != nil {

 		t.Fatalf("Couldn't subscribe to builds: %v", err)

 	}

@@ -69,9 +69,10 @@ func TestTemplateTransformationFromConfig(t *testing.T) {

 		Storage: storage,

 		Codec:   interfaces.Codec,

-		Creater: kapi.Scheme,

-		Typer:   kapi.Scheme,

-		Linker:  interfaces.MetadataAccessor,

+		Creater:   kapi.Scheme,

+		Typer:     kapi.Scheme,

+		Convertor: kapi.Scheme,

+		Linker:    interfaces.MetadataAccessor,

 		Admit:   admit.NewAlwaysAdmit(),

 		Context: kapi.NewRequestContextMapper(),

@@ -55,15 +55,18 @@ func WaitForAddress(pod *kapi.Pod, service *kapi.Service, ns string) (string, er

 		if eventEndpoint.Name != service.Name {

 			continue

 		}

-		if len(eventEndpoint.Endpoints) == 0 {

+		if len(eventEndpoint.Subsets) == 0 {

 			fmt.Printf("Waiting for %s address\n", eventEndpoint.Name)

 			continue

 		}

-		for i := range eventEndpoint.Endpoints {

-			e := &eventEndpoint.Endpoints[i]

-			addr := net.JoinHostPort(e.IP, strconv.Itoa(e.Port))

-			fmt.Printf("Discovered new %s endpoint: %s\n", service.Name, addr)

-			return addr, nil

+		for _, s := range eventEndpoint.Subsets {

+			for _, p := range s.Ports {

+				for _, a := range s.Addresses {

+					addr := net.JoinHostPort(a.IP, strconv.Itoa(p.Port))

+					fmt.Printf("Discovered new %s endpoint: %s\n", service.Name, addr)

+					return addr, nil

+				}

+			}

 		}

 	}

 	return "", fmt.Errorf("Service does not get any endpoints")

@@ -114,9 +117,11 @@ func CreateServiceForPod(pod *kapi.Pod, ns string) *kapi.Service {

 			Name: ns,

 		},

 		Spec: kapi.ServiceSpec{

-			Selector:   map[string]string{"name": ns},

-			TargetPort: kubeutil.IntOrString{Kind: kubeutil.IntstrInt, IntVal: 8080},

-			Port:       8080,

+			Selector: map[string]string{"name": ns},

+			Ports: []kapi.ServicePort{{

+				Port:       8080,

+				TargetPort: kubeutil.IntOrString{Kind: kubeutil.IntstrInt, IntVal: 8080},

+			}},

 		},

 	}

 	if service, err := client.Services(ns).Create(service); err != nil {