@@ -2,6 +2,7 @@

 /openshift.local.*

 /.project

 /.vagrant

+/cpu.pprof

 /assets/nbproject

 /examples/sample-app/openshift.local.*

 /examples/sample-app/logs/openshift.log

@@ -316,8 +316,10 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag

 			actions = appendIf(actions, action{"CONNECT", itemPath + "/{path:*}", nameParams, namer}, isConnecter && connectSubpath)

 			// list across namespace.

+			// TODO: more strongly type whether a resource allows these actions on "all namespaces" (bulk delete)

 			namer = scopeNaming{scope, a.group.Linker, gpath.Join(a.prefix, itemPath), true}

 			actions = appendIf(actions, action{"LIST", resource, params, namer}, isLister)

+			actions = appendIf(actions, action{"POST", resource, params, namer}, isCreater)

 			actions = appendIf(actions, action{"WATCHLIST", "watch/" + resource, params, namer}, allowWatchList)

 		} else {

@@ -685,7 +685,7 @@ func (m *Master) api_v1beta3() *apiserver.APIGroupVersion {

 func (m *Master) api_v1() *apiserver.APIGroupVersion {

 	storage := make(map[string]rest.Storage)

 	for k, v := range m.storage {

-		if k == "minions" {

+		if k == "minions" || k == "minions/status" {

 			continue

 		}

 		storage[strings.ToLower(k)] = v

@@ -227,7 +227,7 @@

                         "value": "${MYSQL_DATABASE}"

                       }

                     ],

-                    "image": "openshift/mysql-55-centos7",

+                    "image": "openshift/mysql-55-centos7:latest",

                     "name": "ruby-helloworld-database",

                     "ports": [

                       {

@@ -311,63 +311,18 @@ osc create -f examples/image-streams/image-streams-centos7.json

 [ -n "$(osc get imageStreams mongodb -t "{{.status.dockerImageRepository}}")" ]

 osc delete imageStreams ruby

 osc delete imageStreams nodejs

-osc delete imageStreams wildfly

-osc delete imageStreams mysql

+#osc delete imageStreams wildfly

+#osc delete imageStreams mysql

 osc delete imageStreams postgresql

 osc delete imageStreams mongodb

 [ -z "$(osc get imageStreams ruby -t "{{.status.dockerImageRepository}}")" ]

 [ -z "$(osc get imageStreams nodejs -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageStreams wildfly -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageStreams mysql -t "{{.status.dockerImageRepository}}")" ]

 [ -z "$(osc get imageStreams postgresql -t "{{.status.dockerImageRepository}}")" ]

 [ -z "$(osc get imageStreams mongodb -t "{{.status.dockerImageRepository}}")" ]

+wait_for_command 'osc get imagestreamTags mysql:latest' "${TIME_MIN}"

+[ -n "$(osc get imagestreams mysql -t "{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}")" ]

 echo "imageStreams: ok"

-osc create -f test/integration/fixtures/test-image-stream.json

-osc create -f test/integration/fixtures/test-image-stream-mapping.json

-osc get images

-osc get imageStreams

-osc get imageStreamTag test:sometag

-osc get imageStreamImage test@sha256:4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125

-osc delete imageStreams test

-echo "imageStreamMappings: ok"

-

-osc get imageRepositories

-osc create -f test/integration/fixtures/test-image-repository.json

-[ -n "$(osc get imageRepositories test -t "{{.status.dockerImageRepository}}")" ]

-osc delete imageRepositories test

-osc create -f examples/image-repositories/image-repositories.json

-[ -n "$(osc get imageRepositories ruby-20-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -n "$(osc get imageRepositories nodejs-010-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -n "$(osc get imageRepositories wildfly-8-centos -t "{{.status.dockerImageRepository}}")" ]

-[ -n "$(osc get imageRepositories mysql-55-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -n "$(osc get imageRepositories postgresql-92-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -n "$(osc get imageRepositories mongodb-24-centos7 -t "{{.status.dockerImageRepository}}")" ]

-osc delete imageRepositories ruby-20-centos7

-osc delete imageRepositories nodejs-010-centos7

-osc delete imageRepositories mysql-55-centos7

-osc delete imageRepositories postgresql-92-centos7

-osc delete imageRepositories mongodb-24-centos7

-[ -z "$(osc get imageRepositories ruby-20-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageRepositories nodejs-010-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageRepositories mysql-55-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageRepositories postgresql-92-centos7 -t "{{.status.dockerImageRepository}}")" ]

-[ -z "$(osc get imageRepositories mongodb-24-centos7 -t "{{.status.dockerImageRepository}}")" ]

-# don't delete wildfly-8-centos

-osc create -f - << EOF

-{"apiVersion": "v1beta1","dockerImageRepository": "openshift/mysql-55-centos7","kind": "ImageRepository","metadata": {"name": "mysql"}}

-EOF

-echo "imageRepositories: ok"

-

-osc create -f test/integration/fixtures/test-image-repository.json

-osc create -f test/integration/fixtures/test-image-repository-mapping.json

-osc get images

-osc get imageRepositories

-osc get imageRepositoryTag test:sometag

-osc delete imageRepositories test

-echo "imageRepositoryMappings: ok"

-

-[ -n "$(osc get imageRepositories mysql -t "{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}")" ]

 [ "$(osc new-app library/php mysql -o yaml | grep 3306)" ]

 # verify we can generate a Docker image based component "mongodb" directly

 [ ! "$(osc new-app unknownhubimage -o yaml)" ]

@@ -436,8 +391,8 @@ osc get buildConfigs

 osc get bc

 osc get builds

-[[ $(osc describe buildConfigs ruby-sample-build | grep --text "Webhook Github"  | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/github") ]]

-[[ $(osc describe buildConfigs ruby-sample-build | grep --text "Webhook Generic" | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/generic") ]]

+[[ $(osc describe buildConfigs ruby-sample-build --api-version=v1beta1 | grep --text "Webhook Github"  | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/github") ]]

+[[ $(osc describe buildConfigs ruby-sample-build --api-version=v1beta1 | grep --text "Webhook Generic" | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/generic") ]]

 osc start-build --list-webhooks='all' ruby-sample-build

 [[ $(osc start-build --list-webhooks='all' ruby-sample-build | grep --text "generic") ]]

 [[ $(osc start-build --list-webhooks='all' ruby-sample-build | grep --text "github") ]]

@@ -507,8 +462,8 @@ osadm registry --create --credentials="${OPENSHIFTCONFIG}"

 echo "ex registry: ok"

 # verify the image repository had its tags populated

-[ -n "$(osc get imageStreams wildfly-8-centos -t "{{.status.tags.latest}}")" ]

-[ -n "$(osc get imageStreams wildfly-8-centos -t "{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}")" ]

+[ -n "$(osc get imageStreams wildfly -t "{{.status.tags.latest}}")" ]

+[ -n "$(osc get imageStreams wildfly -t "{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}")" ]

 # Test building a dependency tree

 [ "$(openshift ex build-chain --all -o dot | grep 'graph')" ]

@@ -224,6 +224,9 @@ func ImageStreamTag(g MutableUniqueGraph, namespace, name, tag string) graph.Nod

 	if len(tag) == 0 {

 		tag = image.DefaultImageTag

 	}

+	if strings.Contains(name, ":") {

+		panic(name)

+	}

 	uname := UniqueName(fmt.Sprintf("%d|%s/%s:%s", ImageStreamGraphKind, namespace, name, tag))

 	return EnsureUnique(g,

 		uname,

@@ -272,17 +275,6 @@ func BuildConfig(g MutableUniqueGraph, config *build.BuildConfig) graph.Node {

 	from := buildutil.GetImageStreamForStrategy(config)

 	if from != nil {

-		for _, trigger := range config.Triggers {

-			if trigger.ImageChange != nil {

-				if len(from.Name) == 0 || from.Kind != "ImageStreamTag" {

-					continue

-				}

-				tag := strings.Split(from.Name, ":")[1]

-				in := ImageStreamTag(g, defaultNamespace(from.Namespace, config.Namespace), from.Name, tag)

-				g.AddEdge(in, node, BuildInputImageGraphEdgeKind)

-			}

-		}

-

 		switch from.Kind {

 		case "DockerImage":

 			if ref, err := image.ParseDockerImageReference(from.Name); err == nil {

@@ -291,10 +283,14 @@ func BuildConfig(g MutableUniqueGraph, config *build.BuildConfig) graph.Node {

 				in := DockerRepository(g, ref.String(), tag)

 				g.AddEdge(in, node, BuildInputImageGraphEdgeKind)

 			}

-		case "ImageStreamTag":

-			tag := strings.Split(from.Name, ":")[1]

+		case "ImageStream":

+			tag := image.DefaultImageTag

 			in := ImageStreamTag(g, defaultNamespace(from.Namespace, config.Namespace), from.Name, tag)

 			g.AddEdge(in, node, BuildInputImageGraphEdgeKind)

+		case "ImageStreamTag":

+			name, tag, _ := image.SplitImageStreamTag(from.Name)

+			in := ImageStreamTag(g, defaultNamespace(from.Namespace, config.Namespace), name, tag)

+			g.AddEdge(in, node, BuildInputImageGraphEdgeKind)

 		case "ImageStreamImage":

 			glog.V(4).Infof("Ignoring ImageStreamImage reference in buildconfig %s/%s", config.Namespace, config.Name)

 		}

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

 )

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

-const Version = "v1beta1"

+const Version = "v1beta3"

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

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

@@ -107,8 +107,8 @@ func init() {

 		},

 	)

-	// list of versions we support on the server

-	versions := Versions

+	// list of versions we support on the server, in preferred order

+	versions := []string{"v1beta3", "v1beta1"}

 	// versions that used mixed case URL formats

 	versionMixedCase := map[string]bool{

@@ -129,6 +129,8 @@ func init() {

 		"Project":        true,

 		"ProjectRequest": true,

+		"Image": true,

+

 		"User":                true,

 		"Identity":            true,

 		"UserIdentityMapping": true,

@@ -101,6 +101,12 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 			j.DockerImageReference = specs[c.Intn(len(specs))]

 			if forVersion == "v1beta3" {

 				j.Tag, j.DockerImageReference = "", ""

+				if j.To != nil && (len(j.To.Kind) == 0 || j.To.Kind == "ImageStream") {

+					j.To.Kind = "ImageStream"

+					if len(j.Tag) == 0 {

+						j.To.Kind = "latest"

+					}

+				}

 			}

 		},

 		func(j *deploy.DeploymentStrategy, c fuzz.Continue) {

@@ -58,7 +58,7 @@ var (

 		OAuthGroupName:              {"oauthauthorizetokens", "oauthaccesstokens", "oauthclients", "oauthclientauthorizations"},

 		PolicyOwnerGroupName:        {"policies", "policybindings"},

 		PermissionGrantingGroupName: {"roles", "rolebindings", "resourceaccessreviews", "subjectaccessreviews"},

-		OpenshiftExposedGroupName:   {BuildGroupName, ImageGroupName, DeploymentGroupName, "templates", "templateconfigs", "routes"},

+		OpenshiftExposedGroupName:   {BuildGroupName, ImageGroupName, DeploymentGroupName, "templates", "templateconfigs", "processedtemplates", "routes"},

 		OpenshiftAllGroupName:       {OpenshiftExposedGroupName, UserGroupName, OAuthGroupName, PolicyOwnerGroupName, PermissionGrantingGroupName, OpenshiftStatusGroupName, "projects"},

 		OpenshiftStatusGroupName:    {"imagerepositories/status"},

@@ -2,13 +2,13 @@ package v1beta1

 import (

 	"fmt"

-	"strings"

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

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

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

+

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

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

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

 )

 func init() {

@@ -70,15 +70,16 @@ func init() {

 						Kind:      in.From.Kind,

 					}

 				case "ImageStreamTag":

-					bits := strings.Split(in.From.Name, ":")

+					name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name)

+					if !ok {

+						return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)

+					}

 					out.From = &kapi.ObjectReference{

-						Name:      bits[0],

-						Namespace: in.From.Namespace,

 						Kind:      "ImageStream",

+						Namespace: in.From.Namespace,

+						Name:      name,

 					}

-					if len(bits) > 1 {

-						out.Tag = bits[1]

-					}

+					out.Tag = tag

 				case "DockerImage":

 					out.Image = in.From.Name

 					out.BuilderImage = in.From.Name

@@ -99,11 +100,7 @@ func init() {

 				}

 				if len(in.From.Kind) == 0 || in.From.Kind == "ImageStream" || in.From.Kind == "ImageRepository" {

 					out.From.Kind = "ImageStreamTag"

-					if len(in.Tag) > 0 {

-						out.From.Name = out.From.Name + ":" + in.Tag

-					} else {

-						out.From.Name = out.From.Name + ":latest"

-					}

+					out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, in.Tag)

 				}

 			}

 			if in.Image != "" {

@@ -133,15 +130,16 @@ func init() {

 						Kind:      in.From.Kind,

 					}

 				case "ImageStreamTag":

-					bits := strings.Split(in.From.Name, ":")

+					name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name)

+					if !ok {

+						return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)

+					}

 					out.From = &kapi.ObjectReference{

-						Name:      bits[0],

-						Namespace: in.From.Namespace,

 						Kind:      "ImageStream",

+						Namespace: in.From.Namespace,

+						Name:      name,

 					}

-					if len(bits) > 1 {

-						out.Tag = bits[1]

-					}

+					out.Tag = tag

 				case "DockerImage":

 					out.Image = in.From.Name

 					out.BaseImage = in.From.Name

@@ -159,11 +157,7 @@ func init() {

 				}

 				if len(in.From.Kind) == 0 || in.From.Kind == "ImageStream" || in.From.Kind == "ImageRepository" {

 					out.From.Kind = "ImageStreamTag"

-					if len(in.Tag) > 0 {

-						out.From.Name = out.From.Name + ":" + in.Tag

-					} else {

-						out.From.Name = out.From.Name + ":latest"

-					}

+					out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, in.Tag)

 				}

 			}

 			if in.Image != "" {

@@ -191,15 +185,16 @@ func init() {

 						Kind:      in.From.Kind,

 					}

 				case "ImageStreamTag":

-					bits := strings.Split(in.From.Name, ":")

+					name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name)

+					if !ok {

+						return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)

+					}

 					out.From = &kapi.ObjectReference{

-						Name:      bits[0],

-						Namespace: in.From.Namespace,

 						Kind:      "ImageStream",

+						Namespace: in.From.Namespace,

+						Name:      name,

 					}

-					if len(bits) > 1 {

-						out.Tag = bits[1]

-					}

+					out.Tag = tag

 				case "DockerImage":

 					out.Image = in.From.Name

 				}

@@ -217,11 +212,7 @@ func init() {

 				}

 				if len(in.From.Kind) == 0 || in.From.Kind == "ImageStream" || in.From.Kind == "ImageRepository" {

 					out.From.Kind = "ImageStreamTag"

-					if len(in.Tag) > 0 {

-						out.From.Name = out.From.Name + ":" + in.Tag

-					} else {

-						out.From.Name = out.From.Name + ":latest"

-					}

+					out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, in.Tag)

 				}

 			}

 			if len(in.Image) != 0 {

@@ -241,7 +232,7 @@ func init() {

 			out.PushSecretName = in.PushSecretName

 			if len(in.DockerImageReference) > 0 {

 				out.DockerImageReference = in.DockerImageReference

-				ref, err := image.ParseDockerImageReference(in.DockerImageReference)

+				ref, err := imageapi.ParseDockerImageReference(in.DockerImageReference)

 				if err != nil {

 					return err

 				}

@@ -262,7 +253,7 @@ func init() {

 				return nil

 			}

 			if len(in.ImageTag) != 0 {

-				ref, err := image.ParseDockerImageReference(in.ImageTag)

+				ref, err := imageapi.ParseDockerImageReference(in.ImageTag)

 				if err != nil {

 					return err

 				}

@@ -3,14 +3,15 @@ package v1beta3

 import (

 	"fmt"

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

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

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

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

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

 )

 func init() {

-	api.Scheme.AddConversionFuncs(

+	kapi.Scheme.AddConversionFuncs(

 		func(in *newer.Build, out *Build, s conversion.Scope) error {

 			if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {

 				return err

@@ -194,10 +195,29 @@ func init() {

 			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

 		},

 		func(in *newer.BuildOutput, out *BuildOutput, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+				return err

+			}

+			if in.To != nil && (len(in.To.Kind) == 0 || in.To.Kind == "ImageStream") {

+				out.To.Kind = "ImageStreamTag"

+				out.To.Name = imageapi.JoinImageStreamTag(in.To.Name, in.Tag)

+			}

+			return nil

 		},

 		func(in *BuildOutput, out *newer.BuildOutput, s conversion.Scope) error {

-			return s.DefaultConvert(in, out, conversion.IgnoreMissingFields)

+			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

+				return err

+			}

+			if in.To != nil && in.To.Kind == "ImageStreamTag" {

+				name, tag, ok := imageapi.SplitImageStreamTag(in.To.Name)

+				if !ok {

+					return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.To.Name)

+				}

+				out.To.Kind = "ImageStream"

+				out.To.Name = name

+				out.Tag = tag

+			}

+			return nil

 		},

 		func(in *newer.ImageChangeTrigger, out *ImageChangeTrigger, s conversion.Scope) error {

 			out.LastTriggeredImageID = in.LastTriggeredImageID

@@ -209,7 +229,7 @@ func init() {

 		})

 	// Add field conversion funcs.

-	err := api.Scheme.AddFieldLabelConversionFunc("v1beta3", "Build",

+	err := kapi.Scheme.AddFieldLabelConversionFunc("v1beta3", "Build",

 		func(label, value string) (string, string, error) {

 			switch label {

 			case "name":

@@ -226,7 +246,7 @@ func init() {

 		// If one of the conversion functions is malformed, detect it immediately.

 		panic(err)

 	}

-	err = api.Scheme.AddFieldLabelConversionFunc("v1beta3", "BuildConfig",

+	err = kapi.Scheme.AddFieldLabelConversionFunc("v1beta3", "BuildConfig",

 		func(label, value string) (string, string, error) {

 			switch label {

 			case "name":

@@ -19,14 +19,10 @@ type Interface interface {

 	BuildConfigsNamespacer

 	BuildLogsNamespacer

 	ImagesInterfacer

-	ImageRepositoriesNamespacer

-	ImageRepositoryMappingsNamespacer

-	ImageRepositoryTagsNamespacer

 	ImageStreamsNamespacer

 	ImageStreamMappingsNamespacer

 	ImageStreamTagsNamespacer

 	ImageStreamImagesNamespacer

-	DeploymentsNamespacer

 	DeploymentConfigsNamespacer

 	RoutesNamespacer

 	IdentitiesInterface

@@ -71,21 +67,6 @@ func (c *Client) Images() ImageInterface {

 	return newImages(c)

 }

-// ImageRepositories provides a REST client for ImageRepository

-func (c *Client) ImageRepositories(namespace string) ImageRepositoryInterface {

-	return newImageRepositories(c, namespace)

-}

-

-// ImageRepositoryMappings provides a REST client for ImageRepositoryMapping

-func (c *Client) ImageRepositoryMappings(namespace string) ImageRepositoryMappingInterface {

-	return newImageRepositoryMappings(c, namespace)

-}

-

-// ImageRepositoryTags provides a REST client for ImageRepositoryTag

-func (c *Client) ImageRepositoryTags(namespace string) ImageRepositoryTagInterface {

-	return newImageRepositoryTags(c, namespace)

-}

-

 // ImageStreams provides a REST client for ImageStream

 func (c *Client) ImageStreams(namespace string) ImageStreamInterface {

 	return newImageStreams(c, namespace)

@@ -106,11 +87,6 @@ func (c *Client) ImageStreamImages(namespace string) ImageStreamImageInterface {

 	return newImageStreamImages(c, namespace)

 }

-// Deployments provides a REST client for Deployment

-func (c *Client) Deployments(namespace string) DeploymentInterface {

-	return newDeployments(c, namespace)

-}

-

 // DeploymentConfigs provides a REST client for DeploymentConfig

 func (c *Client) DeploymentConfigs(namespace string) DeploymentConfigInterface {

 	return newDeploymentConfigs(c, namespace)

deleted file mode 100644

@@ -1,89 +0,0 @@

-package client

-

-import (

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

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

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

-

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

-)

-

-// DeploymentsNamespacer has methods to work with Deployment resources in a namespace

-type DeploymentsNamespacer interface {

-	Deployments(namespace string) DeploymentInterface

-}

-

-// DeploymentInterface contains methods for working with Deployments

-type DeploymentInterface interface {

-	List(label labels.Selector, field fields.Selector) (*deployapi.DeploymentList, error)

-	Get(name string) (*deployapi.Deployment, error)

-	Create(deployment *deployapi.Deployment) (*deployapi.Deployment, error)

-	Update(deployment *deployapi.Deployment) (*deployapi.Deployment, error)

-	Delete(name string) error

-	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)

-}

-

-// deployments implements DeploymentsNamespacer interface

-type deployments struct {

-	r  *Client

-	ns string

-}

-

-// newDeployments returns a deployments

-func newDeployments(c *Client, namespace string) *deployments {

-	return &deployments{

-		r:  c,

-		ns: namespace,

-	}

-}

-

-// List takes a label and field selector, and returns the list of deployments that match that selectors

-func (c *deployments) List(label labels.Selector, field fields.Selector) (result *deployapi.DeploymentList, err error) {

-	result = &deployapi.DeploymentList{}

-	err = c.r.Get().

-		Namespace(c.ns).

-		Resource("deployments").

-		LabelsSelectorParam(label).

-		FieldsSelectorParam(field).

-		Do().

-		Into(result)

-	return

-}

-

-// Get returns information about a particular deployment

-func (c *deployments) Get(name string) (result *deployapi.Deployment, err error) {

-	result = &deployapi.Deployment{}

-	err = c.r.Get().Namespace(c.ns).Resource("deployments").Name(name).Do().Into(result)

-	return

-}

-

-// Create creates a new deployment

-func (c *deployments) Create(deployment *deployapi.Deployment) (result *deployapi.Deployment, err error) {

-	result = &deployapi.Deployment{}

-	err = c.r.Post().Namespace(c.ns).Resource("deployments").Body(deployment).Do().Into(result)

-	return

-}

-

-// Update updates an existing deployment

-func (c *deployments) Update(deployment *deployapi.Deployment) (result *deployapi.Deployment, err error) {

-	result = &deployapi.Deployment{}

-	err = c.r.Put().Namespace(c.ns).Resource("deployments").Name(deployment.Name).Body(deployment).Do().Into(result)

-	return

-}

-

-// Delete deletes an existing replication deployment.

-func (c *deployments) Delete(name string) error {

-	return c.r.Delete().Namespace(c.ns).Resource("deployments").Name(name).Do().Error()

-}

-

-// Watch returns a watch.Interface that watches the requested deployments.

-func (c *deployments) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	return c.r.Get().

-		Prefix("watch").

-		Namespace(c.ns).

-		Resource("deployments").

-		Param("resourceVersion", resourceVersion).

-		LabelsSelectorParam(label).

-		FieldsSelectorParam(field).

-		Watch()

-}

@@ -44,18 +44,6 @@ func (c *Fake) Images() ImageInterface {

 	return &FakeImages{Fake: c}

 }

-func (c *Fake) ImageRepositories(namespace string) ImageRepositoryInterface {

-	return &FakeImageRepositories{Fake: c, Namespace: namespace}

-}

-

-func (c *Fake) ImageRepositoryMappings(namespace string) ImageRepositoryMappingInterface {

-	return &FakeImageRepositoryMappings{Fake: c, Namespace: namespace}

-}

-

-func (c *Fake) ImageRepositoryTags(namespace string) ImageRepositoryTagInterface {

-	return &FakeImageRepositoryTags{Fake: c, Namespace: namespace}

-}

-

 func (c *Fake) ImageStreams(namespace string) ImageStreamInterface {

 	return &FakeImageStreams{Fake: c, Namespace: namespace}

 }

@@ -72,10 +60,6 @@ func (c *Fake) ImageStreamImages(namespace string) ImageStreamImageInterface {

 	return &FakeImageStreamImages{Fake: c, Namespace: namespace}

 }

-func (c *Fake) Deployments(namespace string) DeploymentInterface {

-	return &FakeDeployments{Fake: c, Namespace: namespace}

-}

-

 func (c *Fake) DeploymentConfigs(namespace string) DeploymentConfigInterface {

 	return &FakeDeploymentConfigs{Fake: c, Namespace: namespace}

 }

deleted file mode 100644

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

-package client

-

-import (

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

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

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

-

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

-)

-

-// FakeDeployments implements BuildInterface. Meant to be embedded into a struct to get a default

-// implementation. This makes faking out just the methods you want to test easier.

-type FakeDeployments struct {

-	Fake      *Fake

-	Namespace string

-}

-

-func (c *FakeDeployments) List(label labels.Selector, field fields.Selector) (*deployapi.DeploymentList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-deployment"}, &deployapi.DeploymentList{})

-	return obj.(*deployapi.DeploymentList), err

-}

-

-func (c *FakeDeployments) Get(name string) (*deployapi.Deployment, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-deployment"}, &deployapi.Deployment{})

-	return obj.(*deployapi.Deployment), err

-}

-

-func (c *FakeDeployments) Create(deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-deployment"}, &deployapi.Deployment{})

-	return obj.(*deployapi.Deployment), err

-}

-

-func (c *FakeDeployments) Update(deployment *deployapi.Deployment) (*deployapi.Deployment, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-deployment", Value: deployment}, &deployapi.Deployment{})

-	return obj.(*deployapi.Deployment), err

-}

-

-func (c *FakeDeployments) Delete(name string) error {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-deployment"})

-	return nil

-}

-

-func (c *FakeDeployments) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-deployments"})

-	return nil, nil

-}

deleted file mode 100644

@@ -1,49 +0,0 @@

-package client

-

-import (

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

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

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

-

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

-)

-

-// FakeImageRepositories implements ImageRepositoryInterface. Meant to be

-// embedded into a struct to get a default implementation. This makes faking

-// out just the methods you want to test easier.

-type FakeImageRepositories struct {

-	Fake      *Fake

-	Namespace string

-}

-

-var _ ImageRepositoryInterface = &FakeImageRepositories{}

-

-func (c *FakeImageRepositories) List(label labels.Selector, field fields.Selector) (*imageapi.ImageRepositoryList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-imagerepositories"}, &imageapi.ImageRepositoryList{})

-	return obj.(*imageapi.ImageRepositoryList), err

-}

-

-func (c *FakeImageRepositories) Get(name string) (*imageapi.ImageRepository, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-imagerepository", Value: name}, &imageapi.ImageRepository{})

-	return obj.(*imageapi.ImageRepository), err

-}

-

-func (c *FakeImageRepositories) Create(repo *imageapi.ImageRepository) (*imageapi.ImageRepository, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-imagerepository"}, &imageapi.ImageRepository{})

-	return obj.(*imageapi.ImageRepository), err

-}

-

-func (c *FakeImageRepositories) Update(repo *imageapi.ImageRepository) (*imageapi.ImageRepository, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-imagerepository"}, &imageapi.ImageRepository{})

-	return obj.(*imageapi.ImageRepository), err

-}

-

-func (c *FakeImageRepositories) Delete(name string) error {

-	_, err := c.Fake.Invokes(FakeAction{Action: "delete-imagerepository", Value: name}, &imageapi.ImageRepository{})

-	return err

-}

-

-func (c *FakeImageRepositories) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-imagerepositories"})

-	return nil, nil

-}

deleted file mode 100644

@@ -1,20 +0,0 @@

-package client

-

-import (

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

-)

-

-// FakeImageRepositories implements ImageRepositoryMappingInterface. Meant to

-// be embedded into a struct to get a default implementation. This makes faking

-// out just the methods you want to test easier.

-type FakeImageRepositoryMappings struct {

-	Fake      *Fake

-	Namespace string

-}

-

-var _ ImageRepositoryMappingInterface = &FakeImageRepositoryMappings{}

-

-func (c *FakeImageRepositoryMappings) Create(mapping *imageapi.ImageRepositoryMapping) error {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "create-imagerepository-mapping"})

-	return nil

-}

deleted file mode 100644

@@ -1,27 +0,0 @@

-package client

-

-import (

-	"fmt"

-

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

-)

-

-// FakeImageRepositoryTags implements ImageRepositoryTagInterface. Meant to be

-// embedded into a struct to get a default implementation. This makes faking

-// out just the methods you want to test easier.

-type FakeImageRepositoryTags struct {

-	Fake      *Fake

-	Namespace string

-}

-

-var _ ImageRepositoryTagInterface = &FakeImageRepositoryTags{}

-

-func (c *FakeImageRepositoryTags) Get(name, tag string) (result *imageapi.ImageRepositoryTag, err error) {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "get-imagerepository-tag", Value: fmt.Sprintf("%s:%s", name, tag)})

-	return &imageapi.ImageRepositoryTag{}, nil

-}

-

-func (c *FakeImageRepositoryTags) Delete(name, tag string) error {

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-imagerepository-tag", Value: fmt.Sprintf("%s:%s", name, tag)})

-	return nil

-}

@@ -335,32 +335,3 @@ func (d *LatestDeploymentDescriber) describeDeploymentStatus(deploy *kapi.Replic

 		return fmt.Sprintf("#%s deployment %s %s ago", deploy.Annotations[deployapi.DeploymentVersionAnnotation], strings.ToLower(s), timeAt)

 	}

 }

-

-// DeploymentDescriber generates information about a deployment

-// DEPRECATED.

-type DeploymentDescriber struct {

-	client.Interface

-}

-

-// Describe returns a description of a DeploymentDescriber

-func (d *DeploymentDescriber) Describe(namespace, name string) (string, error) {

-	c := d.Deployments(namespace)

-	deployment, err := c.Get(name)

-	if err != nil {

-		return "", err

-	}

-

-	return tabbedString(func(out *tabwriter.Writer) error {

-		formatMeta(out, deployment.ObjectMeta)

-		formatString(out, "Status", bold(deployment.Status))

-		formatString(out, "Strategy", deployment.Strategy.Type)

-		causes := []string{}

-		if deployment.Details != nil {

-			for _, c := range deployment.Details.Causes {

-				causes = append(causes, string(c.Type))

-			}

-		}

-		formatString(out, "Causes", strings.Join(causes, ","))

-		return nil

-	})

-}

@@ -37,8 +37,6 @@ func DescriberFor(kind string, c *client.Client, kclient kclient.Interface, host

 		return &BuildConfigDescriber{c, host}, true

 	case "BuildLog":

 		return &BuildLogDescriber{c}, true

-	case "Deployment":

-		return &DeploymentDescriber{c}, true

 	case "DeploymentConfig":

 		return NewDeploymentConfigDescriber(c, kclient), true

 	case "Identity":

@@ -28,7 +28,7 @@ type describeClient struct {

 func TestDescribeFor(t *testing.T) {

 	c := &client.Client{}

 	testTypesList := []string{

-		"Build", "BuildConfig", "BuildLog", "Deployment", "DeploymentConfig",

+		"Build", "BuildConfig", "BuildLog", "DeploymentConfig",

 		"Image", "ImageStream", "ImageStreamTag", "ImageStreamImage",

 		"Route", "Project",

 	}

@@ -49,7 +49,6 @@ func TestDescribers(t *testing.T) {

 		&BuildDescriber{c, fakeKube},

 		&BuildConfigDescriber{c, ""},

 		&BuildLogDescriber{c},

-		&DeploymentDescriber{c},

 		&ImageDescriber{c},

 		&ImageStreamDescriber{c},

 		&ImageStreamTagDescriber{c},

@@ -285,6 +285,8 @@ func describeBuildStatus(build *buildapi.Build, t *util.Time, parentName string)

 		return fmt.Sprintf("build %s succeeded %s ago%s", name, time, revision)

 	case buildapi.BuildStatusError:

 		return fmt.Sprintf("build %s stopped with an error %s ago%s", name, time, revision)

+	case buildapi.BuildStatusFailed:

+		return fmt.Sprintf("build %s failed %s ago%s", name, time, revision)

 	default:

 		status := strings.ToLower(string(build.Status))

 		return fmt.Sprintf("build %s %s for %s%s", name, status, time, revision)

@@ -33,6 +33,7 @@ const (

 	KubeAPIPrefixV1Beta1 = "/api/v1beta1"

 	KubeAPIPrefixV1Beta2 = "/api/v1beta2"

 	KubeAPIPrefixV1Beta3 = "/api/v1beta3"

+	KubeAPIPrefixV1      = "/api/v1"

 )

 // TODO: Longer term we should read this from some config store, rather than a flag.

@@ -69,6 +70,8 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 		KubeletClient:    kubeletClient,

 		APIPrefix:        KubeAPIPrefix,

+		EnableV1: true,

+

 		Authorizer:       c.Authorizer,

 		AdmissionControl: c.AdmissionControl,

 	}

@@ -78,6 +81,7 @@ func (c *MasterConfig) InstallAPI(container *restful.Container) []string {

 		fmt.Sprintf("Started Kubernetes API at %%s%s", KubeAPIPrefixV1Beta1),

 		fmt.Sprintf("Started Kubernetes API at %%s%s", KubeAPIPrefixV1Beta3),

 		fmt.Sprintf("Started Kubernetes API at %%s%s", KubeAPIPrefixV1Beta3),

+		fmt.Sprintf("Started Kubernetes API at %%s%s (experimental)", KubeAPIPrefixV1),

 	}

 }

@@ -121,7 +121,10 @@ const (

 	swaggerAPIPrefix          = "/swaggerapi/"

 )