github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chao Xu
2017-06-22 11:02:38 -07:00
parent 4fb28dafad
commit cd7e7afaaa
98 changed files with 1554 additions and 1487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/batch/v2alpha1/defaults.go
View File

@@ -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)

36
pkg/apis/batch/v2alpha1/defaults_test.go
View File

@@ -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()

6
pkg/apis/batch/v2alpha1/register.go
View File

@@ -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)
}

58
pkg/apis/batch/v2alpha1/zz_generated.conversion.go
View File

@@ -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)
}

13
pkg/apis/batch/v2alpha1/zz_generated.defaults.go
View File

@@ -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]