@@ -1,3 +1,6 @@

 // Package api includes all OpenShift-specific types used to communicate

 // between the various parts of the OpenShift and the Kubernetes systems.

+//

+// Unlike the upstream Kubernetes, API objects in OpenShift are separated

+// into individual packages.

 package api

new file mode 100644

@@ -0,0 +1,5 @@

+// Package latest defines the default output serializations that code should

+// use and imports the required schemas.  It also ensures all previously known

+// and supported API versions are available for conversion. Consumers may

+// import this package in lieu of importing individual versions.

+package latest

new file mode 100644

@@ -0,0 +1,46 @@

+package latest

+

+import (

+	"fmt"

+	"strings"

+

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

+

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

+)

+

+// Version is the string that represents the current external default version.

+const Version = "v1beta1"

+

+// OldestVersion is the string that represents the oldest server version supported,

+// for client code that wants to hardcode the lowest common denominator.

+const OldestVersion = "v1beta1"

+

+// Versions is the list of versions that are recognized in code. The order provided

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

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

+// with a set of versions to choose.

+var Versions = []string{"v1beta1"}

+

+// Codec is the default codec for serializing output that should use

+// the latest supported version.  Use this Codec when writing to

+// disk, a data store that is not dynamically versioned, or in tests.

+// This codec can decode any object that OpenShift is aware of.

+var Codec = v1beta1.Codec

+

+// ResourceVersioner describes a default versioner that can handle all types

+// of versioning.

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

+var ResourceVersioner = runtime.NewJSONBaseResourceVersioner()

+

+// 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) {

+	switch version {

+	case "v1beta1":

+		codec, versioner = v1beta1.Codec, ResourceVersioner

+	default:

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

+	}

+	return

+}

@@ -1,9 +1,20 @@

 package api

 import (

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

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

+

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

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

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

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

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

 )

+// Codec is the identity codec for this package - it can only convert itself

+// to itself.

+var Codec = runtime.CodecFor(api.Scheme, "")

+

 func init() {

-	runtime.AddKnownTypes("")

+	api.Scheme.AddKnownTypes("")

 }

@@ -1,9 +1,19 @@

 package v1beta1

 import (

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

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

+

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

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

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

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

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

 )

+// Codec encodes internal objects to the v1beta1 scheme

+var Codec = runtime.CodecFor(api.Scheme, "v1beta1")

+

 func init() {

-	runtime.AddKnownTypes("v1beta1")

+	api.Scheme.AddKnownTypes("v1beta1")

 }

@@ -1,14 +1,19 @@

 package api

 import (

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

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

 )

 func init() {

-	runtime.AddKnownTypes("",

-		Build{},

-		BuildList{},

-		BuildConfig{},

-		BuildConfigList{},

+	api.Scheme.AddKnownTypes("",

+		&Build{},

+		&BuildList{},

+		&BuildConfig{},

+		&BuildConfigList{},

 	)

 }

+

+func (*Build) IsAnAPIObject()           {}

+func (*BuildList) IsAnAPIObject()       {}

+func (*BuildConfig) IsAnAPIObject()     {}

+func (*BuildConfigList) IsAnAPIObject() {}

@@ -1,14 +1,19 @@

 package v1beta1

 import (

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

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

 )

 func init() {

-	runtime.AddKnownTypes("v1beta1",

-		Build{},

-		BuildList{},

-		BuildConfig{},

-		BuildConfigList{},

+	api.Scheme.AddKnownTypes("v1beta1",

+		&Build{},

+		&BuildList{},

+		&BuildConfig{},

+		&BuildConfigList{},

 	)

 }

+

+func (*Build) IsAnAPIObject()           {}

+func (*BuildList) IsAnAPIObject()       {}

+func (*BuildConfig) IsAnAPIObject()     {}

+func (*BuildConfigList) IsAnAPIObject() {}

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

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

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

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

+

 	"github.com/golang/glog"

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

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

@@ -113,7 +114,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(podSpec)

 		// TODO: strongly typed error checking

 		if err != nil {

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

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

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

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

+

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

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

 )

@@ -25,12 +26,12 @@ func NewREST(registry Registry) apiserver.RESTStorage {

 }

 // New creates a new Build object

-func (r *REST) New() interface{} {

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

 	return &api.Build{}

 }

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

-func (r *REST) List(selector labels.Selector) (interface{}, error) {

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

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

 	if err != nil {

 		return nil, err

@@ -40,7 +41,7 @@ func (r *REST) List(selector labels.Selector) (interface{}, error) {

 }

 // Get obtains the build specified by its id.

-func (r *REST) Get(id string) (interface{}, error) {

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

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

 	if err != nil {

 		return nil, err

@@ -49,21 +50,14 @@ func (r *REST) Get(id string) (interface{}, error) {

 }

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

-func (r *REST) Delete(id string) (<-chan interface{}, error) {

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

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

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

 	}), nil

 }

-// Extract deserializes user provided data into an api.Build.

-func (r *REST) Extract(body []byte) (interface{}, error) {

-	result := api.Build{}

-	err := runtime.DecodeInto(body, &result)

-	return result, err

-}

-

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

-func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

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

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

 	if !ok {

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

@@ -78,7 +72,7 @@ func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

 	if errs := validation.ValidateBuild(build); len(errs) > 0 {

 		return nil, errors.NewInvalid("build", build.ID, errs)

 	}

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

 		err := r.registry.CreateBuild(build)

 		if err != nil {

 			return nil, err

@@ -88,7 +82,7 @@ func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

 }

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

-func (r *REST) Update(obj interface{}) (<-chan interface{}, error) {

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

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

 	if !ok {

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

@@ -96,7 +90,7 @@ func (r *REST) Update(obj interface{}) (<-chan interface{}, error) {

 	if errs := validation.ValidateBuild(build); len(errs) > 0 {

 		return nil, errors.NewInvalid("build", build.ID, errs)

 	}

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

 		err := r.registry.UpdateBuild(build)

 		if err != nil {

 			return nil, err

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

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

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

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

+

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

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

 )

@@ -25,12 +26,12 @@ func NewREST(registry Registry) apiserver.RESTStorage {

 }

 // New creates a new BuildConfig.

-func (r *REST) New() interface{} {

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

 	return &api.BuildConfig{}

 }

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

-func (r *REST) List(selector labels.Selector) (interface{}, error) {

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

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

 	if err != nil {

 		return nil, err

@@ -39,7 +40,7 @@ func (r *REST) List(selector labels.Selector) (interface{}, error) {

 }

 // Get obtains the BuildConfig specified by its id.

-func (r *REST) Get(id string) (interface{}, error) {

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

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

 	if err != nil {

 		return nil, err

@@ -48,21 +49,14 @@ func (r *REST) Get(id string) (interface{}, error) {

 }

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

-func (r *REST) Delete(id string) (<-chan interface{}, error) {

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

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

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

 	}), nil

 }

-// Extract deserializes user provided data into an api.BuildConfig.

-func (r *REST) Extract(body []byte) (interface{}, error) {

-	result := api.BuildConfig{}

-	err := runtime.DecodeInto(body, &result)

-	return result, err

-}

-

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

-func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

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

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

 	if !ok {

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

@@ -74,7 +68,7 @@ func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

 	if errs := validation.ValidateBuildConfig(buildConfig); len(errs) > 0 {

 		return nil, errors.NewInvalid("buildConfig", buildConfig.ID, errs)

 	}

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

 		err := r.registry.CreateBuildConfig(buildConfig)

 		if err != nil {

 			return nil, err

@@ -84,7 +78,7 @@ func (r *REST) Create(obj interface{}) (<-chan interface{}, error) {

 }

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

-func (r *REST) Update(obj interface{}) (<-chan interface{}, error) {

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

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

 	if !ok {

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

@@ -92,7 +86,7 @@ func (r *REST) Update(obj interface{}) (<-chan interface{}, error) {

 	if errs := validation.ValidateBuildConfig(buildConfig); len(errs) > 0 {

 		return nil, errors.NewInvalid("buildConfig", buildConfig.ID, errs)

 	}

-	return apiserver.MakeAsync(func() (interface{}, error) {

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

 		err := r.registry.UpdateBuildConfig(buildConfig)

 		if err != nil {

 			return nil, err

@@ -3,7 +3,6 @@ package etcd

 import (

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

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

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

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

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

@@ -14,17 +13,11 @@ type Etcd struct {

 	tools.EtcdHelper

 }

-// NewEtcd creates an etcd registry.

-// 'client' is the connection to etcd

-func NewEtcd(client tools.EtcdClient) *Etcd {

-	registry := &Etcd{

-		EtcdHelper: tools.EtcdHelper{

-			client,

-			runtime.Codec,

-			runtime.ResourceVersioner,

-		},

+// New creates an etcd registry.

+func New(helper tools.EtcdHelper) *Etcd {

+	return &Etcd{

+		EtcdHelper: helper,

 	}

-	return registry

 }

 func makeBuildKey(id string) string {

@@ -27,9 +27,8 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegis

 				Version: "v1beta1",

 				Containers: []api.Container{

 					{

-						Name:          "docker-build",

-						Image:         bs.dockerBuilderImage,

-						RestartPolicy: "runOnce",

+						Name:  "docker-build",

+						Image: bs.dockerBuilderImage,

 						Env: []api.EnvVar{

 							{Name: "BUILD_TAG", Value: build.Input.ImageTag},

 							{Name: "DOCKER_CONTEXT_URL", Value: build.Input.SourceURI},

@@ -37,6 +36,9 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegis

 						},

 					},

 				},

+				RestartPolicy: api.RestartPolicy{

+					Never: &api.RestartPolicyNever{},

+				},

 			},

 		},

 	}

@@ -43,9 +43,8 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegistry

 				Version: "v1beta1",

 				Containers: []api.Container{

 					{

-						Name:          "sti-build",

-						Image:         bs.stiBuilderImage,

-						RestartPolicy: "runOnce",

+						Name:  "sti-build",

+						Image: bs.stiBuilderImage,

 						Env: []api.EnvVar{

 							{Name: "BUILD_TAG", Value: build.Input.ImageTag},

 							{Name: "DOCKER_REGISTRY", Value: dockerRegistry},

@@ -55,6 +54,9 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build, dockerRegistry

 						},

 					},

 				},

+				RestartPolicy: api.RestartPolicy{

+					Never: &api.RestartPolicyNever{},

+				},

 			},

 		},

 	}

@@ -59,7 +59,7 @@ func (c *controller) ServeHTTP(w http.ResponseWriter, req *http.Request) {

 	plugin, ok := c.plugins[uv.plugin]

 	if !ok {

-		notFound(w, "Plugin ", uv.plugin, " not found!")

+		notFound(w, "Plugin ", uv.plugin, " not found")

 		return

 	}

 	build, proceed, err := plugin.Extract(buildCfg, uv.path, req)

@@ -84,7 +84,7 @@ func (c *controller) ServeHTTP(w http.ResponseWriter, req *http.Request) {

 func parseUrl(url string) (uv urlVars, err error) {

 	parts := splitPath(url)

 	if len(parts) < 3 {

-		err = fmt.Errorf("Unexpected URL %s!", url)

+		err = fmt.Errorf("Unexpected URL %s", url)

 		return

 	}

 	uv = urlVars{parts[0], parts[1], parts[2], ""}

@@ -26,7 +26,7 @@ func (p *GitHubWebHook) Extract(buildCfg *api.BuildConfig, path string, req *htt

 	}

 	method := req.Header.Get("X-GitHub-Event")

 	if method != "ping" && method != "push" {

-		err = fmt.Errorf("Unknown X-GitHub-Event %s!", method)

+		err = fmt.Errorf("Unknown X-GitHub-Event %s", method)

 		return

 	}

 	proceed = (method == "push")

@@ -44,16 +44,16 @@ func (p *GitHubWebHook) Extract(buildCfg *api.BuildConfig, path string, req *htt

 func verifyRequest(req *http.Request) error {

 	if method := req.Method; method != "POST" {

-		return fmt.Errorf("Unsupported HTTP method %s!", method)

+		return fmt.Errorf("Unsupported HTTP method %s", method)

 	}

 	if contentType := req.Header.Get("Content-Type"); contentType != "application/json" {

-		return fmt.Errorf("Unsupported Content-Type %s!", contentType)

+		return fmt.Errorf("Unsupported Content-Type %s", contentType)

 	}

 	if userAgent := req.Header.Get("User-Agent"); !strings.HasPrefix(userAgent, "GitHub-Hookshot/") {

-		return fmt.Errorf("Unsupported User-Agent %s!")

+		return fmt.Errorf("Unsupported User-Agent %s")

 	}

 	if req.Header.Get("X-GitHub-Event") == "" {

-		return errors.New("Missing X-GitHub-Event!")

+		return errors.New("Missing X-GitHub-Event")

 	}

 	return nil

 }

@@ -1,15 +1,17 @@

 package client

 import (

+	"fmt"

+	"strings"

+

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

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

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

+

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

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

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

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

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

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

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

 )

 // Interface exposes methods on OpenShift resources.

@@ -85,10 +87,20 @@ type Client struct {

 }

 // New creates and returns a new Client.

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

-	restClient, err := kubeclient.NewRESTClient(host, auth, "/osapi/v1beta1")

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

+	if version == "" {

+		// Clients default to the preferred code API version

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

+		version = latest.Version

+	}

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

+	if err != nil {

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

+	}

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

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

 	if err != nil {

-		return nil, err

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

 	}

 	return &Client{restClient}, nil

 }

@@ -3,6 +3,7 @@ package client

 import (

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

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

+

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

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

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

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

 package api

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

+import (

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

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

+)

 type RESTClient interface {

 	Verb(verb string) *client.Request

@@ -9,4 +12,5 @@ type RESTClient interface {

 type ClientMappings map[string]struct {

 	Kind   string

 	Client RESTClient

+	Codec  runtime.Codec

 }

@@ -45,5 +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.ImageName, "image", "", "Image used when updating a replicationController.  Will apply to the first container in the pod template.")

+

 	return cmd

 }

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

 	"time"

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

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

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

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

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

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

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

 	"github.com/golang/glog"

+

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

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

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

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

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

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

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

 	configapi "github.com/openshift/origin/pkg/config/api"

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

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

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

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

@@ -68,6 +70,15 @@ type KubeConfig struct {

 	TemplateFile   string

 	TemplateStr    string

+	ImageName string

+

+	CAFile   string

+	CertFile string

+	KeyFile  string

+

+	APIVersion   string

+	OSAPIVersion string

+

 	Args []string

 }

@@ -84,10 +95,16 @@ func usage(name string) string {

   %[1]s [OPTIONS] get|list|create|delete|update <%[2]s>[/<id>]

   Manage replication controllers:

-  %[1]s [OPTIONS] stop|rm|rollingupdate <controller>

-  %[1]s [OPTIONS] run <image> <replicas> <controller>

+

+  %[1]s [OPTIONS] stop|rm <controller>

+  %[1]s [OPTIONS] [-u <time>] [-image <image>] rollingupdate <controller>

   %[1]s [OPTIONS] resize <controller> <replicas>

+  Launch a simple ReplicationController with a single container based

+  on the given image:

+

+  %[1]s [OPTIONS] [-p <port spec>] run <image> <replicas> <controller>

+

   Perform bulk operations on groups of Kubernetes resources:

   %[1]s [OPTIONS] apply -c config.json

@@ -96,19 +113,19 @@ func usage(name string) string {

 `, name, prettyWireStorage())

 }

-var parser = kubecfg.NewParser(map[string]interface{}{

-	"pods":                    api.Pod{},

-	"services":                api.Service{},

-	"replicationControllers":  api.ReplicationController{},

-	"minions":                 api.Minion{},

-	"builds":                  buildapi.Build{},

-	"buildConfigs":            buildapi.BuildConfig{},

-	"images":                  imageapi.Image{},

-	"imageRepositories":       imageapi.ImageRepository{},

-	"imageRepositoryMappings": imageapi.ImageRepositoryMapping{},

-	"config":                  configapi.Config{},

-	"deployments":             deployapi.Deployment{},

-	"deploymentConfigs":       deployapi.DeploymentConfig{},

+var parser = kubecfg.NewParser(map[string]runtime.Object{

+	"pods":                    &api.Pod{},

+	"services":                &api.Service{},

+	"replicationControllers":  &api.ReplicationController{},

+	"minions":                 &api.Minion{},

+	"builds":                  &buildapi.Build{},

+	"buildConfigs":            &buildapi.BuildConfig{},

+	"images":                  &imageapi.Image{},

+	"imageRepositories":       &imageapi.ImageRepository{},

+	"imageRepositoryMappings": &imageapi.ImageRepositoryMapping{},

+	"config":                  &configapi.Config{},

+	"deployments":             &deployapi.Deployment{},

+	"deploymentConfigs":       &deployapi.DeploymentConfig{},

 })

 func prettyWireStorage() string {

@@ -117,45 +134,49 @@ func prettyWireStorage() string {

 	return strings.Join(types, "|")

 }

-// readConfig reads and parses pod, replicationController, and service

-// configuration files. If any errors log and exit non-zero.

-func (c *KubeConfig) readConfig(storage string) []byte {

-	if len(c.Config) == 0 {

-		glog.Fatal("Need config file (-c)")

-	}

-

-	var data []byte

+// readConfigData reads the bytes from the specified filesytem or network location associated with the *config flag

+func (c *KubeConfig) readConfigData() []byte {

+	// read from STDIN

 	if c.Config == "-" {

-		body, err := ioutil.ReadAll(os.Stdin)

+		data, err := ioutil.ReadAll(os.Stdin)

 		if err != nil {

-			glog.Fatalf("Unable to read from STDIN: %v", err)

+			glog.Fatalf("Unable to read from STDIN: %v\n", err)

 		}

-		data = body

+		return data

+	}

-	} else if url, err := url.Parse(c.Config); err == nil && (url.Scheme == "http" || url.Scheme == "https") {

+	// we look for http:// or https:// to determine if valid URL, otherwise do normal file IO

+	if url, err := url.Parse(c.Config); err == nil && (url.Scheme == "http" || url.Scheme == "https") {

 		resp, err := http.Get(url.String())

 		if err != nil {

-			glog.Fatalf("Unable to access URL %v: %v", url, err)

+			glog.Fatalf("Unable to access URL %v: %v\n", c.Config, err)

 		}

 		defer resp.Body.Close()

 		if resp.StatusCode != 200 {

 			glog.Fatalf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status)

 		}

-		body, err := ioutil.ReadAll(resp.Body)

+		data, err := ioutil.ReadAll(resp.Body)

 		if err != nil {

-			glog.Fatalf("Unable to read URL %v: %v", url, err)

+			glog.Fatalf("Unable to read URL %v: %v\n", c.Config, err)

 		}

-		data = body

+		return data

+	}

-	} else {

-		body, err := ioutil.ReadFile(c.Config)

-		if err != nil {

-			glog.Fatalf("Unable to read %v: %v", c.Config, err)

-		}

-		data = body

+	data, err := ioutil.ReadFile(c.Config)

+	if err != nil {

+		glog.Fatalf("Unable to read %v: %v\n", c.Config, err)

 	}

+	return data

+}

-	data, err := parser.ToWireFormat(data, storage)

+// readConfig reads and parses pod, replicationController, and service

+// configuration files. If any errors log and exit non-zero.

+func (c *KubeConfig) readConfig(storage string, serverCodec runtime.Codec) []byte {

+	if len(c.Config) == 0 {

+		glog.Fatal("Need config file (-c)")

+	}

+

+	data, err := parser.ToWireFormat(c.readConfigData(), storage, latest.Codec, serverCodec)

 	if err != nil {

 		glog.Fatalf("Error parsing %v as an object for %v: %v", c.Config, storage, err)

 	}

@@ -177,11 +198,11 @@ func (c *KubeConfig) Run() {

 	} else {

 		masterServer = "http://localhost:8080"

 	}

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

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

 	if err != nil {

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

 	}

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

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

 	if err != nil {

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

 	}

@@ -193,11 +214,20 @@ func (c *KubeConfig) Run() {

 		if err != nil {

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

 		}

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

+		if c.CAFile != "" {

+			auth.CAFile = c.CAFile

+		}

+		if c.CertFile != "" {

+			auth.CertFile = c.CertFile

+		}

+		if c.KeyFile != "" {

+			auth.KeyFile = c.KeyFile

+		}

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

 		if err != nil {

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

 		}

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

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

 		if err != nil {

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

 		}

@@ -234,17 +264,17 @@ func (c *KubeConfig) Run() {

 	method := c.Arg(0)

 	clients := ClientMappings{

-		"minions":                 {"Minion", kubeClient.RESTClient},

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

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

-		"replicationControllers":  {"ReplicationController", kubeClient.RESTClient},

-		"builds":                  {"Build", client.RESTClient},

-		"buildConfigs":            {"BuildConfig", client.RESTClient},

-		"images":                  {"Image", client.RESTClient},

-		"imageRepositories":       {"ImageRepository", client.RESTClient},

-		"imageRepositoryMappings": {"ImageRepositoryMapping", client.RESTClient},

-		"deployments":             {"Deployment", client.RESTClient},

-		"deploymentConfigs":       {"DeploymentConfig", client.RESTClient},

+		"minions":                 {"Minion", kubeClient.RESTClient, klatest.Codec},

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

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

+		"replicationControllers":  {"ReplicationController", kubeClient.RESTClient, klatest.Codec},

+		"builds":                  {"Build", client.RESTClient, latest.Codec},

+		"buildConfigs":            {"BuildConfig", client.RESTClient, latest.Codec},

+		"images":                  {"Image", client.RESTClient, latest.Codec},

+		"imageRepositories":       {"ImageRepository", client.RESTClient, latest.Codec},

+		"imageRepositoryMappings": {"ImageRepositoryMapping", client.RESTClient, latest.Codec},

+		"deployments":             {"Deployment", client.RESTClient, latest.Codec},

+		"deploymentConfigs":       {"DeploymentConfig", client.RESTClient, latest.Codec},

 	}

 	matchFound := c.executeConfigRequest(method, clients) || c.executeTemplateRequest(method, client) || c.executeControllerRequest(method, kubeClient) || c.executeAPIRequest(method, clients)

@@ -331,8 +361,8 @@ func (c *KubeConfig) executeAPIRequest(method string, clients ClientMappings) bo

 		ParseSelectorParam("labels", c.Selector)

 	if setBody {

 		if version != 0 {

-			data := c.readConfig(storage)

-			obj, err := runtime.Decode(data)

+			data := c.readConfig(storage, client.Codec)

+			obj, err := latest.Codec.Decode(data)

 			if err != nil {

 				glog.Fatalf("error setting resource version: %v", err)

 			}

@@ -341,13 +371,13 @@ func (c *KubeConfig) executeAPIRequest(method string, clients ClientMappings) bo

 				glog.Fatalf("error setting resource version: %v", err)

 			}

 			jsonBase.SetResourceVersion(version)

-			data, err = runtime.Encode(obj)

+			data, err = client.Codec.Encode(obj)

 			if err != nil {

 				glog.Fatalf("error setting resource version: %v", err)

 			}

 			r.Body(data)

 		} else {

-			r.Body(c.readConfig(storage))

+			r.Body(c.readConfig(storage, client.Codec))

 		}

 	}

 	result := r.Do()

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

 	case "rm":

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

 	case "rollingupdate":

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

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

 	case "run":

 		if len(c.Args) != 4 {

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

@@ -476,7 +506,7 @@ func (c *KubeConfig) executeConfigRequest(method string, clients ClientMappings)

 	if len(c.Config) == 0 {

 		glog.Fatal("Need to pass valid configuration file (-c config.json)")

 	}

-	errs := config.Apply(c.readConfig("config"), clients)

+	errs := config.Apply(c.readConfig("config", latest.Codec), clients)

 	for _, err := range errs {

 		fmt.Println(err.Error())

 	}

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

 	"time"

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

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

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

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

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

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

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

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

 	pconfig "github.com/GoogleCloudPlatform/kubernetes/pkg/proxy/config"

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

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

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

 	"github.com/GoogleCloudPlatform/kubernetes/plugin/pkg/scheduler"

@@ -27,8 +27,8 @@ import (

 	cadvisor "github.com/google/cadvisor/client"

 	"github.com/spf13/cobra"

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

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

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

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

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

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

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

@@ -102,10 +102,27 @@ type config struct {

 	masterHost string

 	nodeHosts  []string

 	bindAddr   string

+

+	storageVersion string

+}

+

+// newEtcdHelper returns an EtcdHelper for the provided arguments or an error if the version