run pkg/apis/make-origin-dir-compile, pkg/apis compile

2017-06-22 11:02:38 -07:00
parent 4fb28dafad
commit cd7e7afaaa
98 changed files with 1554 additions and 1487 deletions
--- a/pkg/apis/batch/install/install.go
+++ b/pkg/apis/batch/install/install.go
@@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
 		&announced.GroupMetaFactoryArgs{
 			GroupName:                  batch.GroupName,
 			VersionPreferenceOrder:     []string{v1.SchemeGroupVersion.Version, v2alpha1.SchemeGroupVersion.Version},
-			ImportPrefix:               "k8s.io/kubernetes/pkg/apis/batch",
+			ImportPrefix:               "k8s.io/api/batch",
 			AddInternalObjectsToScheme: batch.AddToScheme,
 		},
 		announced.VersionToSchemeFunc{
--- a/pkg/apis/batch/v1/conversion.go
+++ b/pkg/apis/batch/v1/conversion.go
@@ -19,6 +19,8 @@ package v1
 import (
 	"fmt"

+	batchv1 "k8s.io/api/batch/v1"
+
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
@@ -41,13 +43,13 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 			case "metadata.name", "metadata.namespace", "status.successful":
 				return label, value, nil
 			default:
-				return "", "", fmt.Errorf("field label %q not supported for Job", label)
+				return "", "", fmt.Errorf("field label %q not supported for batchv1.Job", label)
 			}
 		},
 	)
 }

-func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s conversion.Scope) error {
+func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *batchv1.JobSpec, s conversion.Scope) error {
 	out.Parallelism = in.Parallelism
 	out.Completions = in.Completions
 	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
@@ -65,7 +67,7 @@ func Convert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s conv
 	return nil
 }

-func Convert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s conversion.Scope) error {
+func Convert_v1_JobSpec_To_batch_JobSpec(in *batchv1.JobSpec, out *batch.JobSpec, s conversion.Scope) error {
 	out.Parallelism = in.Parallelism
 	out.Completions = in.Completions
 	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
--- a/pkg/apis/batch/v1/defaults.go
+++ b/pkg/apis/batch/v1/defaults.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1

 import (
+	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

@@ -24,7 +25,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 	return RegisterDefaults(scheme)
 }

-func SetDefaults_Job(obj *Job) {
+func SetDefaults_Job(obj *batchv1.Job) {
 	// For a non-parallel job, you can leave both `.spec.completions` and
 	// `.spec.parallelism` unset.  When both are unset, both are defaulted to 1.
 	if obj.Spec.Completions == nil && obj.Spec.Parallelism == nil {
--- a/pkg/apis/batch/v1/defaults_test.go
+++ b/pkg/apis/batch/v1/defaults_test.go
@@ -20,11 +20,13 @@ import (
 	"reflect"
 	"testing"

+	batchv1 "k8s.io/api/batch/v1"
+
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
-	"k8s.io/api/core/v1"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
 	. "k8s.io/kubernetes/pkg/apis/batch/v1"
 )
@@ -32,20 +34,20 @@ import (
 func TestSetDefaultJob(t *testing.T) {
 	defaultLabels := map[string]string{"default": "default"}
 	tests := map[string]struct {
-		original     *Job
-		expected     *Job
+		original     *batchv1.Job
+		expected     *batchv1.Job
 		expectLabels bool
 	}{
 		"both unspecified -> sets both to 1": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Template: v1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(1),
 					Parallelism: newInt32(1),
 				},
@@ -53,66 +55,66 @@ func TestSetDefaultJob(t *testing.T) {
 			expectLabels: true,
 		},
 		"both unspecified -> sets both to 1 and no default labels": {
-			original: &Job{
+			original: &batchv1.Job{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{"mylabel": "myvalue"},
 				},
-				Spec: JobSpec{
+				Spec: batchv1.JobSpec{
 					Template: v1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(1),
 					Parallelism: newInt32(1),
 				},
 			},
 		},
 		"WQ: Parallelism explicitly 0 and completions unset -> no change": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Parallelism: newInt32(0),
 					Template: v1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Parallelism: newInt32(0),
 				},
 			},
 			expectLabels: true,
 		},
 		"WQ: Parallelism explicitly 2 and completions unset -> no change": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Parallelism: newInt32(2),
 					Template: v1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Parallelism: newInt32(2),
 				},
 			},
 			expectLabels: true,
 		},
 		"Completions explicitly 2 and parallelism unset -> parallelism is defaulted": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(2),
 					Template: v1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(2),
 					Parallelism: newInt32(1),
 				},
@@ -120,8 +122,8 @@ func TestSetDefaultJob(t *testing.T) {
 			expectLabels: true,
 		},
 		"Both set -> no change": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(10),
 					Parallelism: newInt32(11),
 					Template: v1.PodTemplateSpec{
@@ -129,8 +131,8 @@ func TestSetDefaultJob(t *testing.T) {
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(10),
 					Parallelism: newInt32(11),
 					Template: v1.PodTemplateSpec{
@@ -141,8 +143,8 @@ func TestSetDefaultJob(t *testing.T) {
 			expectLabels: true,
 		},
 		"Both set, flipped -> no change": {
-			original: &Job{
-				Spec: JobSpec{
+			original: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(11),
 					Parallelism: newInt32(10),
 					Template: v1.PodTemplateSpec{
@@ -150,8 +152,8 @@ func TestSetDefaultJob(t *testing.T) {
 					},
 				},
 			},
-			expected: &Job{
-				Spec: JobSpec{
+			expected: &batchv1.Job{
+				Spec: batchv1.JobSpec{
 					Completions: newInt32(11),
 					Parallelism: newInt32(10),
 				},
@@ -164,7 +166,7 @@ func TestSetDefaultJob(t *testing.T) {
 		original := test.original
 		expected := test.expected
 		obj2 := roundTrip(t, runtime.Object(original))
-		actual, ok := obj2.(*Job)
+		actual, ok := obj2.(*batchv1.Job)
 		if !ok {
 			t.Errorf("%s: unexpected object: %v", name, actual)
 			t.FailNow()
--- a/pkg/apis/batch/v1/register.go
+++ b/pkg/apis/batch/v1/register.go
@@ -17,8 +17,7 @@ limitations under the License.
 package v1

 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

@@ -42,6 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register( addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
 }
-
--- a/pkg/apis/batch/v1/zz_generated.conversion.go
+++ b/pkg/apis/batch/v1/zz_generated.conversion.go
@@ -23,6 +23,8 @@ package v1
 import (
 	unsafe "unsafe"

+	batchv1 "k8s.io/api/batch/v1"
+
 	api_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
@@ -33,7 +35,7 @@ import (
 )

 func init() {
-	SchemeBuilder.Register(RegisterConversions)
+	localSchemeBuilder.Register(RegisterConversions)
 }

 // RegisterConversions adds conversion functions to the given scheme.
@@ -53,7 +55,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 	)
 }

-func autoConvert_v1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope) error {
+func autoConvert_v1_Job_To_batch_Job(in *batchv1.Job, out *batch.Job, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -65,11 +67,11 @@ func autoConvert_v1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope
 }

 // Convert_v1_Job_To_batch_Job is an autogenerated conversion function.
-func Convert_v1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope) error {
+func Convert_v1_Job_To_batch_Job(in *batchv1.Job, out *batch.Job, s conversion.Scope) error {
 	return autoConvert_v1_Job_To_batch_Job(in, out, s)
 }

-func autoConvert_batch_Job_To_v1_Job(in *batch.Job, out *Job, s conversion.Scope) error {
+func autoConvert_batch_Job_To_v1_Job(in *batch.Job, out *batchv1.Job, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -81,11 +83,11 @@ func autoConvert_batch_Job_To_v1_Job(in *batch.Job, out *Job, s conversion.Scope
 }

 // Convert_batch_Job_To_v1_Job is an autogenerated conversion function.
-func Convert_batch_Job_To_v1_Job(in *batch.Job, out *Job, s conversion.Scope) error {
+func Convert_batch_Job_To_v1_Job(in *batch.Job, out *batchv1.Job, s conversion.Scope) error {
 	return autoConvert_batch_Job_To_v1_Job(in, out, s)
 }

-func autoConvert_v1_JobCondition_To_batch_JobCondition(in *JobCondition, out *batch.JobCondition, s conversion.Scope) error {
+func autoConvert_v1_JobCondition_To_batch_JobCondition(in *batchv1.JobCondition, out *batch.JobCondition, s conversion.Scope) error {
 	out.Type = batch.JobConditionType(in.Type)
 	out.Status = api.ConditionStatus(in.Status)
 	out.LastProbeTime = in.LastProbeTime
@@ -96,12 +98,12 @@ func autoConvert_v1_JobCondition_To_batch_JobCondition(in *JobCondition, out *ba
 }

 // Convert_v1_JobCondition_To_batch_JobCondition is an autogenerated conversion function.
-func Convert_v1_JobCondition_To_batch_JobCondition(in *JobCondition, out *batch.JobCondition, s conversion.Scope) error {
+func Convert_v1_JobCondition_To_batch_JobCondition(in *batchv1.JobCondition, out *batch.JobCondition, s conversion.Scope) error {
 	return autoConvert_v1_JobCondition_To_batch_JobCondition(in, out, s)
 }

-func autoConvert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error {
-	out.Type = JobConditionType(in.Type)
+func autoConvert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *batchv1.JobCondition, s conversion.Scope) error {
+	out.Type = batchv1.JobConditionType(in.Type)
 	out.Status = api_v1.ConditionStatus(in.Status)
 	out.LastProbeTime = in.LastProbeTime
 	out.LastTransitionTime = in.LastTransitionTime
@@ -111,11 +113,11 @@ func autoConvert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, o
 }

 // Convert_batch_JobCondition_To_v1_JobCondition is an autogenerated conversion function.
-func Convert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error {
+func Convert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *batchv1.JobCondition, s conversion.Scope) error {
 	return autoConvert_batch_JobCondition_To_v1_JobCondition(in, out, s)
 }

-func autoConvert_v1_JobList_To_batch_JobList(in *JobList, out *batch.JobList, s conversion.Scope) error {
+func autoConvert_v1_JobList_To_batch_JobList(in *batchv1.JobList, out *batch.JobList, s conversion.Scope) error {
 	out.ListMeta = in.ListMeta
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
@@ -132,32 +134,32 @@ func autoConvert_v1_JobList_To_batch_JobList(in *JobList, out *batch.JobList, s
 }

 // Convert_v1_JobList_To_batch_JobList is an autogenerated conversion function.
-func Convert_v1_JobList_To_batch_JobList(in *JobList, out *batch.JobList, s conversion.Scope) error {
+func Convert_v1_JobList_To_batch_JobList(in *batchv1.JobList, out *batch.JobList, s conversion.Scope) error {
 	return autoConvert_v1_JobList_To_batch_JobList(in, out, s)
 }

-func autoConvert_batch_JobList_To_v1_JobList(in *batch.JobList, out *JobList, s conversion.Scope) error {
+func autoConvert_batch_JobList_To_v1_JobList(in *batch.JobList, out *batchv1.JobList, s conversion.Scope) error {
 	out.ListMeta = in.ListMeta
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]Job, len(*in))
+		*out = make([]batchv1.Job, len(*in))
 		for i := range *in {
 			if err := Convert_batch_Job_To_v1_Job(&(*in)[i], &(*out)[i], s); err != nil {
 				return err
 			}
 		}
 	} else {
-		out.Items = make([]Job, 0)
+		out.Items = make([]batchv1.Job, 0)
 	}
 	return nil
 }

 // Convert_batch_JobList_To_v1_JobList is an autogenerated conversion function.
-func Convert_batch_JobList_To_v1_JobList(in *batch.JobList, out *JobList, s conversion.Scope) error {
+func Convert_batch_JobList_To_v1_JobList(in *batch.JobList, out *batchv1.JobList, s conversion.Scope) error {
 	return autoConvert_batch_JobList_To_v1_JobList(in, out, s)
 }

-func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s conversion.Scope) error {
+func autoConvert_v1_JobSpec_To_batch_JobSpec(in *batchv1.JobSpec, out *batch.JobSpec, s conversion.Scope) error {
 	out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
 	out.Completions = (*int32)(unsafe.Pointer(in.Completions))
 	out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
@@ -169,7 +171,7 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s
 	return nil
 }

-func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s conversion.Scope) error {
+func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *batchv1.JobSpec, s conversion.Scope) error {
 	out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism))
 	out.Completions = (*int32)(unsafe.Pointer(in.Completions))
 	out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
@@ -181,7 +183,7 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s
 	return nil
 }

-func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error {
+func autoConvert_v1_JobStatus_To_batch_JobStatus(in *batchv1.JobStatus, out *batch.JobStatus, s conversion.Scope) error {
 	out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions))
 	out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
 	out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime))
@@ -192,12 +194,12 @@ func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobSt
 }

 // Convert_v1_JobStatus_To_batch_JobStatus is an autogenerated conversion function.
-func Convert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error {
+func Convert_v1_JobStatus_To_batch_JobStatus(in *batchv1.JobStatus, out *batch.JobStatus, s conversion.Scope) error {
 	return autoConvert_v1_JobStatus_To_batch_JobStatus(in, out, s)
 }

-func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error {
-	out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions))
+func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *batchv1.JobStatus, s conversion.Scope) error {
+	out.Conditions = *(*[]batchv1.JobCondition)(unsafe.Pointer(&in.Conditions))
 	out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime))
 	out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime))
 	out.Active = in.Active
@@ -207,6 +209,6 @@ func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobSt
 }

 // Convert_batch_JobStatus_To_v1_JobStatus is an autogenerated conversion function.
-func Convert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error {
+func Convert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *batchv1.JobStatus, s conversion.Scope) error {
 	return autoConvert_batch_JobStatus_To_v1_JobStatus(in, out, s)
 }
--- a/pkg/apis/batch/v1/zz_generated.defaults.go
+++ b/pkg/apis/batch/v1/zz_generated.defaults.go
@@ -21,6 +21,7 @@ limitations under the License.
 package v1

 import (
+	batchv1 "k8s.io/api/batch/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
 )
@@ -29,12 +30,12 @@ import (
 // Public to allow building arbitrary schemes.
 // All generated defaulters are covering - they call all nested defaulters.
 func RegisterDefaults(scheme *runtime.Scheme) error {
-	scheme.AddTypeDefaultingFunc(&Job{}, func(obj interface{}) { SetObjectDefaults_Job(obj.(*Job)) })
-	scheme.AddTypeDefaultingFunc(&JobList{}, func(obj interface{}) { SetObjectDefaults_JobList(obj.(*JobList)) })
+	scheme.AddTypeDefaultingFunc(&batchv1.Job{}, func(obj interface{}) { SetObjectDefaults_Job(obj.(*batchv1.Job)) })
+	scheme.AddTypeDefaultingFunc(&batchv1.JobList{}, func(obj interface{}) { SetObjectDefaults_JobList(obj.(*batchv1.JobList)) })
 	return nil
 }

-func SetObjectDefaults_Job(in *Job) {
+func SetObjectDefaults_Job(in *batchv1.Job) {
 	SetDefaults_Job(in)
 	k8s_api_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
 	for i := range in.Spec.Template.Spec.Volumes {
@@ -168,7 +169,7 @@ func SetObjectDefaults_Job(in *Job) {
 	}
 }

-func SetObjectDefaults_JobList(in *JobList) {
+func SetObjectDefaults_JobList(in *batchv1.JobList) {
 	for i := range in.Items {
 		a := &in.Items[i]
 		SetObjectDefaults_Job(a)
--- a/pkg/apis/batch/v2alpha1/defaults.go
+++ b/pkg/apis/batch/v2alpha1/defaults.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v2alpha1

 import (
+	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

@@ -24,9 +25,9 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 	return RegisterDefaults(scheme)
 }

-func SetDefaults_CronJob(obj *CronJob) {
+func SetDefaults_CronJob(obj *batchv2alpha1.CronJob) {
 	if obj.Spec.ConcurrencyPolicy == "" {
-		obj.Spec.ConcurrencyPolicy = AllowConcurrent
+		obj.Spec.ConcurrencyPolicy = batchv2alpha1.AllowConcurrent
 	}
 	if obj.Spec.Suspend == nil {
 		obj.Spec.Suspend = new(bool)
--- a/pkg/apis/batch/v2alpha1/defaults_test.go
+++ b/pkg/apis/batch/v2alpha1/defaults_test.go
@@ -20,6 +20,8 @@ import (
 	"reflect"
 	"testing"

+	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
@@ -29,29 +31,29 @@ import (

 func TestSetDefaultCronJob(t *testing.T) {
 	tests := map[string]struct {
-		original *CronJob
-		expected *CronJob
+		original *batchv2alpha1.CronJob
+		expected *batchv2alpha1.CronJob
 	}{
-		"empty CronJob should default ConcurrencyPolicy and Suspend": {
-			original: &CronJob{},
-			expected: &CronJob{
-				Spec: CronJobSpec{
-					ConcurrencyPolicy: AllowConcurrent,
-					Suspend:           newBool(false),
+		"empty batchv2alpha1.CronJob should default batchv2alpha1.ConcurrencyPolicy and Suspend": {
+			original: &batchv2alpha1.CronJob{},
+			expected: &batchv2alpha1.CronJob{
+				Spec: batchv2alpha1.CronJobSpec{
+					batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.AllowConcurrent,
+					Suspend: newBool(false),
 				},
 			},
 		},
 		"set fields should not be defaulted": {
-			original: &CronJob{
-				Spec: CronJobSpec{
-					ConcurrencyPolicy: ForbidConcurrent,
-					Suspend:           newBool(true),
+			original: &batchv2alpha1.CronJob{
+				Spec: batchv2alpha1.CronJobSpec{
+					batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
+					Suspend: newBool(true),
 				},
 			},
-			expected: &CronJob{
-				Spec: CronJobSpec{
-					ConcurrencyPolicy: ForbidConcurrent,
-					Suspend:           newBool(true),
+			expected: &batchv2alpha1.CronJob{
+				Spec: batchv2alpha1.CronJobSpec{
+					batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
+					Suspend: newBool(true),
 				},
 			},
 		},
@@ -61,7 +63,7 @@ func TestSetDefaultCronJob(t *testing.T) {
 		original := test.original
 		expected := test.expected
 		obj2 := roundTrip(t, runtime.Object(original))
-		actual, ok := obj2.(*CronJob)
+		actual, ok := obj2.(*batchv2alpha1.CronJob)
 		if !ok {
 			t.Errorf("%s: unexpected object: %v", name, actual)
 			t.FailNow()
--- a/pkg/apis/batch/v2alpha1/register.go
+++ b/pkg/apis/batch/v2alpha1/register.go
@@ -17,8 +17,7 @@ limitations under the License.
 package v2alpha1

 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

@@ -42,6 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register( addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
 }
-
--- a/pkg/apis/batch/v2alpha1/zz_generated.conversion.go
+++ b/pkg/apis/batch/v2alpha1/zz_generated.conversion.go
@@ -23,6 +23,8 @@ package v2alpha1
 import (
 	unsafe "unsafe"

+	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
+
 	api_v1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
@@ -33,7 +35,7 @@ import (
 )

 func init() {
-	SchemeBuilder.Register(RegisterConversions)
+	localSchemeBuilder.Register(RegisterConversions)
 }

 // RegisterConversions adds conversion functions to the given scheme.
@@ -55,7 +57,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
 	)
 }

-func autoConvert_v2alpha1_CronJob_To_batch_CronJob(in *CronJob, out *batch.CronJob, s conversion.Scope) error {
+func autoConvert_v2alpha1_CronJob_To_batch_CronJob(in *batchv2alpha1.CronJob, out *batch.CronJob, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -67,11 +69,11 @@ func autoConvert_v2alpha1_CronJob_To_batch_CronJob(in *CronJob, out *batch.CronJ
 }

 // Convert_v2alpha1_CronJob_To_batch_CronJob is an autogenerated conversion function.
-func Convert_v2alpha1_CronJob_To_batch_CronJob(in *CronJob, out *batch.CronJob, s conversion.Scope) error {
+func Convert_v2alpha1_CronJob_To_batch_CronJob(in *batchv2alpha1.CronJob, out *batch.CronJob, s conversion.Scope) error {
 	return autoConvert_v2alpha1_CronJob_To_batch_CronJob(in, out, s)
 }

-func autoConvert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *CronJob, s conversion.Scope) error {
+func autoConvert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *batchv2alpha1.CronJob, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -83,11 +85,11 @@ func autoConvert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *CronJ
 }

 // Convert_batch_CronJob_To_v2alpha1_CronJob is an autogenerated conversion function.
-func Convert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *CronJob, s conversion.Scope) error {
+func Convert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *batchv2alpha1.CronJob, s conversion.Scope) error {
 	return autoConvert_batch_CronJob_To_v2alpha1_CronJob(in, out, s)
 }

-func autoConvert_v2alpha1_CronJobList_To_batch_CronJobList(in *CronJobList, out *batch.CronJobList, s conversion.Scope) error {
+func autoConvert_v2alpha1_CronJobList_To_batch_CronJobList(in *batchv2alpha1.CronJobList, out *batch.CronJobList, s conversion.Scope) error {
 	out.ListMeta = in.ListMeta
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
@@ -104,32 +106,32 @@ func autoConvert_v2alpha1_CronJobList_To_batch_CronJobList(in *CronJobList, out
 }

 // Convert_v2alpha1_CronJobList_To_batch_CronJobList is an autogenerated conversion function.
-func Convert_v2alpha1_CronJobList_To_batch_CronJobList(in *CronJobList, out *batch.CronJobList, s conversion.Scope) error {
+func Convert_v2alpha1_CronJobList_To_batch_CronJobList(in *batchv2alpha1.CronJobList, out *batch.CronJobList, s conversion.Scope) error {
 	return autoConvert_v2alpha1_CronJobList_To_batch_CronJobList(in, out, s)
 }

-func autoConvert_batch_CronJobList_To_v2alpha1_CronJobList(in *batch.CronJobList, out *CronJobList, s conversion.Scope) error {
+func autoConvert_batch_CronJobList_To_v2alpha1_CronJobList(in *batch.CronJobList, out *batchv2alpha1.CronJobList, s conversion.Scope) error {
 	out.ListMeta = in.ListMeta
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]CronJob, len(*in))
+		*out = make([]batchv2alpha1.CronJob, len(*in))
 		for i := range *in {
 			if err := Convert_batch_CronJob_To_v2alpha1_CronJob(&(*in)[i], &(*out)[i], s); err != nil {
 				return err
 			}
 		}
 	} else {
-		out.Items = make([]CronJob, 0)
+		out.Items = make([]batchv2alpha1.CronJob, 0)
 	}
 	return nil
 }

 // Convert_batch_CronJobList_To_v2alpha1_CronJobList is an autogenerated conversion function.
-func Convert_batch_CronJobList_To_v2alpha1_CronJobList(in *batch.CronJobList, out *CronJobList, s conversion.Scope) error {
+func Convert_batch_CronJobList_To_v2alpha1_CronJobList(in *batch.CronJobList, out *batchv2alpha1.CronJobList, s conversion.Scope) error {
 	return autoConvert_batch_CronJobList_To_v2alpha1_CronJobList(in, out, s)
 }

-func autoConvert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in *CronJobSpec, out *batch.CronJobSpec, s conversion.Scope) error {
+func autoConvert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in *batchv2alpha1.CronJobSpec, out *batch.CronJobSpec, s conversion.Scope) error {
 	out.Schedule = in.Schedule
 	out.StartingDeadlineSeconds = (*int64)(unsafe.Pointer(in.StartingDeadlineSeconds))
 	out.ConcurrencyPolicy = batch.ConcurrencyPolicy(in.ConcurrencyPolicy)
@@ -143,14 +145,14 @@ func autoConvert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in *CronJobSpec, out
 }

 // Convert_v2alpha1_CronJobSpec_To_batch_CronJobSpec is an autogenerated conversion function.
-func Convert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in *CronJobSpec, out *batch.CronJobSpec, s conversion.Scope) error {
+func Convert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in *batchv2alpha1.CronJobSpec, out *batch.CronJobSpec, s conversion.Scope) error {
 	return autoConvert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(in, out, s)
 }

-func autoConvert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, out *CronJobSpec, s conversion.Scope) error {
+func autoConvert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, out *batchv2alpha1.CronJobSpec, s conversion.Scope) error {
 	out.Schedule = in.Schedule
 	out.StartingDeadlineSeconds = (*int64)(unsafe.Pointer(in.StartingDeadlineSeconds))
-	out.ConcurrencyPolicy = ConcurrencyPolicy(in.ConcurrencyPolicy)
+	out.ConcurrencyPolicy = batchv2alpha1.ConcurrencyPolicy(in.ConcurrencyPolicy)
 	out.Suspend = (*bool)(unsafe.Pointer(in.Suspend))
 	if err := Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, s); err != nil {
 		return err
@@ -161,33 +163,33 @@ func autoConvert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec
 }

 // Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec is an autogenerated conversion function.
-func Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, out *CronJobSpec, s conversion.Scope) error {
+func Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, out *batchv2alpha1.CronJobSpec, s conversion.Scope) error {
 	return autoConvert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in, out, s)
 }

-func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error {
+func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *batchv2alpha1.CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error {
 	out.Active = *(*[]api.ObjectReference)(unsafe.Pointer(&in.Active))
 	out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
 	return nil
 }

 // Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus is an autogenerated conversion function.
-func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error {
+func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *batchv2alpha1.CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error {
 	return autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in, out, s)
 }

-func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error {
+func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *batchv2alpha1.CronJobStatus, s conversion.Scope) error {
 	out.Active = *(*[]api_v1.ObjectReference)(unsafe.Pointer(&in.Active))
 	out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
 	return nil
 }

 // Convert_batch_CronJobStatus_To_v2alpha1_CronJobStatus is an autogenerated conversion function.
-func Convert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error {
+func Convert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *batchv2alpha1.CronJobStatus, s conversion.Scope) error {
 	return autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in, out, s)
 }

-func autoConvert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *JobTemplate, out *batch.JobTemplate, s conversion.Scope) error {
+func autoConvert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *batchv2alpha1.JobTemplate, out *batch.JobTemplate, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
@@ -196,11 +198,11 @@ func autoConvert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *JobTemplate, out
 }

 // Convert_v2alpha1_JobTemplate_To_batch_JobTemplate is an autogenerated conversion function.
-func Convert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *JobTemplate, out *batch.JobTemplate, s conversion.Scope) error {
+func Convert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *batchv2alpha1.JobTemplate, out *batch.JobTemplate, s conversion.Scope) error {
 	return autoConvert_v2alpha1_JobTemplate_To_batch_JobTemplate(in, out, s)
 }

-func autoConvert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, out *JobTemplate, s conversion.Scope) error {
+func autoConvert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, out *batchv2alpha1.JobTemplate, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
@@ -209,11 +211,11 @@ func autoConvert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate
 }

 // Convert_batch_JobTemplate_To_v2alpha1_JobTemplate is an autogenerated conversion function.
-func Convert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, out *JobTemplate, s conversion.Scope) error {
+func Convert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, out *batchv2alpha1.JobTemplate, s conversion.Scope) error {
 	return autoConvert_batch_JobTemplate_To_v2alpha1_JobTemplate(in, out, s)
 }

-func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
+func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *batchv2alpha1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := batch_v1.Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -222,11 +224,11 @@ func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *JobTempla
 }

 // Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec is an autogenerated conversion function.
-func Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
+func Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *batchv2alpha1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
 	return autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in, out, s)
 }

-func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *JobTemplateSpec, s conversion.Scope) error {
+func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *batchv2alpha1.JobTemplateSpec, s conversion.Scope) error {
 	out.ObjectMeta = in.ObjectMeta
 	if err := batch_v1.Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
@@ -235,6 +237,6 @@ func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.Job
 }

 // Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec is an autogenerated conversion function.
-func Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *JobTemplateSpec, s conversion.Scope) error {
+func Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *batchv2alpha1.JobTemplateSpec, s conversion.Scope) error {
 	return autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in, out, s)
 }
--- a/pkg/apis/batch/v2alpha1/zz_generated.defaults.go
+++ b/pkg/apis/batch/v2alpha1/zz_generated.defaults.go
@@ -21,6 +21,7 @@ limitations under the License.
 package v2alpha1

 import (
+	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
 )
@@ -29,13 +30,13 @@ import (
 // Public to allow building arbitrary schemes.
 // All generated defaulters are covering - they call all nested defaulters.
 func RegisterDefaults(scheme *runtime.Scheme) error {
-	scheme.AddTypeDefaultingFunc(&CronJob{}, func(obj interface{}) { SetObjectDefaults_CronJob(obj.(*CronJob)) })
-	scheme.AddTypeDefaultingFunc(&CronJobList{}, func(obj interface{}) { SetObjectDefaults_CronJobList(obj.(*CronJobList)) })
-	scheme.AddTypeDefaultingFunc(&JobTemplate{}, func(obj interface{}) { SetObjectDefaults_JobTemplate(obj.(*JobTemplate)) })
+	scheme.AddTypeDefaultingFunc(&batchv2alpha1.CronJob{}, func(obj interface{}) { SetObjectDefaults_CronJob(obj.(*batchv2alpha1.CronJob)) })
+	scheme.AddTypeDefaultingFunc(&batchv2alpha1.CronJobList{}, func(obj interface{}) { SetObjectDefaults_CronJobList(obj.(*batchv2alpha1.CronJobList)) })
+	scheme.AddTypeDefaultingFunc(&batchv2alpha1.JobTemplate{}, func(obj interface{}) { SetObjectDefaults_JobTemplate(obj.(*batchv2alpha1.JobTemplate)) })
 	return nil
 }

-func SetObjectDefaults_CronJob(in *CronJob) {
+func SetObjectDefaults_CronJob(in *batchv2alpha1.CronJob) {
 	SetDefaults_CronJob(in)
 	k8s_api_v1.SetDefaults_PodSpec(&in.Spec.JobTemplate.Spec.Template.Spec)
 	for i := range in.Spec.JobTemplate.Spec.Template.Spec.Volumes {
@@ -169,14 +170,14 @@ func SetObjectDefaults_CronJob(in *CronJob) {
 	}
 }

-func SetObjectDefaults_CronJobList(in *CronJobList) {
+func SetObjectDefaults_CronJobList(in *batchv2alpha1.CronJobList) {
 	for i := range in.Items {
 		a := &in.Items[i]
 		SetObjectDefaults_CronJob(a)
 	}
 }

-func SetObjectDefaults_JobTemplate(in *JobTemplate) {
+func SetObjectDefaults_JobTemplate(in *batchv2alpha1.JobTemplate) {
 	k8s_api_v1.SetDefaults_PodSpec(&in.Template.Spec.Template.Spec)
 	for i := range in.Template.Spec.Template.Spec.Volumes {
 		a := &in.Template.Spec.Template.Spec.Volumes[i]