@@ -1,5 +1,6 @@

 {

   "id": "guestbook",

+  "apiVersion": "v1beta1",

   "kind": "Template",

   "name": "guestbook-example",

   "description": "Example shows how to build a simple multi-tier application using Kubernetes and Docker",

@@ -13,22 +13,22 @@ import (

 type okOsClient struct{}

-func (_ *okOsClient) ListBuilds(selector labels.Selector) (api.BuildList, error) {

-	return api.BuildList{}, nil

+func (_ *okOsClient) ListBuilds(selector labels.Selector) (*api.BuildList, error) {

+	return &api.BuildList{}, nil

 }

-func (_ *okOsClient) UpdateBuild(api.Build) (api.Build, error) {

-	return api.Build{}, nil

+func (_ *okOsClient) UpdateBuild(*api.Build) (*api.Build, error) {

+	return &api.Build{}, nil

 }

 type errOsClient struct{}

-func (_ *errOsClient) ListBuilds(selector labels.Selector) (api.BuildList, error) {

-	return api.BuildList{}, errors.New("ListBuild error!")

+func (_ *errOsClient) ListBuilds(selector labels.Selector) (*api.BuildList, error) {

+	return &api.BuildList{}, errors.New("ListBuild error!")

 }

-func (_ *errOsClient) UpdateBuild(build api.Build) (api.Build, error) {

-	return api.Build{}, errors.New("UpdateBuild error!")

+func (_ *errOsClient) UpdateBuild(build *api.Build) (*api.Build, error) {

+	return &api.Build{}, errors.New("UpdateBuild error!")

 }

 type okStrategy struct{}

@@ -41,20 +41,20 @@ type errKubeClient struct {

 	kubeclient.Fake

 }

-func (_ *errKubeClient) CreatePod(pod kubeapi.Pod) (kubeapi.Pod, error) {

-	return kubeapi.Pod{}, errors.New("CreatePod error!")

+func (_ *errKubeClient) CreatePod(pod *kubeapi.Pod) (*kubeapi.Pod, error) {

+	return &kubeapi.Pod{}, errors.New("CreatePod error!")

 }

-func (_ *errKubeClient) GetPod(name string) (kubeapi.Pod, error) {

-	return kubeapi.Pod{}, errors.New("GedPod error!")

+func (_ *errKubeClient) GetPod(name string) (*kubeapi.Pod, error) {

+	return &kubeapi.Pod{}, errors.New("GedPod error!")

 }

 type okKubeClient struct {

 	kubeclient.Fake

 }

-func (_ *okKubeClient) GetPod(name string) (kubeapi.Pod, error) {

-	return kubeapi.Pod{

+func (_ *okKubeClient) GetPod(name string) (*kubeapi.Pod, error) {

+	return &kubeapi.Pod{

 		CurrentState: kubeapi.PodState{Status: kubeapi.PodTerminated},

 	}, nil

 }

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

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

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

-	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"

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

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

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

+

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

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

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

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

 )

@@ -107,7 +107,7 @@ func TestListBuildsError(t *testing.T) {

 		Err: fmt.Errorf("test error"),

 	}

 	storage := REST{&mockRegistry}

-	builds, err := storage.List(nil)

+	builds, err := storage.List(nil, nil)

 	if err != mockRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

 	}

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

 func TestListEmptyBuildList(t *testing.T) {

 	mockRegistry := test.BuildRegistry{Builds: &api.BuildList{JSONBase: kubeapi.JSONBase{ResourceVersion: 1}}}

 	storage := REST{&mockRegistry}

-	builds, err := storage.List(labels.Everything())

+	builds, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -150,7 +150,7 @@ func TestListBuilds(t *testing.T) {

 		},

 	}

 	storage := REST{registry: &mockRegistry}

-	buildsObj, err := storage.List(labels.Everything())

+	buildsObj, err := storage.List(labels.Everything(), labels.Everything())

 	builds := buildsObj.(*api.BuildList)

 	if err != nil {

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

@@ -175,13 +175,13 @@ func TestBuildDecode(t *testing.T) {

 			ID: "foo",

 		},

 	}

-	body, err := runtime.Encode(build)

+	body, err := latest.Codec.Encode(build)

 	if err != nil {

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

 	}

 	buildOut := storage.New()

-	if err := runtime.DecodeInto(body, buildOut); err != nil {

+	if err := latest.Codec.DecodeInto(body, buildOut); err != nil {

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

 	}

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

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

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

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

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

+

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

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

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

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

 )

@@ -107,7 +107,7 @@ func TestListConfigsError(t *testing.T) {

 		Err: fmt.Errorf("test error"),

 	}

 	storage := REST{&mockRegistry}

-	configs, err := storage.List(nil)

+	configs, err := storage.List(nil, nil)

 	if err != mockRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

 	}

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

 func TestListEmptyConfigList(t *testing.T) {

 	mockRegistry := test.BuildConfigRegistry{BuildConfigs: &api.BuildConfigList{JSONBase: kubeapi.JSONBase{ResourceVersion: 1}}}

 	storage := REST{&mockRegistry}

-	buildConfigs, err := storage.List(labels.Everything())

+	buildConfigs, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -150,7 +150,7 @@ func TestListConfigs(t *testing.T) {

 		},

 	}

 	storage := REST{&mockRegistry}

-	configsObj, err := storage.List(labels.Everything())

+	configsObj, err := storage.List(labels.Everything(), labels.Everything())

 	configs := configsObj.(*api.BuildConfigList)

 	if err != nil {

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

@@ -174,13 +174,13 @@ func TestBuildConfigDecode(t *testing.T) {

 			ID: "foo",

 		},

 	}

-	body, err := runtime.Encode(buildConfig)

+	body, err := latest.Codec.Encode(buildConfig)

 	if err != nil {

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

 	}

 	buildConfigOut := storage.New()

-	if err := runtime.DecodeInto(body, buildConfigOut); err != nil {

+	if err := latest.Codec.DecodeInto(body, buildConfigOut); err != nil {

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

 	}

@@ -9,20 +9,19 @@ import (

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

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

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

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

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

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

 )

 func NewTestEtcd(client tools.EtcdClient) *Etcd {

-	registry := NewEtcd(client)

-	return registry

+	return New(tools.EtcdHelper{client, latest.Codec, latest.ResourceVersioner})

 }

 func TestEtcdGetBuild(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/registry/builds/foo", runtime.EncodeOrDie(api.Build{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/registry/builds/foo", runtime.EncodeOrDie(latest.Codec, &api.Build{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	build, err := registry.GetBuild("foo")

 	if err != nil {

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

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

 	}

 	var build api.Build

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &build)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &build)

 	if err != nil {

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

 	}

@@ -96,7 +95,7 @@ func TestEtcdCreateBuildAlreadyExisting(t *testing.T) {

 	fakeClient.Data["/registry/builds/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.Build{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.Build{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -117,7 +116,7 @@ func TestEtcdDeleteBuild(t *testing.T) {

 	fakeClient.TestIndex = true

 	key := "/registry/builds/foo"

-	fakeClient.Set(key, runtime.EncodeOrDie(api.Build{

+	fakeClient.Set(key, runtime.EncodeOrDie(latest.Codec, &api.Build{

 		JSONBase: kubeapi.JSONBase{ID: "foo"},

 	}), 0)

 	registry := NewTestEtcd(fakeClient)

@@ -163,12 +162,12 @@ func TestEtcdListBuilds(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.Build{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Build{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.Build{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Build{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 						}),

 					},

@@ -190,7 +189,7 @@ func TestEtcdListBuilds(t *testing.T) {

 func TestEtcdGetBuildConfig(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/registry/build-configs/foo", runtime.EncodeOrDie(api.BuildConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/registry/build-configs/foo", runtime.EncodeOrDie(latest.Codec, &api.BuildConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	buildConfig, err := registry.GetBuildConfig("foo")

 	if err != nil {

@@ -247,7 +246,7 @@ func TestEtcdCreateBuildConfig(t *testing.T) {

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

 	}

 	var buildConfig api.BuildConfig

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &buildConfig)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &buildConfig)

 	if err != nil {

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

 	}

@@ -262,7 +261,7 @@ func TestEtcdCreateBuildConfigAlreadyExisting(t *testing.T) {

 	fakeClient.Data["/registry/build-configs/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.BuildConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.BuildConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -283,7 +282,7 @@ func TestEtcdDeleteBuildConfig(t *testing.T) {

 	fakeClient.TestIndex = true

 	key := "/registry/build-configs/foo"

-	fakeClient.Set(key, runtime.EncodeOrDie(api.BuildConfig{

+	fakeClient.Set(key, runtime.EncodeOrDie(latest.Codec, &api.BuildConfig{

 		JSONBase: kubeapi.JSONBase{ID: "foo"},

 	}), 0)

 	registry := NewTestEtcd(fakeClient)

@@ -329,12 +328,12 @@ func TestEtcdListBuildConfigs(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.BuildConfig{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.BuildConfig{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.BuildConfig{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.BuildConfig{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 						}),

 					},

@@ -27,8 +27,8 @@ func TestDockerCreateBuildPod(t *testing.T) {

 		t.Errorf("Expected %s image, got %s!", container.Image,

 			strategy.dockerBuilderImage)

 	}

-	if container.RestartPolicy != "runOnce" {

-		t.Errorf("Expected runOnce, but got %s!", container.RestartPolicy)

+	if actual.DesiredState.Manifest.RestartPolicy.Never == nil {

+		t.Errorf("Expected never, got %#v", actual.DesiredState.Manifest.RestartPolicy)

 	}

 	if e := container.Env[0]; e.Name != "BUILD_TAG" && e.Value != expected.Input.ImageTag {

 		t.Errorf("Expected %s, got %s:%s!", expected.Input.ImageTag, e.Name, e.Value)

@@ -33,8 +33,8 @@ func TestSTICreateBuildPod(t *testing.T) {

 		t.Errorf("Expected %s image, got %s!", container.Image,

 			strategy.stiBuilderImage)

 	}

-	if container.RestartPolicy != "runOnce" {

-		t.Errorf("Expected runOnce, but got %s!", container.RestartPolicy)

+	if actual.DesiredState.Manifest.RestartPolicy.Never == nil {

+		t.Errorf("Expected never, got %#v", actual.DesiredState.Manifest.RestartPolicy)

 	}

 	if e := container.Env[0]; e.Name != "BUILD_TAG" || e.Value != expected.Input.ImageTag {

 		t.Errorf("Expected %s, got %s:%s!", expected.Input.ImageTag, e.Name, e.Value)

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

 	"io/ioutil"

 	"testing"

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

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

 	clientapi "github.com/openshift/origin/pkg/cmd/client/api"

 )

@@ -40,10 +41,10 @@ func TestApply(t *testing.T) {

 }

 func TestGetClientAndPath(t *testing.T) {

-	kubeClient, _ := kubeclient.New("127.0.0.1", nil)

+	kubeClient, _ := kubeclient.New("127.0.0.1", "", nil)

 	testClientMappings := clientapi.ClientMappings{

-		"pods":     {"Pod", kubeClient.RESTClient},

-		"services": {"Service", kubeClient.RESTClient},

+		"pods":     {"Pod", kubeClient.RESTClient, klatest.Codec},

+		"services": {"Service", kubeClient.RESTClient, klatest.Codec},

 	}

 	client, path := getClientAndPath("Service", testClientMappings)

 	if client != kubeClient.RESTClient {

@@ -55,10 +56,10 @@ func TestGetClientAndPath(t *testing.T) {

 }

 func ExampleApply() {

-	kubeClient, _ := kubeclient.New("127.0.0.1", nil)

+	kubeClient, _ := kubeclient.New("127.0.0.1", "", nil)

 	testClientMappings := clientapi.ClientMappings{

-		"pods":     {"Pod", kubeClient.RESTClient},

-		"services": {"Service", kubeClient.RESTClient},

+		"pods":     {"Pod", kubeClient.RESTClient, klatest.Codec},

+		"services": {"Service", kubeClient.RESTClient, klatest.Codec},

 	}

 	data, _ := ioutil.ReadFile("config_test.json")

 	Apply(data, testClientMappings)

@@ -20,7 +20,7 @@ func TestListDeploymentsError(t *testing.T) {

 		registry: mockRegistry,

 	}

-	deployments, err := storage.List(nil)

+	deployments, err := storage.List(nil, nil)

 	if err != mockRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

 	}

@@ -40,7 +40,7 @@ func TestListDeploymentsEmptyList(t *testing.T) {

 		registry: mockRegistry,

 	}

-	deployments, err := storage.List(labels.Everything())

+	deployments, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

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

 		registry: mockRegistry,

 	}

-	list, err := storage.List(labels.Everything())

+	list, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -86,7 +86,7 @@ func TestListDeploymentsPopulatedList(t *testing.T) {

 func TestCreateDeploymentBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Create("hello")

+	channel, err := storage.Create(&api.DeploymentList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

@@ -205,7 +205,7 @@ func TestGetDeploymentOK(t *testing.T) {

 func TestUpdateDeploymentBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Update("hello")

+	channel, err := storage.Update(&api.DeploymentConfig{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

@@ -20,7 +20,7 @@ func TestListDeploymentConfigsError(t *testing.T) {

 		registry: mockRegistry,

 	}

-	deploymentConfigs, err := storage.List(nil)

+	deploymentConfigs, err := storage.List(nil, nil)

 	if err != mockRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

 	}

@@ -40,7 +40,7 @@ func TestListDeploymentConfigsEmptyList(t *testing.T) {

 		registry: mockRegistry,

 	}

-	deploymentConfigs, err := storage.List(labels.Everything())

+	deploymentConfigs, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

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

 		registry: mockRegistry,

 	}

-	list, err := storage.List(labels.Everything())

+	list, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -86,7 +86,7 @@ func TestListDeploymentConfigsPopulatedList(t *testing.T) {

 func TestCreateDeploymentConfigBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Create("hello")

+	channel, err := storage.Create(&api.DeploymentList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

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

 func TestUpdateDeploymentConfigBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Update("hello")

+	channel, err := storage.Update(&api.DeploymentList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

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

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

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

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

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

-	_ "github.com/openshift/origin/pkg/deploy/api/v1beta1"

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

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

 )

 func NewTestEtcd(client tools.EtcdClient) *Etcd {

-	return NewEtcd(client)

+	return New(tools.EtcdHelper{client, latest.Codec, latest.ResourceVersioner})

 }

 func TestEtcdListEmptyDeployments(t *testing.T) {

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

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.Deployment{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

 					},

 				},

 			},

@@ -98,13 +98,13 @@ func TestEtcdListFilteredDeployments(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.Deployment{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 							Labels:   map[string]string{"env": "prod"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.Deployment{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 							Labels:   map[string]string{"env": "dev"},

 						}),

@@ -127,7 +127,7 @@ func TestEtcdListFilteredDeployments(t *testing.T) {

 func TestEtcdGetDeployments(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/deployments/foo", runtime.EncodeOrDie(api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/deployments/foo", runtime.EncodeOrDie(latest.Codec, &api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	deployment, err := registry.GetDeployment("foo")

 	if err != nil {

@@ -181,7 +181,7 @@ func TestEtcdCreateDeployments(t *testing.T) {

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

 	}

 	var deployment api.Deployment

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &deployment)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &deployment)

 	if err != nil {

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

 	}

@@ -196,7 +196,7 @@ func TestEtcdCreateAlreadyExistsDeployments(t *testing.T) {

 	fakeClient.Data["/deployments/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.Deployment{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -312,10 +312,10 @@ func TestEtcdListEverythingDeploymentConfig(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

 					},

 				},

 			},

@@ -341,13 +341,13 @@ func TestEtcdListFilteredDeploymentConfig(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.DeploymentConfig{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 							Labels:   map[string]string{"env": "prod"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.DeploymentConfig{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 							Labels:   map[string]string{"env": "dev"},

 						}),

@@ -370,7 +370,7 @@ func TestEtcdListFilteredDeploymentConfig(t *testing.T) {

 func TestEtcdGetDeploymentConfig(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/deploymentConfigs/foo", runtime.EncodeOrDie(api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/deploymentConfigs/foo", runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	deployment, err := registry.GetDeploymentConfig("foo")

 	if err != nil {

@@ -424,7 +424,7 @@ func TestEtcdCreateDeploymentConfig(t *testing.T) {

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

 	}

 	var d api.DeploymentConfig

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &d)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &d)

 	if err != nil {

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

 	}

@@ -439,7 +439,7 @@ func TestEtcdCreateAlreadyExistsDeploymentConfig(t *testing.T) {

 	fakeClient.Data["/deploymentConfigs/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.DeploymentConfig{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -13,12 +13,13 @@ import (

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

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

 	"github.com/fsouza/go-dockerclient"

+

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

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

-	_ "github.com/openshift/origin/pkg/image/api/v1beta1"

 )

 func NewTestEtcd(client tools.EtcdClient) *Etcd {

-	return NewEtcd(client)

+	return New(tools.EtcdHelper{client, latest.Codec, latest.ResourceVersioner})

 }

 func TestEtcdListImagesEmpty(t *testing.T) {

@@ -71,10 +72,10 @@ func TestEtcdListImagesEverything(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.Image{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Image{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

 					},

 				},

 			},

@@ -100,13 +101,13 @@ func TestEtcdListImagesFiltered(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.Image{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Image{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 							Labels:   map[string]string{"env": "prod"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.Image{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.Image{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 							Labels:   map[string]string{"env": "dev"},

 						}),

@@ -129,7 +130,7 @@ func TestEtcdListImagesFiltered(t *testing.T) {

 func TestEtcdGetImage(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/images/foo", runtime.EncodeOrDie(api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/images/foo", runtime.EncodeOrDie(latest.Codec, &api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	image, err := registry.GetImage("foo")

 	if err != nil {

@@ -187,7 +188,7 @@ func TestEtcdCreateImage(t *testing.T) {

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

 	}

 	var image api.Image

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &image)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &image)

 	if err != nil {

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

 	}

@@ -210,7 +211,7 @@ func TestEtcdCreateImageAlreadyExists(t *testing.T) {

 	fakeClient.Data["/images/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.Image{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -326,10 +327,10 @@ func TestEtcdListImageRepositoriesEverything(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

+						Value: runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "bar"}}),

 					},

 				},

 			},

@@ -355,13 +356,13 @@ func TestEtcdListImageRepositoriesFiltered(t *testing.T) {

 			Node: &etcd.Node{

 				Nodes: []*etcd.Node{

 					{

-						Value: runtime.EncodeOrDie(api.ImageRepository{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{

 							JSONBase: kubeapi.JSONBase{ID: "foo"},

 							Labels:   map[string]string{"env": "prod"},

 						}),

 					},

 					{

-						Value: runtime.EncodeOrDie(api.ImageRepository{

+						Value: runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{

 							JSONBase: kubeapi.JSONBase{ID: "bar"},

 							Labels:   map[string]string{"env": "dev"},

 						}),

@@ -384,7 +385,7 @@ func TestEtcdListImageRepositoriesFiltered(t *testing.T) {

 func TestEtcdGetImageRepository(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

-	fakeClient.Set("/imageRepositories/foo", runtime.EncodeOrDie(api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	fakeClient.Set("/imageRepositories/foo", runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	repo, err := registry.GetImageRepository("foo")

 	if err != nil {

@@ -441,7 +442,7 @@ func TestEtcdCreateImageRepository(t *testing.T) {

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

 	}

 	var repo api.ImageRepository

-	err = runtime.DecodeInto([]byte(resp.Node.Value), &repo)

+	err = latest.Codec.DecodeInto([]byte(resp.Node.Value), &repo)

 	if err != nil {

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

 	}

@@ -468,7 +469,7 @@ func TestEtcdCreateImageRepositoryAlreadyExists(t *testing.T) {

 	fakeClient.Data["/imageRepositories/foo"] = tools.EtcdResponseWithError{

 		R: &etcd.Response{

 			Node: &etcd.Node{

-				Value: runtime.EncodeOrDie(api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

+				Value: runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}),

 			},

 		},

 		E: nil,

@@ -491,7 +492,7 @@ func TestEtcdUpdateImageRepository(t *testing.T) {

 	fakeClient := tools.NewFakeEtcdClient(t)

 	fakeClient.TestIndex = true

-	resp, _ := fakeClient.Set("/imageRepositories/foo", runtime.EncodeOrDie(api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

+	resp, _ := fakeClient.Set("/imageRepositories/foo", runtime.EncodeOrDie(latest.Codec, &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}), 0)

 	registry := NewTestEtcd(fakeClient)

 	err := registry.UpdateImageRepository(&api.ImageRepository{

 		JSONBase:              kubeapi.JSONBase{ID: "foo", ResourceVersion: resp.Node.ModifiedIndex},

@@ -562,7 +563,7 @@ func TestEtcdWatchImageRepositories(t *testing.T) {

 	fakeClient.WaitForWatchCompletion()

 	repo := &api.ImageRepository{JSONBase: kubeapi.JSONBase{ID: "foo"}}

-	repoBytes, _ := runtime.Codec.Encode(repo)

+	repoBytes, _ := latest.Codec.Encode(repo)

 	fakeClient.WatchResponse <- &etcd.Response{

 		Action: "set",

 		Node: &etcd.Node{

@@ -21,7 +21,7 @@ func TestListImagesError(t *testing.T) {

 		registry: mockRegistry,

 	}

-	images, err := storage.List(nil)

+	images, err := storage.List(nil, nil)

 	if err != mockRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)

 	}

@@ -41,7 +41,7 @@ func TestListImagesEmptyList(t *testing.T) {

 		registry: mockRegistry,

 	}

-	images, err := storage.List(labels.Everything())

+	images, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -72,7 +72,7 @@ func TestListImagesPopulatedList(t *testing.T) {

 		registry: mockRegistry,

 	}

-	list, err := storage.List(labels.Everything())

+	list, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -87,7 +87,7 @@ func TestListImagesPopulatedList(t *testing.T) {

 func TestCreateImageBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Create("hello")

+	channel, err := storage.Create(&api.ImageList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

@@ -54,7 +54,7 @@ func TestListImageRepositoriesError(t *testing.T) {

 		registry: mockRepositoryRegistry,

 	}

-	imageRepositories, err := storage.List(nil)

+	imageRepositories, err := storage.List(nil, nil)

 	if err != mockRepositoryRegistry.Err {

 		t.Errorf("Expected %#v, Got %#v", mockRepositoryRegistry.Err, err)

 	}

@@ -74,7 +74,7 @@ func TestListImageRepositoriesEmptyList(t *testing.T) {

 		registry: mockRepositoryRegistry,

 	}

-	imageRepositories, err := storage.List(labels.Everything())

+	imageRepositories, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -105,7 +105,7 @@ func TestListImageRepositoriesPopulatedList(t *testing.T) {

 		registry: mockRepositoryRegistry,

 	}

-	list, err := storage.List(labels.Everything())

+	list, err := storage.List(labels.Everything(), labels.Everything())

 	if err != nil {

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

 	}

@@ -120,7 +120,7 @@ func TestListImageRepositoriesPopulatedList(t *testing.T) {

 func TestCreateImageRepositoryBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Create("hello")

+	channel, err := storage.Create(&api.ImageList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

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

 func TestUpdateImageRepositoryBadObject(t *testing.T) {

 	storage := REST{}

-	channel, err := storage.Update("hello")

+	channel, err := storage.Update(&api.ImageList{})

 	if channel != nil {

 		t.Errorf("Expected nil, got %v", channel)

 	}

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

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

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

 	"github.com/fsouza/go-dockerclient"

+

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

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

 )

@@ -36,7 +37,7 @@ func TestListImageRepositoryMappings(t *testing.T) {

 	imageRepositoryRegistry := test.NewImageRepositoryRegistry()

 	storage := &REST{imageRegistry, imageRepositoryRegistry}

-	list, err := storage.List(labels.Everything())

+	list, err := storage.List(labels.Everything(), labels.Everything())

 	if list != nil {

 		t.Errorf("Unexpected non-nil list %#v", list)

 	}

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

 	imageRepositoryRegistry := test.NewImageRepositoryRegistry()

 	storage := &REST{imageRegistry, imageRepositoryRegistry}

-	channel, err := storage.Update("repo1")

+	channel, err := storage.Update(&api.ImageList{})

 	if channel != nil {

 		t.Errorf("Unexpected non-nil channel %#v", channel)

 	}

@@ -87,7 +88,7 @@ func TestCreateImageRepositoryMappingBadObject(t *testing.T) {

 	imageRepositoryRegistry := test.NewImageRepositoryRegistry()

 	storage := &REST{imageRegistry, imageRepositoryRegistry}

-	channel, err := storage.Create("bad object")

+	channel, err := storage.Create(&api.ImageList{})

 	if channel != nil {

 		t.Errorf("Unexpected non-nil channel %#v", channel)

 	}

@@ -68,6 +68,6 @@ func TestValidateTemplate(t *testing.T) {

 	shouldPass(template)

 	// Add Item of unknown Kind, should pass

-	template.Items = []runtime.Object{{}}

+	template.Items = []runtime.EmbeddedObject{{}}

 	shouldPass(template)

 }

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

 func TestNewStorageInvalidType(t *testing.T) {

 	storage := NewStorage()

-	_, err := storage.Create("string")

+	_, err := storage.Create(&kubeapi.Pod{})

 	if err == nil {

 		t.Errorf("Expected type error.")

 	}

@@ -18,7 +18,7 @@ func TestNewStorageInvalidType(t *testing.T) {

 func TestStorageNotImplementedFunctions(t *testing.T) {

 	storage := NewStorage()

-	if _, err := storage.List(nil); err == nil {

+	if _, err := storage.List(nil, nil); err == nil {

 		t.Errorf("Expected not implemented error.")

 	}

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

 	"testing"

 	"time"

-	_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta1"

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

 	"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"

 )

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

 func ExampleProcessTemplateParameters() {

 	var template api.Template

 	jsonData, _ := ioutil.ReadFile("../../examples/guestbook/template.json")

-	json.Unmarshal(jsonData, &template)

+	latest.Codec.DecodeInto(jsonData, &template)

 	generators := map[string]Generator{

 		"expression": NewExpressionValueGenerator(rand.New(rand.NewSource(1337))),

@@ -74,8 +75,8 @@ func ExampleProcessTemplateParameters() {

 	// Reset the timestamp for the output comparison

 	config.CreationTimestamp = util.Date(1980, 1, 1, 0, 0, 0, 0, time.UTC)