@@ -108,9 +108,9 @@ report should be stored. For example:

 After that you can open `/path/to/dir/coverage.html` in the browser.

-To generate a jUnit XML report from the output of the tests, and see a summary of the test output 

+To generate a jUnit XML report from the output of the tests, and see a summary of the test output

 instead of the full test output, use:

-    

+

     $ JUNIT_REPORT=true hack/test-go.sh

 `hack/test-go.sh` cannot generate jUnit XML and a coverage report for all packages at once. If you

@@ -476,7 +476,7 @@ OpenShift and Kubernetes integrate with the [Swagger 2.0 API framework](http://s

     $ openshift start --cors-allowed-origins=.*

-and then browse to http://openshift3swagger-claytondev.rhcloud.com (which runs a copy of the Swagger UI that points to localhost:8080 by default).  Expand the operations available on v1beta3 to see the schemas (and to try the API directly).

+and then browse to http://openshift3swagger-claytondev.rhcloud.com (which runs a copy of the Swagger UI that points to localhost:8080 by default).  Expand the operations available on v1 to see the schemas (and to try the API directly).

 Note: Hosted API documentation can be found [here](http://docs.openshift.org/latest/rest_api/openshift_v1.html).

@@ -12,7 +12,7 @@ In OpenShift, deployment is an update to a single replication controller's pod t

 #### Concepts

-An OpenShift `deploymentConfig` describes a single `template` and a set of `triggers` for when a new `deployment` should be created. A `deployment` is simply a specially annotated `replicationController`. A `strategy` is responsible for making a `deployment` live in the cluster. 

+An OpenShift `deploymentConfig` describes a single `template` and a set of `triggers` for when a new `deployment` should be created. A `deployment` is simply a specially annotated `replicationController`. A `strategy` is responsible for making a `deployment` live in the cluster.

 Each time a new deployment is created, the `latestVersion` field of `deploymentConfig` is incremented, and a `deploymentCause` is added to the `deploymentConfig` describing the change that led to the latest deployment.

@@ -23,7 +23,7 @@ A `deploymentConfig` in OpenShift is a REST object which can be POSTed to the AP

 ```

 {

   "kind": "DeploymentConfig",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "metadata": {

     "name": "frontend"

   },

@@ -148,7 +148,7 @@ The algorithm for this `strategy` is:

 ##### Custom strategy

-The Custom `strategy` allows users of OpenShift to provide their own deployment behavior. 

+The Custom `strategy` allows users of OpenShift to provide their own deployment behavior.

 ```

 {

@@ -187,7 +187,7 @@ The `rollback` API object configures the generation process and provides the sco

 ```

 {

   "kind": "DeploymentConfigRollback",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "spec": {

     "from": {

       "name": "deployment-1"

@@ -32,7 +32,7 @@ Decrypt data encrypted with "oc adm ca encrypt"

 ----

 	# Decrypt an encrypted file to a cleartext file:

 	oc adm ca decrypt --key=secret.key --in=secret.encrypted --out=secret.decrypted

-	

+

 	# Decrypt from stdin to stdout:

 	oc adm ca decrypt --key=secret.key < secret2.encrypted > secret2.decrypted

@@ -49,7 +49,7 @@ Encrypt data with AES-256-CBC encryption

 ----

 	# Encrypt the content of secret.txt with a generated key:

 	oc adm ca encrypt --genkey=secret.key --in=secret.txt --out=secret.encrypted

-	

+

 	# Encrypt the content of secret2.txt with an existing key:

 	oc adm ca encrypt --key=secret.key < secret2.txt > secret2.encrypted

@@ -91,7 +91,7 @@ Change configuration files for the client

 ----

   # Change the config context to use

   oc adm config use-context my-context

-  

+

   # Set the value of a config preference

   oc adm config set preferences.some true

 ----

@@ -120,10 +120,10 @@ Sets a cluster entry in kubeconfig

 ----

   # Set only the server field on the e2e cluster entry without touching other values.

   oc adm config set-cluster e2e --server=https://1.2.3.4

-  

+

   # Embed certificate authority data for the e2e cluster entry

   oc adm config set-cluster e2e --certificate-authority=~/.kube/e2e/kubernetes.ca.crt

-  

+

   # Disable cert checking for the dev cluster entry

   oc adm config set-cluster e2e --insecure-skip-tls-verify=true

 ----

@@ -153,10 +153,10 @@ Sets a user entry in kubeconfig

   # Set only the "client-key" field on the "cluster-admin"

   # entry, without touching other values:

   oc adm config set-credentials cluster-admin --client-key=~/.kube/admin.key

-  

+

   # Set basic auth for the "cluster-admin" entry

   oc adm config set-credentials cluster-admin --username=admin --password=uXFGweU9l35qcif

-  

+

   # Embed client certificate data in the "cluster-admin" entry

   oc adm config set-credentials cluster-admin --client-certificate=~/.kube/admin.crt --embed-certs=true

 ----

@@ -172,7 +172,7 @@ Displays merged kubeconfig settings or a specified kubeconfig file.

 ----

   # Show Merged kubeconfig settings.

   oc adm config view

-  

+

   # Get the password for the e2e user

   oc adm config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'

 ----

@@ -580,7 +580,7 @@ Install a router

   # Run the router with a hint to the underlying implementation to _not_ expose statistics.

   oc adm router router-west --stats-port=0

-  

+

 ----

 ====

@@ -766,7 +766,7 @@ Change configuration files for the client

 ----

   # Change the config context to use

   oc config use-context my-context

-  

+

   # Set the value of a config preference

   oc config set preferences.some true

 ----

@@ -795,10 +795,10 @@ Sets a cluster entry in kubeconfig

 ----

   # Set only the server field on the e2e cluster entry without touching other values.

   oc config set-cluster e2e --server=https://1.2.3.4

-  

+

   # Embed certificate authority data for the e2e cluster entry

   oc config set-cluster e2e --certificate-authority=~/.kube/e2e/kubernetes.ca.crt

-  

+

   # Disable cert checking for the dev cluster entry

   oc config set-cluster e2e --insecure-skip-tls-verify=true

 ----

@@ -828,10 +828,10 @@ Sets a user entry in kubeconfig

   # Set only the "client-key" field on the "cluster-admin"

   # entry, without touching other values:

   oc config set-credentials cluster-admin --client-key=~/.kube/admin.key

-  

+

   # Set basic auth for the "cluster-admin" entry

   oc config set-credentials cluster-admin --username=admin --password=uXFGweU9l35qcif

-  

+

   # Embed client certificate data in the "cluster-admin" entry

   oc config set-credentials cluster-admin --client-certificate=~/.kube/admin.crt --embed-certs=true

 ----

@@ -847,7 +847,7 @@ Displays merged kubeconfig settings or a specified kubeconfig file.

 ----

   # Show Merged kubeconfig settings.

   oc config view

-  

+

   # Get the password for the e2e user

   oc config view -o jsonpath='{.users[?(@.name == "e2e")].user.password}'

 ----

@@ -884,7 +884,7 @@ Create a resource by filename or stdin

 ----

   # Create a pod using the data in pod.json.

   oc create -f pod.json

-  

+

   # Create a pod based on the JSON passed into stdin.

   cat pod.json | oc create -f -

 ----

@@ -913,10 +913,10 @@ Create a configMap from a local file, directory or literal value.

 ----

   # Create a new configmap named my-config with keys for each file in folder bar

   oc create configmap my-config --from-file=path/to/bar

-  

+

   # Create a new configmap named my-config with specified keys instead of names on disk

   oc create configmap my-config --from-file=key1=/path/to/bar/file1.txt --from-file=key2=/path/to/bar/file2.txt

-  

+

   # Create a new configMap named my-config with key1=config1 and key2=config2

   oc create configmap my-config --from-literal=key1=config1 --from-literal=key2=config2

 ----

@@ -997,7 +997,7 @@ Create a route that uses edge TLS termination

 ----

   # Create an edge route named "my-route" that exposes frontend service.

   oc create route edge my-route --service=frontend

-  

+

   # Create an edge route that exposes the frontend service and specify a path.

   # If the route name is omitted, the service name will be re-used.

   oc create route edge --service=frontend --path /assets

@@ -1014,7 +1014,7 @@ Create a route that uses passthrough TLS termination

 ----

   # Create a passthrough route named "my-route" that exposes the frontend service.

   oc create route passthrough my-route --service=frontend

-  

+

   # Create a passthrough route that exposes the frontend service and specify

   # a hostname. If the route name is omitted, the service name will be re-used.

   oc create route passthrough --service=frontend --hostname=www.example.com

@@ -1031,7 +1031,7 @@ Create a route that uses reencrypt TLS termination

 ----

   # Create a route named "my-route" that exposes the frontend service.

   oc create route reencrypt my-route --service=frontend --dest-ca-cert cert.cert

-  

+

   # Create a reencrypt route that exposes the frontend service and re-use

   # the service name as the route name.

   oc create route reencrypt --service=frontend --dest-ca-cert cert.cert

@@ -1061,10 +1061,10 @@ Create a secret from a local file, directory or literal value.

 ----

   # Create a new secret named my-secret with keys for each file in folder bar

   oc create secret generic my-secret --from-file=path/to/bar

-  

+

   # Create a new secret named my-secret with specified keys instead of names on disk

   oc create secret generic my-secret --from-file=ssh-privatekey=~/.ssh/id_rsa --from-file=ssh-publickey=~/.ssh/id_rsa.pub

-  

+

   # Create a new secret named my-secret with key1=supersecret and key2=topsecret

   oc create secret generic my-secret --from-literal=key1=supersecret --from-literal=key2=topsecret

 ----

@@ -1218,8 +1218,8 @@ Edit a resource on the server

   # Use an alternative editor

   OC_EDITOR="nano" oc edit dc/my-deployment

-  # Edit the service 'docker-registry' in JSON using the v1beta3 API format:

-  oc edit svc/docker-registry --output-version=v1beta3 -o json

+  # Edit the service 'docker-registry' in JSON using the v1 API format:

+  oc edit svc/docker-registry --output-version=v1 -o json

 ----

 ====

@@ -1325,9 +1325,6 @@ Export resources so they can be used elsewhere

   # export to JSON

   oc export service -o json

-

-  # convert a file on disk to the latest API version (in YAML, the default)

-  oc export -f a_v1beta3_service.json --output-version=v1 --exact

 ----

 ====

@@ -2059,7 +2056,7 @@ Generate a new token for a service account.

   # Generate a new token for service account 'default'

   oc serviceaccounts new-token 'default'

-  # Generate a new token for service account 'default' and apply 

+  # Generate a new token for service account 'default' and apply

   # labels 'foo' and 'bar' to the new token for identification

   # oc serviceaccounts new-token 'default' --labels foo=foo-value,bar=bar-value

@@ -205,7 +205,7 @@ This API answers the question: which users and groups can perform the specified

 // input

 {

 	"kind": "ResourceAccessReview",

-	"apiVersion": "v1beta3",

+	"apiVersion": "v1",

 	"verb": "list",

 	"resource": "replicationcontrollers"

 }

@@ -218,7 +218,7 @@ accessReviewResult, err := Client.ResourceAccessReviews(namespace).Create(resour

 // output

 {

 	"kind": "ResourceAccessReviewResponse",

-	"apiVersion": "v1beta3",

+	"apiVersion": "v1",

 	"namespace": "default"

 	"users": ["Clark", "Hubert"],

 	"groups": ["cluster-admins"]

@@ -262,13 +262,13 @@ This API answers the question: can a user or group (use authenticated user if no

 // input

 {

 	"kind": "SubjectAccessReview",

-	"apiVersion": "v1beta3",

+	"apiVersion": "v1",

 	"verb": "create",

 	"resource": "pods",

 	"user": "Clark",

 	"content": {

 		"kind": "pods",

-		"apiVersion": "v1beta3"

+		"apiVersion": "v1"

 		// rest of pod content

 	}

 }

@@ -281,7 +281,7 @@ accessReviewResult, err := Client.SubjectAccessReviews(namespace).Create(subject

 // output

 {

 	"kind": "SubjectAccessReviewResponse",

-	"apiVersion": "v1beta3",

+	"apiVersion": "v1",

 	"namespace": "default",

 	"allowed": true

 }

@@ -282,7 +282,7 @@ A database is exposed to the application using a service:

 ```json

 {

   "kind": "Service",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "metadata": {

     "name": "mysql"

   },

@@ -310,7 +310,7 @@ A deployment configuration describes the template for application deployments:

 ```json

 {

   "kind": "DeploymentConfig",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "metadata": {

     "name": "rails"

   },

@@ -133,7 +133,7 @@ pod.json

     {

       "kind": "Pod",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-pod",

         "labels": {

@@ -170,7 +170,7 @@ service.json

     {

       "kind": "Service",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-openshift"

       },

@@ -196,7 +196,7 @@ route.json

     {

       "kind": "Route",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-route"

       },

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: LimitRange

 metadata:

   name: limit

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: ResourceQuota

 metadata:

   creationTimestamp: null

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: Service

 metadata:

   name: openshift-service

@@ -19,7 +19,7 @@ at most to a single host.

 ```shell

 $ cat pod-with-resources.yaml

-apiVersion: v1beta3

+apiVersion: v1

 kind: Pod

 metadata:

   name: pod-with-resources

@@ -106,7 +106,7 @@ cpu and memory.

 ```shell

 $ cat pod-without-resources.yaml

-apiVersion: v1beta3

+apiVersion: v1

 kind: Pod

 metadata:

   name: pod-without-resources

@@ -144,7 +144,7 @@ So let's set some default limits for this project:

 ```shell

 $ cat limits.yaml

-apiVersion: v1beta3

+apiVersion: v1

 kind: LimitRange

 metadata:

   name: limits

@@ -259,7 +259,7 @@ Labels:   <none>

 Description:  This example shows how to create a simple ruby application in openshift origin v3

 Annotations:  iconClass=icon-ruby,tags=instant-app,ruby,mysql

-Parameters:    

+Parameters:

     Name:   ADMIN_USERNAME

     Description:  administrator username

     Generated:    expression

@@ -316,7 +316,7 @@ Parameters:

 Object Labels:  template=application-template-stibuild

-Objects:   

+Objects:

     Service frontend

     Route route-edge

     ImageStream origin-ruby-sample

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

 {

   "kind": "Template",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "metadata": {

     "name": "ruby-helloworld-sample-with-resources",

     "creationTimestamp": null,

@@ -13,7 +13,7 @@

   "objects": [

     {

       "kind": "Service",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "frontend",

         "creationTimestamp": null

@@ -41,7 +41,7 @@

     },

     {

       "kind": "Route",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "route-edge",

         "creationTimestamp": null

@@ -63,7 +63,7 @@

     },

     {

       "kind": "ImageStream",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "origin-ruby-sample",

         "creationTimestamp": null

@@ -75,7 +75,7 @@

     },

     {

       "kind": "ImageStream",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "ruby-20-centos7",

         "creationTimestamp": null

@@ -89,11 +89,11 @@

     },

     {

       "kind": "BuildConfig",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "ruby-sample-build",

         "namespace": "quota-demo",

-        "selfLink": "/osapi/v1beta3/namespaces/quota-demo/buildconfigs/ruby-sample-build",

+        "selfLink": "/osapi/v1/namespaces/quota-demo/buildconfigs/ruby-sample-build",

         "uid": "bf2174b3-fe5e-11e4-8f83-080027893417",

         "creationTimestamp": "2015-05-19T19:39:21Z",

         "labels": {

@@ -157,7 +157,7 @@

     },

     {

       "kind": "DeploymentConfig",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "frontend",

         "namespace": "test",

@@ -292,7 +292,7 @@

     },

     {

       "kind": "Service",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "database",

         "creationTimestamp": null

@@ -320,7 +320,7 @@

     },

     {

       "kind": "DeploymentConfig",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "database",

         "namespace": "test",

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: LimitRange

 metadata:

   creationTimestamp: null

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: Pod

 metadata:

   creationTimestamp: null

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: Pod

 metadata:

   creationTimestamp: null

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

-apiVersion: v1beta3

+apiVersion: v1

 kind: ResourceQuota

 metadata:

   creationTimestamp: null

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

 {

   "kind": "Config",

-  "apiVersion": "v1beta3",

+  "apiVersion": "v1",

   "metadata": {},

   "items": [

     {

       "kind": "Service",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-openshift-service",

         "creationTimestamp": null

@@ -32,7 +32,7 @@

     },

     {

       "kind": "ReplicationController",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-openshift",

         "creationTimestamp": null,

@@ -84,7 +84,7 @@

     },

     {

       "kind": "Route",

-      "apiVersion": "v1beta3",

+      "apiVersion": "v1",

       "metadata": {

         "name": "hello-openshift-route",

         "creationTimestamp": null

@@ -15,13 +15,13 @@ var Version = unversioned.GroupVersion{Group: "", Version: "v1"}

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

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

-var OldestVersion = unversioned.GroupVersion{Group: "", Version: "v1beta3"}

+var OldestVersion = unversioned.GroupVersion{Group: "", Version: "v1"}

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

 // may be assumed to be most preferred to least preferred, and clients may

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

 // with a set of versions to choose.

-var Versions = []unversioned.GroupVersion{{Group: "", Version: "v1"}, {Group: "", Version: "v1beta3"}}

+var Versions = []unversioned.GroupVersion{{Group: "", Version: "v1"}}

 // originTypes are the hardcoded types defined by the OpenShift API.

 var originTypes map[unversioned.GroupVersionKind]bool

@@ -13,7 +13,7 @@ import (

 )

 func TestRESTRootScope(t *testing.T) {

-	for _, v := range [][]string{{"v1beta3"}, {"v1"}} {

+	for _, v := range [][]string{{"v1"}} {

 		mapping, err := registered.RESTMapper().RESTMapping(kapi.Kind("Node"), v...)

 		if err != nil {

 			t.Fatal(err)

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

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

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

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

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

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

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

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

@@ -341,61 +340,6 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 			j.From.Kind = "DockerImage"

 			j.From.Name = specs[c.Intn(len(specs))]

 		},

-		func(j *kapi.PodSecurityContext, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			if forVersion == v1beta3.SchemeGroupVersion {

-				// v1beta3 does not contain the PodSecurityContext type.  For this API version, only fuzz

-				// the host namespace fields.  The fields set to nil here are the other fields of the

-				// PodSecurityContext that will not roundtrip correctly from internal->v1beta3->internal.

-				j.SELinuxOptions = nil

-				j.RunAsUser = nil

-				j.RunAsNonRoot = nil

-				j.SupplementalGroups = nil

-				j.FSGroup = nil

-			}

-		},

-		func(j *kapi.GitRepoVolumeSource, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			if forVersion == v1beta3.SchemeGroupVersion {

-				// these fields are set to their empty state when testing v1beta3

-				// they were added to v1 after v1beta3 was disabled as a storage or API version, so we don't have to support v1beta3 round-tripping

-				j.Directory = ""

-			}

-		},

-		func(j *kapi.ISCSIVolumeSource, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			if forVersion == v1beta3.SchemeGroupVersion {

-				// these fields are set to their empty state when testing v1beta3

-				// they were added to v1 after v1beta3 was disabled as a storage or API version, so we don't have to support v1beta3 round-tripping

-				j.ISCSIInterface = ""

-			} else if j.ISCSIInterface == "" {

-				// otherwise an empty value defaults to "default"

-				j.ISCSIInterface = "default"

-			}

-		},

-		func(j *kapi.CephFSVolumeSource, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			// this field does not exist on v1beta3

-			j.Path = ""

-		},

-		func(j *kapi.Event, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			if forVersion == v1beta3.SchemeGroupVersion {

-				// these fields are set to their empty state when testing v1beta3

-				// they were added to v1 after v1beta3 was disabled as a storage or API version, so we don't have to support v1beta3 round-tripping

-				j.Type = ""

-			}

-		},

-		func(j *kapi.Probe, c fuzz.Continue) {

-			c.FuzzNoCustom(j)

-			if forVersion == v1beta3.SchemeGroupVersion {

-				// these fields are set to their empty state when testing v1beta3

-				// they were added to v1 after v1beta3 was disabled as a storage or API version, so we don't have to support v1beta3 round-tripping

-				j.PeriodSeconds = 0

-				j.SuccessThreshold = 0

-				j.FailureThreshold = 0

-			}

-		},

 		func(j *runtime.Object, c fuzz.Continue) {

 			// runtime.EmbeddedObject causes a panic inside of fuzz because runtime.Object isn't handled.

 		},

deleted file mode 100644

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

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

-package v1beta3

deleted file mode 100644

@@ -1,19 +0,0 @@

-package v1beta3

-

-import (

-	"k8s.io/kubernetes/pkg/api/unversioned"

-

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

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

-	_ "github.com/openshift/origin/pkg/deploy/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/route/api/v1beta3"

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

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

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

-)

-

-// SchemeGroupVersion is group version used to register these objects

-var SchemeGroupVersion = unversioned.GroupVersion{Group: "", Version: "v1beta3"}

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

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

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

-	"github.com/openshift/origin/pkg/authorization/api/v1beta3"

 )

 const importPrefix = "github.com/openshift/origin/pkg/authorization/api"

@@ -23,7 +22,7 @@ const importPrefix = "github.com/openshift/origin/pkg/authorization/api"

 var accessor = meta.NewAccessor()

 // availableVersions lists all known external versions for this group from most preferred to least preferred

-var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion, v1beta3.SchemeGroupVersion}

+var availableVersions = []unversioned.GroupVersion{v1.SchemeGroupVersion}

 func init() {

 	registered.RegisterVersions(availableVersions)

@@ -81,8 +80,6 @@ func addVersionsToScheme(externalVersions ...unversioned.GroupVersion) {

 		switch v {

 		case v1.SchemeGroupVersion:

 			v1.AddToScheme(kapi.Scheme)

-		case v1beta3.SchemeGroupVersion:

-			v1beta3.AddToScheme(kapi.Scheme)

 		default:

 			glog.Errorf("Version %s is not known, so it will not be added to the Scheme.", v)

@@ -105,12 +102,6 @@ func interfacesFor(version unversioned.GroupVersion) (*meta.VersionInterfaces, e

 			MetadataAccessor: accessor,

 		}, nil

-	case v1beta3.SchemeGroupVersion:

-		return &meta.VersionInterfaces{

-			ObjectConvertor:  kapi.Scheme,

-			MetadataAccessor: accessor,

-		}, nil

-

 	default:

 		g, _ := registered.Group(api.GroupName)

 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %v)", version, g.GroupVersions)

deleted file mode 100644

@@ -1,441 +0,0 @@

-package v1beta3

-

-import (

-	"sort"

-

-	"k8s.io/kubernetes/pkg/conversion"

-	"k8s.io/kubernetes/pkg/runtime"

-	"k8s.io/kubernetes/pkg/util/sets"

-

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

-	newer "github.com/openshift/origin/pkg/authorization/api"

-	uservalidation "github.com/openshift/origin/pkg/user/api/validation"

-)

-

-func Convert_v1beta3_ResourceAccessReview_To_api_ResourceAccessReview(in *ResourceAccessReview, out *newer.ResourceAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.AuthorizationAttributes, &out.Action, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func Convert_api_ResourceAccessReview_To_v1beta3_ResourceAccessReview(in *newer.ResourceAccessReview, out *ResourceAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.Action, &out.AuthorizationAttributes, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func Convert_v1beta3_LocalResourceAccessReview_To_api_LocalResourceAccessReview(in *LocalResourceAccessReview, out *newer.LocalResourceAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.AuthorizationAttributes, &out.Action, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func Convert_api_LocalResourceAccessReview_To_v1beta3_LocalResourceAccessReview(in *newer.LocalResourceAccessReview, out *LocalResourceAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.Action, &out.AuthorizationAttributes, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func Convert_v1beta3_SubjectAccessReview_To_api_SubjectAccessReview(in *SubjectAccessReview, out *newer.SubjectAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.AuthorizationAttributes, &out.Action, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	out.Groups = sets.NewString(in.GroupsSlice...)

-

-	return nil

-}

-

-func Convert_api_SubjectAccessReview_To_v1beta3_SubjectAccessReview(in *newer.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.Action, &out.AuthorizationAttributes, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	out.GroupsSlice = in.Groups.List()

-

-	return nil

-}

-

-func Convert_v1beta3_LocalSubjectAccessReview_To_api_LocalSubjectAccessReview(in *LocalSubjectAccessReview, out *newer.LocalSubjectAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.AuthorizationAttributes, &out.Action, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	out.Groups = sets.NewString(in.GroupsSlice...)

-

-	return nil

-}

-

-func Convert_api_LocalSubjectAccessReview_To_v1beta3_LocalSubjectAccessReview(in *newer.LocalSubjectAccessReview, out *LocalSubjectAccessReview, s conversion.Scope) error {

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

-		return err

-	}

-	if err := s.DefaultConvert(&in.Action, &out.AuthorizationAttributes, conversion.IgnoreMissingFields); err != nil {

-		return err

-	}

-

-	out.GroupsSlice = in.Groups.List()

-

-	return nil

-}

-

-func Convert_v1beta3_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse(in *ResourceAccessReviewResponse, out *newer.ResourceAccessReviewResponse, s conversion.Scope) error {

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

-		return err

-	}

-

-	out.Users = sets.NewString(in.UsersSlice...)

-	out.Groups = sets.NewString(in.GroupsSlice...)

-