@@ -34,14 +34,30 @@ var Codec = v1beta1.Codec

 // TODO: when versioning changes, make this part of each API definition.

 var ResourceVersioner = runtime.NewJSONBaseResourceVersioner()

+// SelfLinker can set or get the SelfLink field of all API types.

+// TODO: when versioning changes, make this part of each API definition.

+// TODO(lavalamp): Combine SelfLinker & ResourceVersioner interfaces, force all uses

+// to go through the InterfacesFor method below.

+var SelfLinker = runtime.NewJSONBaseSelfLinker()

+

+// VersionInterfaces contains the interfaces one should use for dealing with types of a particular version.

+type VersionInterfaces struct {

+	runtime.Codec

+	runtime.ResourceVersioner

+	runtime.SelfLinker

+}

+

 // InterfacesFor returns the default Codec and ResourceVersioner for a given version

 // string, or an error if the version is not known.

-func InterfacesFor(version string) (codec runtime.Codec, versioner runtime.ResourceVersioner, err error) {

+func InterfacesFor(version string) (*VersionInterfaces, error) {

 	switch version {

 	case "v1beta1":

-		codec, versioner = v1beta1.Codec, ResourceVersioner

+		return &VersionInterfaces{

+			Codec:             v1beta1.Codec,

+			ResourceVersioner: ResourceVersioner,

+			SelfLinker:        SelfLinker,

+		}, nil

 	default:

-		err = fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(Versions, ", "))

+		return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(Versions, ", "))

 	}

-	return

 }

@@ -110,7 +110,7 @@ func (bc *BuildController) synchronize(build *api.Build) (api.BuildStatus, error

 		}

 		glog.Infof("Attempting to create pod: %#v", podSpec)

-		_, err = bc.kubeClient.CreatePod(podSpec)

+		_, err = bc.kubeClient.CreatePod(kubeapi.NewContext(), podSpec)

 		// TODO: strongly typed error checking

 		if err != nil {

@@ -127,7 +127,7 @@ func (bc *BuildController) synchronize(build *api.Build) (api.BuildStatus, error

 			return api.BuildFailed, fmt.Errorf("Build timed out")

 		}

-		pod, err := bc.kubeClient.GetPod(build.PodID)

+		pod, err := bc.kubeClient.GetPod(kubeapi.NewContext(), build.PodID)

 		if err != nil {

 			return build.Status, fmt.Errorf("Error retrieving pod for build ID %v: %#v", build.ID, err)

 		}

@@ -141,7 +141,7 @@ func (bc *BuildController) synchronize(build *api.Build) (api.BuildStatus, error

 		// check the exit codes of all the containers in the pod

 		for _, info := range pod.CurrentState.Info {

-			if info.State.ExitCode != 0 {

+			if info.State.Termination != nil && info.State.Termination.ExitCode != 0 {

 				nextStatus = api.BuildFailed

 			}

 		}

@@ -31,7 +31,7 @@ func (r *REST) New() runtime.Object {

 }

 // List obtains a list of Builds that match selector.

-func (r *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

+func (r *REST) List(ctx kubeapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

 	builds, err := r.registry.ListBuilds(selector)

 	if err != nil {

 		return nil, err

@@ -41,7 +41,7 @@ func (r *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

 }

 // Get obtains the build specified by its id.

-func (r *REST) Get(id string) (runtime.Object, error) {

+func (r *REST) Get(ctx kubeapi.Context, id string) (runtime.Object, error) {

 	build, err := r.registry.GetBuild(id)

 	if err != nil {

 		return nil, err

@@ -50,14 +50,14 @@ func (r *REST) Get(id string) (runtime.Object, error) {

 }

 // Delete asynchronously deletes the Build specified by its id.

-func (r *REST) Delete(id string) (<-chan runtime.Object, error) {

+func (r *REST) Delete(ctx kubeapi.Context, id string) (<-chan runtime.Object, error) {

 	return apiserver.MakeAsync(func() (runtime.Object, error) {

 		return &kubeapi.Status{Status: kubeapi.StatusSuccess}, r.registry.DeleteBuild(id)

 	}), nil

 }

 // Create registers a given new Build instance to r.registry.

-func (r *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

+func (r *REST) Create(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	build, ok := obj.(*api.Build)

 	if !ok {

 		return nil, fmt.Errorf("not a build: %#v", obj)

@@ -82,7 +82,7 @@ func (r *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

 }

 // Update replaces a given Build instance with an existing instance in r.registry.

-func (r *REST) Update(obj runtime.Object) (<-chan runtime.Object, error) {

+func (r *REST) Update(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	build, ok := obj.(*api.Build)

 	if !ok {

 		return nil, fmt.Errorf("not a build: %#v", obj)

@@ -31,7 +31,7 @@ func (r *REST) New() runtime.Object {

 }

 // List obtains a list of BuildConfigs that match selector.

-func (r *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

+func (r *REST) List(ctx kubeapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

 	builds, err := r.registry.ListBuildConfigs(selector)

 	if err != nil {

 		return nil, err

@@ -40,7 +40,7 @@ func (r *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

 }

 // Get obtains the BuildConfig specified by its id.

-func (r *REST) Get(id string) (runtime.Object, error) {

+func (r *REST) Get(ctx kubeapi.Context, id string) (runtime.Object, error) {

 	buildConfig, err := r.registry.GetBuildConfig(id)

 	if err != nil {

 		return nil, err

@@ -49,14 +49,14 @@ func (r *REST) Get(id string) (runtime.Object, error) {

 }

 // Delete asynchronously deletes the BuildConfig specified by its id.

-func (r *REST) Delete(id string) (<-chan runtime.Object, error) {

+func (r *REST) Delete(ctx kubeapi.Context, id string) (<-chan runtime.Object, error) {

 	return apiserver.MakeAsync(func() (runtime.Object, error) {

 		return &kubeapi.Status{Status: kubeapi.StatusSuccess}, r.registry.DeleteBuildConfig(id)

 	}), nil

 }

 // Create registers a given new BuildConfig instance to r.registry.

-func (r *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

+func (r *REST) Create(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	buildConfig, ok := obj.(*api.BuildConfig)

 	if !ok {

 		return nil, fmt.Errorf("not a buildConfig: %#v", obj)

@@ -78,7 +78,7 @@ func (r *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

 }

 // Update replaces a given BuildConfig instance with an existing instance in r.registry.

-func (r *REST) Update(obj runtime.Object) (<-chan runtime.Object, error) {

+func (r *REST) Update(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	buildConfig, ok := obj.(*api.BuildConfig)

 	if !ok {

 		return nil, fmt.Errorf("not a buildConfig: %#v", obj)

@@ -53,7 +53,7 @@ func (r *Etcd) GetBuild(id string) (*api.Build, error) {

 // CreateBuild creates a new Build.

 func (r *Etcd) CreateBuild(build *api.Build) error {

-	err := r.CreateObj(makeBuildKey(build.ID), build)

+	err := r.CreateObj(makeBuildKey(build.ID), build, 0)

 	return etcderr.InterpretCreateError(err, "build", build.ID)

 }

@@ -103,7 +103,7 @@ func (r *Etcd) GetBuildConfig(id string) (*api.BuildConfig, error) {

 // CreateBuildConfig creates a new BuildConfig.

 func (r *Etcd) CreateBuildConfig(config *api.BuildConfig) error {

-	err := r.CreateObj(makeBuildConfigKey(config.ID), config)

+	err := r.CreateObj(makeBuildConfigKey(config.ID), config, 0)

 	return etcderr.InterpretCreateError(err, "buildConfig", config.ID)

 }

@@ -78,7 +78,7 @@ func (bs *STIBuildStrategy) setupTempVolume(pod *api.Pod) error {

 	tmpVolume := api.Volume{

 		Name: "tmp",

 		Source: &api.VolumeSource{

-			HostDirectory: &api.HostDirectory{

+			HostDir: &api.HostDir{

 				Path: tempDir,

 			},

 		},

@@ -12,7 +12,7 @@ func setupDockerSocket(podSpec *api.Pod) {

 	dockerSocketVolume := api.Volume{

 		Name: "docker-socket",

 		Source: &api.VolumeSource{

-			HostDirectory: &api.HostDirectory{

+			HostDir: &api.HostDir{

 				Path: "/var/run/docker.sock",

 			},

 		},

@@ -39,7 +39,7 @@ func setupDockerConfig(podSpec *api.Pod) {

 	dockerConfigVolume := api.Volume{

 		Name: "docker-cfg",

 		Source: &api.VolumeSource{

-			HostDirectory: &api.HostDirectory{

+			HostDir: &api.HostDir{

 				Path: dockerConfig,

 			},

 		},

@@ -1,9 +1,6 @@

 package client

 import (

-	"fmt"

-	"strings"

-

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

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

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

@@ -98,23 +95,33 @@ type Client struct {

 	*kubeclient.RESTClient

 }

-// New creates and returns a new Client.

-func New(host, version string, auth *kubeclient.AuthInfo) (*Client, error) {

-	if version == "" {

+// New creates an OpenShift client for the given config. This client works with builds, deployments,

+// templates, routes, and images. It allows operations such as list, get, update and delete on these

+// objects. An error is returned if the provided configuration is not valid.

+func New(c *kubeclient.Config) (*Client, error) {

+	config := *c

+	if config.Prefix == "" {

+		config.Prefix = "/osapi"

+	}

+	if config.Version == "" {

 		// Clients default to the preferred code API version

-		// TODO: implement version negotation (highest version supported by server)

-		version = latest.Version

+		// TODO: implement version negotiation (highest version supported by server)

+		config.Version = latest.Version

 	}

-	serverCodec, _, err := latest.InterfacesFor(version)

+	client, err := kubeclient.RESTClientFor(&config)

 	if err != nil {

-		return nil, fmt.Errorf("API version '%s' is not recognized (valid values: %s)", version, strings.Join(latest.Versions, ", "))

+		return nil, err

 	}

-	prefix := fmt.Sprintf("/osapi/%s/", version)

-	restClient, err := kubeclient.NewRESTClient(host, auth, prefix, serverCodec)

+	return &Client{client}, nil

+}

+

+// NewOrDie creates an OpenShift client and panics if the provided API version is not recognized.

+func NewOrDie(c *kubeclient.Config) *Client {

+	client, err := New(c)

 	if err != nil {

-		return nil, fmt.Errorf("API URL '%s' is not valid: %v", host, err)

+		panic(err)

 	}

-	return &Client{restClient}, nil

+	return client

 }

 // CreateBuild creates new build. Returns the server's representation of the build and error if one occurs.

@@ -31,7 +31,7 @@ func NewCommandKubecfg(name string) *cobra.Command {

 	flag := cmd.Flags()

 	flag.BoolVar(&cfg.ServerVersion, "server_version", false, "Print the server's version number.")

 	flag.BoolVar(&cfg.PreventSkew, "expect_version_match", false, "Fail if server's version doesn't match own version.")

-	flag.StringVarP(&cfg.HttpServer, "host", "h", "", "The host to connect to.")

+	flag.StringVarP(&cfg.ClientConfig.Host, "host", "h", "", "The host to connect to.")

 	flag.StringVarP(&cfg.Config, "config", "c", "", "Path or URL to the config file, or '-' to read from STDIN")

 	flag.StringVarP(&cfg.Selector, "label", "l", "", "Selector (label query) to use for listing")

 	flag.DurationVarP(&cfg.UpdatePeriod, "update", "u", 60*time.Second, "Update interval period")

@@ -45,9 +45,10 @@ func NewCommandKubecfg(name string) *cobra.Command {

 	flag.StringVar(&cfg.WWW, "www", "", "If -proxy is true, use this directory to serve static files")

 	flag.StringVar(&cfg.TemplateFile, "template_file", "", "If present, load this file as a golang template and use it for output printing")

 	flag.StringVar(&cfg.TemplateStr, "template", "", "If present, parse this string as a golang template and use it for output printing")

-	flag.StringVar(&cfg.CAFile, "certificate_authority", "", "Path to a cert. file for the certificate authority")

-	flag.StringVar(&cfg.CertFile, "client_certificate", "", "Path to a client certificate for TLS.")

-	flag.StringVar(&cfg.KeyFile, "client_key", "", "Path to a client key file for TLS.")

+	flag.StringVar(&cfg.ClientConfig.CAFile, "certificate_authority", "", "Path to a cert. file for the certificate authority")

+	flag.StringVar(&cfg.ClientConfig.CertFile, "client_certificate", "", "Path to a client certificate for TLS.")

+	flag.StringVar(&cfg.ClientConfig.KeyFile, "client_key", "", "Path to a client key file for TLS.")

+	flag.BoolVar(&cfg.ClientConfig.Insecure, "insecure_skip_tls_verify", false, "If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure.")

 	flag.StringVar(&cfg.ImageName, "image", "", "Image used when updating a replicationController.  Will apply to the first container in the pod template.")

 	return cmd

@@ -54,9 +54,9 @@ import (

 )

 type KubeConfig struct {

+	ClientConfig   kubeclient.Config

 	ServerVersion  bool

 	PreventSkew    bool

-	HttpServer     string

 	Config         string

 	TemplateConfig string

 	Selector       string

@@ -74,10 +74,6 @@ type KubeConfig struct {

 	ImageName string

-	CAFile   string

-	CertFile string

-	KeyFile  string

-

 	APIVersion   string

 	OSAPIVersion string

@@ -193,48 +189,47 @@ func (c *KubeConfig) Run() {

 	util.InitLogs()

 	defer util.FlushLogs()

-	var masterServer string

-	if len(c.HttpServer) > 0 {

-		masterServer = c.HttpServer

-	} else if len(os.Getenv("KUBERNETES_MASTER")) > 0 {

-		masterServer = os.Getenv("KUBERNETES_MASTER")

-	} else {

-		masterServer = "http://localhost:8080"

-	}

-	kubeClient, err := kubeclient.New(masterServer, c.APIVersion, nil)

-	if err != nil {

-		glog.Fatalf("Unable to parse %s as a URL: %v", masterServer, err)

+	clientConfig := &c.ClientConfig

+	// Initialize the client

+	if clientConfig.Host == "" {

+		clientConfig.Host = os.Getenv("KUBERNETES_MASTER")

 	}

-	client, err := osclient.New(masterServer, c.OSAPIVersion, nil)

-	if err != nil {

-		glog.Fatalf("Unable to parse %s as a URL: %v", masterServer, err)

+	if clientConfig.Host == "" {

+		// TODO: eventually apiserver should start on 443 and be secure by default

+		clientConfig.Host = "http://localhost:8080"

 	}

-	// TODO: this won't work if TLS is enabled with client cert auth, but no

-	// passwords are required. Refactor when we address client auth abstraction.

-	if kubeClient.Secure() {

+	if kubeclient.IsConfigTransportSecure(clientConfig) {

 		auth, err := kubecfg.LoadAuthInfo(c.AuthConfig, os.Stdin)

 		if err != nil {

 			glog.Fatalf("Error loading auth: %v", err)

 		}

-		if c.CAFile != "" {

-			auth.CAFile = c.CAFile

-		}

-		if c.CertFile != "" {

-			auth.CertFile = c.CertFile

+		clientConfig.Username = auth.User

+		clientConfig.Password = auth.Password

+		if auth.CAFile != "" {

+			clientConfig.CAFile = auth.CAFile

 		}

-		if c.KeyFile != "" {

-			auth.KeyFile = c.KeyFile

+		if auth.CertFile != "" {

+			clientConfig.CertFile = auth.CertFile

 		}

-		kubeClient, err = kubeclient.New(masterServer, c.APIVersion, auth)

-		if err != nil {

-			glog.Fatalf("Unable to parse %s as a URL: %v", masterServer, err)

+		if auth.KeyFile != "" {

+			clientConfig.KeyFile = auth.KeyFile

 		}

-		client, err = osclient.New(masterServer, c.OSAPIVersion, auth)

-		if err != nil {

-			glog.Fatalf("Unable to parse %s as a URL: %v", masterServer, err)

+		if auth.Insecure != nil {

+			clientConfig.Insecure = *auth.Insecure

 		}

 	}

+	clientConfig.Version = c.APIVersion

+	kubeClient, err := kubeclient.New(clientConfig)

+	if err != nil {

+		glog.Fatalf("Unable to set up the Kubernetes API client: %v", err)

+	}

+

+	clientConfig.Version = c.OSAPIVersion

+	client, err := osclient.New(clientConfig)

+	if err != nil {

+		glog.Fatalf("Unable to set up the OpenShift API client: %v", err)

+	}

 	// check the kubernetes server version

 	if c.ServerVersion {

@@ -438,14 +433,15 @@ func (c *KubeConfig) executeControllerRequest(method string, client *kubeclient.

 		return c.Arg(1)

 	}

+	ctx := api.NewContext()

 	var err error

 	switch method {

 	case "stop":

-		err = kubecfg.StopController(parseController(), client)

+		err = kubecfg.StopController(ctx, parseController(), client)

 	case "rm":

-		err = kubecfg.DeleteController(parseController(), client)

+		err = kubecfg.DeleteController(ctx, parseController(), client)

 	case "rollingupdate":

-		err = kubecfg.Update(parseController(), client, c.UpdatePeriod, c.ImageName)

+		err = kubecfg.Update(ctx, parseController(), client, c.UpdatePeriod, c.ImageName)

 	case "run":

 		if len(c.Args) != 4 {

 			glog.Fatal("usage: kubecfg [OPTIONS] run <image> <replicas> <controller>")

@@ -456,7 +452,7 @@ func (c *KubeConfig) executeControllerRequest(method string, client *kubeclient.

 		if err != nil {

 			glog.Fatalf("Error parsing replicas: %v", err)

 		}

-		err = kubecfg.RunController(image, name, replicas, client, c.PortSpec, c.ServicePort)

+		err = kubecfg.RunController(ctx, image, name, replicas, client, c.PortSpec, c.ServicePort)

 	case "resize":

 		args := c.Args

 		if len(args) < 3 {

@@ -467,7 +463,7 @@ func (c *KubeConfig) executeControllerRequest(method string, client *kubeclient.

 		if err != nil {

 			glog.Fatalf("Error parsing replicas: %v", err)

 		}

-		err = kubecfg.ResizeController(name, replicas, client)

+		err = kubecfg.ResizeController(ctx, name, replicas, client)

 	default:

 		return false

 	}

@@ -50,16 +50,16 @@ import (

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

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

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

-	routeregistry "github.com/openshift/origin/pkg/route/registry/route"

 	routeetcd "github.com/openshift/origin/pkg/route/registry/etcd"

+	routeregistry "github.com/openshift/origin/pkg/route/registry/route"

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

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

 	// Register versioned api types

 	_ "github.com/openshift/origin/pkg/config/api/v1beta1"

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

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

 	_ "github.com/openshift/origin/pkg/route/api/v1beta1"

+	_ "github.com/openshift/origin/pkg/template/api/v1beta1"

 )

 func NewCommandStartAllInOne(name string) *cobra.Command {

@@ -73,6 +73,7 @@ func NewCommandStartAllInOne(name string) *cobra.Command {

 			cfg.masterHost = env("OPENSHIFT_MASTER", "127.0.0.1")

 			cfg.bindAddr = env("OPENSHIFT_BIND_ADDR", "127.0.0.1")

 			cfg.nodeHosts = []string{"127.0.0.1"}

+			cfg.networkContainerImage = env("KUBERNETES_NETWORK_CONTAINER_IMAGE", kubelet.NetworkContainerImage)

 			if len(os.Getenv("OPENSHIFT_MASTER")) > 0 {

 				if cfg.masterHost == cfg.bindAddr {

@@ -106,10 +107,13 @@ type config struct {

 	VolumeDir  string

 	EtcdDir    string

 	Docker     docker.Helper

+

 	masterHost string

 	nodeHosts  []string

 	bindAddr   string

+	networkContainerImage string

+

 	storageVersion string

 }

@@ -121,15 +125,15 @@ func (c *config) newEtcdHelper() (helper tools.EtcdHelper, err error) {

 	if version == "" {

 		version = latest.Version

 	}

-	codec, versioner, err := latest.InterfacesFor(version)

+	interfaces, err := latest.InterfacesFor(version)

 	if err != nil {

 		return helper, err

 	}

-	return tools.EtcdHelper{client, codec, versioner}, nil

+	return tools.EtcdHelper{client, interfaces.Codec, interfaces.ResourceVersioner}, nil

 }

 func (c *config) getKubeClient() *kubeclient.Client {

-	kubeClient, err := kubeclient.New("http://"+c.ListenAddr, klatest.Version, nil)

+	kubeClient, err := kubeclient.New(&kubeclient.Config{Host: c.ListenAddr, Version: klatest.Version})

 	if err != nil {

 		glog.Fatalf("Unable to configure client - bad URL: %v", err)

 	}

@@ -137,7 +141,7 @@ func (c *config) getKubeClient() *kubeclient.Client {

 }

 func (c *config) getOsClient() *osclient.Client {

-	osClient, err := osclient.New("http://"+c.ListenAddr, latest.Version, nil)

+	osClient, err := osclient.New(&kubeclient.Config{Host: c.ListenAddr, Version: latest.Version})

 	if err != nil {

 		glog.Fatalf("Unable to configure client - bad URL: %v", err)

 	}

@@ -257,7 +261,7 @@ func (c *config) runApiserver() {

 	apiserver.NewAPIGroup(m.API_v1beta1()).InstallREST(osMux, kubePrefix)

 	apiserver.NewAPIGroup(m.API_v1beta2()).InstallREST(osMux, kube2Prefix)

-	apiserver.NewAPIGroup(storage, v1beta1.Codec).InstallREST(osMux, osPrefix)

+	apiserver.NewAPIGroup(storage, v1beta1.Codec, osPrefix, latest.SelfLinker).InstallREST(osMux, osPrefix)

 	apiserver.InstallSupport(osMux)

 	osApi := &http.Server{

@@ -342,7 +346,10 @@ func (c *config) runKubelet() {

 		cadvisorClient,

 		etcdClient,

 		rootDirectory,

-		30*time.Second)

+		c.networkContainerImage,

+		30*time.Second,

+		0.0,

+		10)

 	go util.Forever(func() { k.Run(cfg.Updates()) }, 0)

 	go util.Forever(func() {

 		kubelet.ListenAndServeKubeletServer(k, cfg.Channel("http"), minionHost, uint(minionPort))

@@ -3,7 +3,7 @@ package deploy

 import (

 	"time"

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

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

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

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

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

@@ -31,11 +31,11 @@ type DeploymentStateHandler interface {

 type DefaultDeploymentHandler struct {

 	osClient    osclient.Interface

 	kubeClient  kubeclient.Interface

-	environment []api.EnvVar

+	environment []kubeapi.EnvVar

 }

 // NewDeploymentController creates a new DeploymentController.

-func NewDeploymentController(kubeClient kubeclient.Interface, osClient osclient.Interface, initialEnvironment []api.EnvVar) *DeploymentController {

+func NewDeploymentController(kubeClient kubeclient.Interface, osClient osclient.Interface, initialEnvironment []kubeapi.EnvVar) *DeploymentController {

 	dc := &DeploymentController{

 		kubeClient: kubeClient,

 		osClient:   osClient,

@@ -101,31 +101,31 @@ func (dh *DefaultDeploymentHandler) saveDeployment(deployment *deployapi.Deploym

 	return err

 }

-func (dh *DefaultDeploymentHandler) makeDeploymentPod(deployment *deployapi.Deployment) *api.Pod {

+func (dh *DefaultDeploymentHandler) makeDeploymentPod(deployment *deployapi.Deployment) *kubeapi.Pod {

 	podID := deploymentPodID(deployment)

 	envVars := deployment.Strategy.CustomPod.Environment

-	envVars = append(envVars, api.EnvVar{Name: "KUBERNETES_DEPLOYMENT_ID", Value: deployment.ID})

+	envVars = append(envVars, kubeapi.EnvVar{Name: "KUBERNETES_DEPLOYMENT_ID", Value: deployment.ID})

 	for _, env := range dh.environment {

 		envVars = append(envVars, env)

 	}

-	return &api.Pod{

-		JSONBase: api.JSONBase{

+	return &kubeapi.Pod{

+		JSONBase: kubeapi.JSONBase{

 			ID: podID,

 		},

-		DesiredState: api.PodState{

-			Manifest: api.ContainerManifest{

+		DesiredState: kubeapi.PodState{

+			Manifest: kubeapi.ContainerManifest{

 				Version: "v1beta1",

-				Containers: []api.Container{

+				Containers: []kubeapi.Container{

 					{

 						Name:  "deployment",

 						Image: deployment.Strategy.CustomPod.Image,

 						Env:   envVars,

 					},

 				},

-				RestartPolicy: api.RestartPolicy{

-					Never: &api.RestartPolicyNever{},

+				RestartPolicy: kubeapi.RestartPolicy{

+					Never: &kubeapi.RestartPolicyNever{},

 				},

 			},

 		},

@@ -140,7 +140,7 @@ func deploymentPodID(deployment *deployapi.Deployment) string {

 func (dh *DefaultDeploymentHandler) HandleNew(deployment *deployapi.Deployment) error {

 	deploymentPod := dh.makeDeploymentPod(deployment)

 	glog.Infof("Attempting to create deployment pod: %+v", deploymentPod)

-	if pod, err := dh.kubeClient.CreatePod(deploymentPod); err != nil {

+	if pod, err := dh.kubeClient.CreatePod(kubeapi.NewContext(), deploymentPod); err != nil {

 		glog.Warningf("Received error creating pod: %v", err)

 		deployment.State = deployapi.DeploymentFailed

 	} else {

@@ -155,7 +155,7 @@ func (dh *DefaultDeploymentHandler) HandleNew(deployment *deployapi.Deployment)

 func (dh *DefaultDeploymentHandler) HandlePending(deployment *deployapi.Deployment) error {

 	podID := deploymentPodID(deployment)

 	glog.Infof("Retrieving deployment pod id %s", podID)

-	pod, err := dh.kubeClient.GetPod(podID)

+	pod, err := dh.kubeClient.GetPod(kubeapi.NewContext(), podID)

 	if err != nil {

 		glog.Errorf("Error retrieving pod for deployment ID %v: %#v", deployment.ID, err)

 		deployment.State = deployapi.DeploymentFailed

@@ -163,9 +163,9 @@ func (dh *DefaultDeploymentHandler) HandlePending(deployment *deployapi.Deployme

 		glog.Infof("Deployment pod is %+v", pod)

 		switch pod.CurrentState.Status {

-		case api.PodRunning:

+		case kubeapi.PodRunning:

 			deployment.State = deployapi.DeploymentRunning

-		case api.PodTerminated:

+		case kubeapi.PodTerminated:

 			dh.checkForTerminatedDeploymentPod(deployment, pod)

 		}

 	}

@@ -177,7 +177,7 @@ func (dh *DefaultDeploymentHandler) HandlePending(deployment *deployapi.Deployme

 func (dh *DefaultDeploymentHandler) HandleRunning(deployment *deployapi.Deployment) error {

 	podID := deploymentPodID(deployment)

 	glog.Infof("Retrieving deployment pod id %s", podID)

-	pod, err := dh.kubeClient.GetPod(podID)

+	pod, err := dh.kubeClient.GetPod(kubeapi.NewContext(), podID)

 	if err != nil {

 		glog.Errorf("Error retrieving pod for deployment ID %v: %#v", deployment.ID, err)

 		deployment.State = deployapi.DeploymentFailed

@@ -189,15 +189,15 @@ func (dh *DefaultDeploymentHandler) HandleRunning(deployment *deployapi.Deployme

 	return dh.saveDeployment(deployment)

 }

-func (dh *DefaultDeploymentHandler) checkForTerminatedDeploymentPod(deployment *deployapi.Deployment, pod *api.Pod) {

-	if pod.CurrentState.Status != api.PodTerminated {

+func (dh *DefaultDeploymentHandler) checkForTerminatedDeploymentPod(deployment *deployapi.Deployment, pod *kubeapi.Pod) {

+	if pod.CurrentState.Status != kubeapi.PodTerminated {

 		glog.Infof("The deployment has not yet finished. Pod status is %s. Continuing", pod.CurrentState.Status)

 		return

 	}

 	deployment.State = deployapi.DeploymentComplete

 	for _, info := range pod.CurrentState.Info {

-		if info.State.ExitCode != 0 {

+		if info.State.Termination != nil && info.State.Termination.ExitCode != 0 {

 			deployment.State = deployapi.DeploymentFailed

 		}

 	}

@@ -205,7 +205,7 @@ func (dh *DefaultDeploymentHandler) checkForTerminatedDeploymentPod(deployment *

 	if deployment.State == deployapi.DeploymentComplete {

 		podID := deploymentPodID(deployment)

 		glog.Infof("Removing deployment pod for ID %v", podID)

-		dh.kubeClient.DeletePod(podID)

+		dh.kubeClient.DeletePod(kubeapi.NewContext(), podID)

 	}

 	glog.Infof("The deployment pod has finished. Setting deployment state to %s", deployment.State)

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

 	"fmt"

 	"code.google.com/p/go-uuid/uuid"

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

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

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

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

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

@@ -26,8 +26,13 @@ func NewREST(registry Registry) apiserver.RESTStorage {

 	}

 }

+// New creates a new Deployment for use with Create and Update

+func (s *REST) New() runtime.Object {

+	return &deployapi.Deployment{}

+}

+

 // List obtains a list of Deployments that match selector.

-func (s *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

+func (s *REST) List(ctx kubeapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

 	deployments, err := s.registry.ListDeployments(selector)

 	if err != nil {

 		return nil, err

@@ -36,13 +41,8 @@ func (s *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

 	return deployments, nil

 }

-// New creates a new Deployment for use with Create and Update

-func (s *REST) New() runtime.Object {

-	return &deployapi.Deployment{}

-}

-

 // Get obtains the Deployment specified by its id.

-func (s *REST) Get(id string) (runtime.Object, error) {

+func (s *REST) Get(ctx kubeapi.Context, id string) (runtime.Object, error) {

 	deployment, err := s.registry.GetDeployment(id)

 	if err != nil {

 		return nil, err

@@ -51,14 +51,14 @@ func (s *REST) Get(id string) (runtime.Object, error) {

 }

 // Delete asynchronously deletes the Deployment specified by its id.

-func (s *REST) Delete(id string) (<-chan runtime.Object, error) {

+func (s *REST) Delete(ctx kubeapi.Context, id string) (<-chan runtime.Object, error) {

 	return apiserver.MakeAsync(func() (runtime.Object, error) {

-		return &api.Status{Status: api.StatusSuccess}, s.registry.DeleteDeployment(id)

+		return &kubeapi.Status{Status: kubeapi.StatusSuccess}, s.registry.DeleteDeployment(id)

 	}), nil

 }

 // Create registers a given new Deployment instance to s.registry.

-func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Create(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	deployment, ok := obj.(*deployapi.Deployment)

 	if !ok {

 		return nil, fmt.Errorf("not a deployment: %#v", obj)

@@ -85,7 +85,7 @@ func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

 }

 // Update replaces a given Deployment instance with an existing instance in s.registry.

-func (s *REST) Update(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Update(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	deployment, ok := obj.(*deployapi.Deployment)

 	if !ok {

 		return nil, fmt.Errorf("not a deployment: %#v", obj)

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

 	"fmt"

 	"code.google.com/p/go-uuid/uuid"

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

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

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

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

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

@@ -23,8 +23,13 @@ func NewREST(registry Registry) apiserver.RESTStorage {

 	}

 }

+// New creates a new DeploymentConfig for use with Create and Update

+func (s *REST) New() runtime.Object {

+	return &deployapi.DeploymentConfig{}

+}

+

 // List obtains a list of DeploymentConfigs that match selector.

-func (s *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

+func (s *REST) List(ctx kubeapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

 	deploymentConfigs, err := s.registry.ListDeploymentConfigs(selector)

 	if err != nil {

 		return nil, err

@@ -34,7 +39,7 @@ func (s *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

 }

 // Get obtains the DeploymentConfig specified by its id.

-func (s *REST) Get(id string) (runtime.Object, error) {

+func (s *REST) Get(ctx kubeapi.Context, id string) (runtime.Object, error) {

 	deploymentConfig, err := s.registry.GetDeploymentConfig(id)

 	if err != nil {

 		return nil, err

@@ -43,19 +48,14 @@ func (s *REST) Get(id string) (runtime.Object, error) {

 }

 // Delete asynchronously deletes the DeploymentConfig specified by its id.

-func (s *REST) Delete(id string) (<-chan runtime.Object, error) {

+func (s *REST) Delete(ctx kubeapi.Context, id string) (<-chan runtime.Object, error) {

 	return apiserver.MakeAsync(func() (runtime.Object, error) {

-		return &api.Status{Status: api.StatusSuccess}, s.registry.DeleteDeploymentConfig(id)

+		return &kubeapi.Status{Status: kubeapi.StatusSuccess}, s.registry.DeleteDeploymentConfig(id)

 	}), nil

 }

-// New creates a new DeploymentConfig for use with Create and Update

-func (s *REST) New() runtime.Object {

-	return &deployapi.DeploymentConfig{}

-}

-

 // Create registers a given new DeploymentConfig instance to s.registry.

-func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Create(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	deploymentConfig, ok := obj.(*deployapi.DeploymentConfig)

 	if !ok {

 		return nil, fmt.Errorf("not a deploymentConfig: %#v", obj)

@@ -76,7 +76,7 @@ func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

 }

 // Update replaces a given DeploymentConfig instance with an existing instance in s.registry.

-func (s *REST) Update(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Update(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	deploymentConfig, ok := obj.(*deployapi.DeploymentConfig)

 	if !ok {

 		return nil, fmt.Errorf("not a deploymentConfig: %#v", obj)

@@ -55,7 +55,7 @@ func (r *Etcd) GetDeployment(id string) (*api.Deployment, error) {

 // CreateDeployment creates a new Deployment.

 func (r *Etcd) CreateDeployment(deployment *api.Deployment) error {

-	err := r.CreateObj(makeDeploymentKey(deployment.ID), deployment)

+	err := r.CreateObj(makeDeploymentKey(deployment.ID), deployment, 0)

 	return etcderr.InterpretCreateError(err, "deployment", deployment.ID)

 }

@@ -107,7 +107,7 @@ func (r *Etcd) GetDeploymentConfig(id string) (*api.DeploymentConfig, error) {

 // CreateDeploymentConfig creates a new DeploymentConfig.

 func (r *Etcd) CreateDeploymentConfig(deploymentConfig *api.DeploymentConfig) error {

-	err := r.CreateObj(makeDeploymentConfigKey(deploymentConfig.ID), deploymentConfig)

+	err := r.CreateObj(makeDeploymentConfigKey(deploymentConfig.ID), deploymentConfig, 0)

 	return etcderr.InterpretCreateError(err, "deploymentConfig", deploymentConfig.ID)

 }

@@ -57,7 +57,7 @@ func (r *Etcd) GetImage(id string) (*api.Image, error) {

 // CreateImage creates a new image

 func (r *Etcd) CreateImage(image *api.Image) error {

-	err := r.CreateObj(makeImageKey(image.ID), image)

+	err := r.CreateObj(makeImageKey(image.ID), image, 0)

 	return etcderr.InterpretCreateError(err, "image", image.ID)

 }

@@ -117,7 +117,7 @@ func (r *Etcd) WatchImageRepositories(resourceVersion uint64, filter func(repo *

 // CreateImageRepository registers the given ImageRepository.

 func (r *Etcd) CreateImageRepository(repo *api.ImageRepository) error {

-	err := r.CreateObj(makeImageRepositoryKey(repo.ID), repo)

+	err := r.CreateObj(makeImageRepositoryKey(repo.ID), repo, 0)

 	return etcderr.InterpretCreateError(err, "imageRepository", repo.ID)

 }

@@ -29,27 +29,27 @@ func (s *REST) New() runtime.Object {

 	return &api.Image{}

 }

-// Get retrieves an Image by id.

-func (s *REST) Get(id string) (runtime.Object, error) {

-	image, err := s.registry.GetImage(id)

+// List retrieves a list of Images that match selector.

+func (s *REST) List(ctx kubeapi.Context, selector, fields labels.Selector) (runtime.Object, error) {

+	images, err := s.registry.ListImages(selector)

 	if err != nil {

 		return nil, err

 	}

-	return image, nil

+

+	return images, nil

 }

-// List retrieves a list of Images that match selector.

-func (s *REST) List(selector, fields labels.Selector) (runtime.Object, error) {

-	images, err := s.registry.ListImages(selector)

+// Get retrieves an Image by id.

+func (s *REST) Get(ctx kubeapi.Context, id string) (runtime.Object, error) {

+	image, err := s.registry.GetImage(id)

 	if err != nil {

 		return nil, err

 	}

-

-	return images, nil

+	return image, nil

 }

 // Create registers the given Image.

-func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Create(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	image, ok := obj.(*api.Image)

 	if !ok {

 		return nil, fmt.Errorf("not an image: %#v", obj)

@@ -65,17 +65,17 @@ func (s *REST) Create(obj runtime.Object) (<-chan runtime.Object, error) {

 		if err := s.registry.CreateImage(image); err != nil {

 			return nil, err

 		}

-		return s.Get(image.ID)

+		return s.Get(ctx, image.ID)

 	}), nil

 }

 // Update is not supported for Images, as they are immutable.

-func (s *REST) Update(obj runtime.Object) (<-chan runtime.Object, error) {

+func (s *REST) Update(ctx kubeapi.Context, obj runtime.Object) (<-chan runtime.Object, error) {

 	return nil, fmt.Errorf("Images may not be changed.")

 }

 // Delete asynchronously deletes an Image specified by its id.

-func (s *REST) Delete(id string) (<-chan runtime.Object, error) {

+func (s *REST) Delete(ctx kubeapi.Context, id string) (<-chan runtime.Object, error) {

 	return apiserver.MakeAsync(func() (runtime.Object, error) {

 		return &kubeapi.Status{Status: kubeapi.StatusSuccess}, s.registry.DeleteImage(id)

 	}), nil

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

 	"code.google.com/p/go-uuid/uuid"

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

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

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

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

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

@@ -30,26 +30,26 @@ func (s *REST) New() runtime.Object {

 	return &api.ImageRepository{}

 }

-// Get retrieves an ImageRepository by id.

-func (s *REST) Get(id string) (runtime.Object, error) {

-	repo, err := s.registry.GetImageRepository(id)

+// List retrieves a list of ImageRepositories that match selector.