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

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

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

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

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

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

 )

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

@@ -26,7 +26,7 @@ const OldestVersion = "v1beta1"

 // 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", "v1beta2"}

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

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

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

@@ -62,9 +62,9 @@ func InterfacesFor(version string) (*kmeta.VersionInterfaces, error) {

 			ObjectConvertor:  api.Scheme,

 			MetadataAccessor: accessor,

 		}, nil

-	case "v1beta2":

+	case "v1beta3":

 		return &kmeta.VersionInterfaces{

-			Codec:            v1beta2.Codec,

+			Codec:            v1beta3.Codec,

 			ObjectConvertor:  api.Scheme,

 			MetadataAccessor: accessor,

 		}, nil

@@ -121,10 +121,10 @@ func init() {

 		"v1beta1": true,

 	}

-	// backwards compatibility, prior to v1beta2, we identified the namespace as a query parameter

+	// backwards compatibility, prior to v1beta3, we identified the namespace as a query parameter

 	versionToNamespaceScope := map[string]kmeta.RESTScope{

 		"v1beta1": kmeta.RESTScopeNamespaceLegacy,

-		"v1beta2": kmeta.RESTScopeNamespace,

+		"v1beta3": kmeta.RESTScopeNamespace,

 	}

 	// the list of kinds that are scoped at the root of the api hierarchy

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

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

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

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

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

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

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

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

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

@@ -52,13 +52,13 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 		},

 		func(j *image.ImageRepositoryMapping, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

-			if forVersion == "v1beta2" {

+			if forVersion == "v1beta3" {

 				j.DockerImageRepository = ""

 			}

 		},

 		func(j *image.ImageStreamMapping, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

-			if forVersion == "v1beta2" {

+			if forVersion == "v1beta3" {

 				j.DockerImageRepository = ""

 			}

 		},

@@ -183,7 +183,7 @@ func TestSpecificKind(t *testing.T) {

 	fuzzInternalObject(t, "", item, seed)

 	roundTrip(t, osapi.Codec, item)

 	roundTrip(t, v1beta1.Codec, item)

-	roundTrip(t, v1beta2.Codec, item)

+	roundTrip(t, v1beta3.Codec, item)

 }

 func TestTypes(t *testing.T) {

@@ -218,8 +218,8 @@ func TestTypes(t *testing.T) {

 				roundTrip(t, v1beta1.Codec, item)

 			}

 			if _, ok := skipV1beta2[kind]; !ok {

-				fuzzInternalObject(t, "v1beta2", item, seed)

-				roundTrip(t, v1beta2.Codec, item)

+				fuzzInternalObject(t, "v1beta3", item, seed)

+				roundTrip(t, v1beta3.Codec, item)

 			}

 		}

 	}

@@ -1,2 +1,2 @@

-// Package v1beta2 is the v1beta2 version of the API.

-package v1beta2

+// Package v1beta3 is the v1beta3 version of the API.

+package v1beta3

@@ -1,25 +1,25 @@

-package v1beta2

+package v1beta3

 import (

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

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

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

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

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

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

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

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

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

+	_ "github.com/openshift/origin/pkg/authorization/api/v1beta3"

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

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

+	_ "github.com/openshift/origin/pkg/oauth/api/v1beta3"

+	_ "github.com/openshift/origin/pkg/project/api/v1beta3"

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

+	_ "github.com/openshift/origin/pkg/user/api/v1beta3"

-	/*_ "github.com/openshift/origin/pkg/route/api/v1beta2"

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

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

+	/*_ "github.com/openshift/origin/pkg/route/api/v1beta3"

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

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

 	*/)

-// Codec encodes internal objects to the v1beta2 scheme

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

+// Codec encodes internal objects to the v1beta3 scheme

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

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2")

+	api.Scheme.AddKnownTypes("v1beta3")

 }

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

 	"sort"

@@ -1,11 +1,11 @@

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&Role{},

 		&RoleBinding{},

 		&Policy{},

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -291,7 +291,7 @@ type ImageChangeTrigger struct {

 	// immutable image id supplied by the ImageStream when this trigger fires.

 	Image string `json:"image"`

 	// From is a reference to an image stream to watch for changes. This field takes

-	// precedence over ImageRepositoryRef, which is deprecated and will be removed in v1beta2. The

+	// precedence over ImageRepositoryRef, which is deprecated and will be removed in v1beta3. The

 	// Kind may be left blank, in which case it defaults to "ImageStream". The "Name" is

 	// the only required subfield - if Namespace is blank, the namespace of the current build

 	// trigger will be used.

@@ -201,7 +201,7 @@ type DockerBuildStrategy struct {

 	// BaseImage is optional and indicates the image that the dockerfile for this

 	// build should "FROM".  If present, the build process will substitute this value

 	// into the FROM line of the dockerfile.

-	// Deprecated: will be removed in v1beta2, use Image.

+	// Deprecated: will be removed in v1beta3, use Image.

 	BaseImage string `json:"baseImage,omitempty"`

 	// Image is optional and indicates the image that the dockerfile for this

@@ -213,7 +213,7 @@ type DockerBuildStrategy struct {

 // STIBuildStrategy defines input parameters specific to an STI build.

 type STIBuildStrategy struct {

 	// BuilderImage is the image used to execute the build.

-	// Deprecated: will be removed in v1beta2, use Image.

+	// Deprecated: will be removed in v1beta3, use Image.

 	BuilderImage string `json:"builderImage,omitempty"`

 	// Image is the image used to execute the build.

@@ -235,7 +235,7 @@ type STIBuildStrategy struct {

 	Scripts string `json:"scripts,omitempty"`

 	// Clean flag forces the STI build to not do incremental builds if true.

-	// Deprecated: in v1beta2 it will be replaced by Incremental.

+	// Deprecated: in v1beta3 it will be replaced by Incremental.

 	Clean bool `json:"clean,omitempty"`

 }

@@ -308,7 +308,7 @@ type ImageChangeTrigger struct {

 	Image          string `json:"image"`

 	RepositoryName string `json:"repositoryName,omitempty"`

 	// From is a reference to an image stream to watch for changes. This field takes

-	// precedence over ImageRepositoryRef, which is deprecated and will be removed in v1beta2. The

+	// precedence over ImageRepositoryRef, which is deprecated and will be removed in v1beta3. The

 	// Kind may be left blank, in which case it defaults to "ImageStream". The "Name" is

 	// the only required subfield - if Namespace is blank, the namespace of the current build

 	// trigger will be used.

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

 	return []string{

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

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

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

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

 	}

 }

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

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

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

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

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

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

 	buildcontrollerfactory "github.com/openshift/origin/pkg/build/controller/factory"

 	buildstrategy "github.com/openshift/origin/pkg/build/controller/strategy"

@@ -105,9 +105,9 @@ const (

 	OpenShiftAPIPrefix        = "/osapi" // TODO: make configurable

 	KubernetesAPIPrefix       = "/api"   // TODO: make configurable

 	OpenShiftAPIV1Beta1       = "v1beta1"

-	OpenShiftAPIV1Beta2       = "v1beta2"

+	OpenShiftAPIV1Beta3       = "v1beta3"

 	OpenShiftAPIPrefixV1Beta1 = OpenShiftAPIPrefix + "/" + OpenShiftAPIV1Beta1

-	OpenShiftAPIPrefixV1Beta2 = OpenShiftAPIPrefix + "/" + OpenShiftAPIV1Beta2

+	OpenShiftAPIPrefixV1Beta3 = OpenShiftAPIPrefix + "/" + OpenShiftAPIV1Beta3

 	OpenShiftRouteSubdomain   = "router.default.local"

 	swaggerAPIPrefix          = "/swaggerapi/"

 )

@@ -250,9 +250,9 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 		v1beta1Storage[k] = v

 		v1beta1Storage[strings.ToLower(k)] = v

 	}

-	v1beta2Storage := map[string]rest.Storage{}

+	v1beta3Storage := map[string]rest.Storage{}

 	for k, v := range storage {

-		v1beta2Storage[strings.ToLower(k)] = v

+		v1beta3Storage[strings.ToLower(k)] = v

 	}

 	version := &apiserver.APIGroupVersion{

@@ -279,10 +279,10 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	version2 := &apiserver.APIGroupVersion{

 		Root:    OpenShiftAPIPrefix,

-		Version: OpenShiftAPIV1Beta2,

+		Version: OpenShiftAPIV1Beta3,

-		Storage: v1beta2Storage,

-		Codec:   v1beta2.Codec,

+		Storage: v1beta3Storage,

+		Codec:   v1beta3.Codec,

 		Mapper: latest.RESTMapper,

@@ -295,11 +295,11 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 	}

 	if err := version2.InstallREST(container); err != nil {

-		// TODO: remove this check once v1beta2 is complete

+		// TODO: remove this check once v1beta3 is complete

 		if utilerrs.FilterOut(err, func(err error) bool {

 			return strings.Contains(err.Error(), "is registered for version")

 		}) != nil {

-			glog.Fatalf("Unable to initialize v1beta2 API: %v", err)

+			glog.Fatalf("Unable to initialize v1beta3 API: %v", err)

 		}

 	}

@@ -310,19 +310,19 @@ func (c *MasterConfig) InstallProtectedAPI(container *restful.Container) []strin

 			root = svc

 		case OpenShiftAPIPrefixV1Beta1:

 			svc.Doc("OpenShift REST API, version v1beta1").ApiVersion("v1beta1")

-		case OpenShiftAPIPrefixV1Beta2:

-			svc.Doc("OpenShift REST API, version v1beta2").ApiVersion("v1beta2")

+		case OpenShiftAPIPrefixV1Beta3:

+			svc.Doc("OpenShift REST API, version v1beta3").ApiVersion("v1beta3")

 		}

 	}

 	if root == nil {

 		root = new(restful.WebService)

 		container.Add(root)

 	}

-	initAPIVersionRoute(root, "v1beta1", "v1beta2")

+	initAPIVersionRoute(root, "v1beta1", "v1beta3")

 	return []string{

 		fmt.Sprintf("Started OpenShift API at %%s%s", OpenShiftAPIPrefixV1Beta1),

-		fmt.Sprintf("Started OpenShift API at %%s%s (experimental)", OpenShiftAPIPrefixV1Beta2),

+		fmt.Sprintf("Started OpenShift API at %%s%s (experimental)", OpenShiftAPIPrefixV1Beta3),

 	}

 }

@@ -377,7 +377,7 @@ func indexAPIPaths(handler http.Handler) http.Handler {

 			object := api.RootPaths{Paths: []string{

 				"/api",

 				"/api/v1beta1",

-				"/api/v1beta2",

+				"/api/v1beta3",

 				"/api/v1beta3",

 				"/healthz",

 				"/healthz/ping",

@@ -3,5 +3,5 @@ package api

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

 // Config implements the Kubernetes api.List

-// DEPRECATED: The version v1beta2 should use api.List instead of Config

+// DEPRECATED: The version v1beta3 should use api.List instead of Config

 type Config kapi.List

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -1,11 +1,11 @@

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypeWithName("v1beta2", "Config", &List{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "Config", &List{})

 }

 func (*List) IsAnAPIObject() {}

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -219,10 +219,10 @@ type DeploymentTriggerImageChangeParams struct {

 	// ContainerNames is used to restrict tag updates to the specified set of container names in a pod.

 	ContainerNames []string `json:"containerNames,omitempty"`

 	// RepositoryName is the identifier for a Docker image repository to watch for changes.

-	// DEPRECATED: will be removed in v1beta2.

+	// DEPRECATED: will be removed in v1beta3.

 	RepositoryName string `json:"repositoryName,omitempty"`

 	// From is a reference to a Docker image repository to watch for changes. This field takes

-	// precedence over RepositoryName, which is deprecated and will be removed in v1beta2. The

+	// precedence over RepositoryName, which is deprecated and will be removed in v1beta3. The

 	// Kind may be left blank, in which case it defaults to "ImageRepository". The "Name" is

 	// the only required subfield - if Namespace is blank, the namespace of the current deployment

 	// trigger will be used.

@@ -220,10 +220,10 @@ type DeploymentTriggerImageChangeParams struct {

 	// ContainerNames is used to restrict tag updates to the specified set of container names in a pod.

 	ContainerNames []string `json:"containerNames,omitempty"`

 	// RepositoryName is the identifier for a Docker image repository to watch for changes.

-	// DEPRECATED: will be removed in v1beta2.

+	// DEPRECATED: will be removed in v1beta3.

 	RepositoryName string `json:"repositoryName,omitempty"`

 	// From is a reference to a Docker image repository to watch for changes. This field takes

-	// precedence over RepositoryName, which is deprecated and will be removed in v1beta2. The

+	// precedence over RepositoryName, which is deprecated and will be removed in v1beta3. The

 	// Kind may be left blank, in which case it defaults to "ImageRepository". The "Name" is

 	// the only required subfield - if Namespace is blank, the namespace of the current deployment

 	// trigger will be used.

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

 	"sort"

@@ -1,4 +1,4 @@

-package v1beta2_test

+package v1beta3_test

 import (

 	"reflect"

@@ -26,7 +26,7 @@ func TestRoundTripVersionedObject(t *testing.T) {

 		DockerImageReference: "foo/bar/baz",

 	}

-	data, err := kapi.Scheme.EncodeToVersion(i, "v1beta2")

+	data, err := kapi.Scheme.EncodeToVersion(i, "v1beta3")

 	if err != nil {

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

 	}

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&Image{},

 		&ImageList{},

 		&ImageStream{},

@@ -18,11 +18,11 @@ func init() {

 		&ImageStreamImage{},

 	)

 	// Legacy names are supported

-	api.Scheme.AddKnownTypeWithName("v1beta2", "ImageRepository", &ImageStream{})

-	api.Scheme.AddKnownTypeWithName("v1beta2", "ImageRepositoryList", &ImageStreamList{})

-	api.Scheme.AddKnownTypeWithName("v1beta2", "ImageRepositoryMapping", &ImageStreamMapping{})

-	api.Scheme.AddKnownTypeWithName("v1beta2", "ImageRepositoryTag", &ImageStreamTag{})

-	api.Scheme.AddKnownTypeWithName("v1beta2", "ImageRepositoryImage", &ImageStreamImage{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "ImageRepository", &ImageStream{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "ImageRepositoryList", &ImageStreamList{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "ImageRepositoryMapping", &ImageStreamMapping{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "ImageRepositoryTag", &ImageStreamTag{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "ImageRepositoryImage", &ImageStreamImage{})

 }

 func (*Image) IsAnAPIObject()              {}

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -1,11 +1,11 @@

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&OAuthAccessToken{},

 		&OAuthAccessTokenList{},

 		&OAuthAuthorizeToken{},

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -1,11 +1,11 @@

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&Project{},

 		&ProjectList{},

 	)

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

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

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&Template{},

 		&TemplateList{},

 	)

-	api.Scheme.AddKnownTypeWithName("v1beta2", "TemplateConfig", &Template{})

+	api.Scheme.AddKnownTypeWithName("v1beta3", "TemplateConfig", &Template{})

 }

 func (*Template) IsAnAPIObject()     {}

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

 import (

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

@@ -1,11 +1,11 @@

-package v1beta2

+package v1beta3

 import (

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

 )

 func init() {

-	api.Scheme.AddKnownTypes("v1beta2",

+	api.Scheme.AddKnownTypes("v1beta3",

 		&User{},

 		&UserList{},

 		&Identity{},

@@ -1,4 +1,4 @@

-package v1beta2

+package v1beta3

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