Vendor: Update k8s version

Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
This commit is contained in:
Michał Żyłowski 2017-02-03 14:41:32 +01:00
parent dfa93414c5
commit 52baf68d50
3756 changed files with 113013 additions and 92675 deletions

View file

@ -12,10 +12,13 @@ go_library(
srcs = ["install.go"],
tags = ["automanaged"],
deps = [
"//pkg/apimachinery/announced:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/batch:go_default_library",
"//pkg/apis/batch/v1:go_default_library",
"//pkg/apis/batch/v2alpha1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apimachinery/announced",
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
"//vendor:k8s.io/apimachinery/pkg/runtime",
],
)

View file

@ -19,13 +19,21 @@ limitations under the License.
package install
import (
"k8s.io/kubernetes/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/batch"
"k8s.io/kubernetes/pkg/apis/batch/v1"
"k8s.io/kubernetes/pkg/apis/batch/v2alpha1"
)
func init() {
Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
}
// Install registers the API group and adds types to a scheme
func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) {
if err := announced.NewGroupMetaFactory(
&announced.GroupMetaFactoryArgs{
GroupName: batch.GroupName,
@ -37,7 +45,7 @@ func init() {
v1.SchemeGroupVersion.Version: v1.AddToScheme,
v2alpha1.SchemeGroupVersion.Version: v2alpha1.AddToScheme,
},
).Announce().RegisterAndEnable(); err != nil {
).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
panic(err)
}
}

View file

@ -19,7 +19,6 @@ package batch
import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api"
)
// GroupName is the group name use in this package
@ -51,8 +50,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&JobTemplate{},
&CronJob{},
&CronJobList{},
&api.ListOptions{},
&api.DeleteOptions{},
)
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{})
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJobList"), &CronJobList{})

View file

@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -60,7 +60,7 @@ type JobTemplate struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Template defines jobs that will be created from this template
// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -73,7 +73,7 @@ type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -196,7 +196,7 @@ type CronJob struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
api.ObjectMeta
metav1.ObjectMeta
// Spec is a structure defining the expected behavior of a job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

View file

@ -50,6 +50,7 @@ go_test(
"//pkg/api/v1:go_default_library",
"//pkg/apis/batch/install:go_default_library",
"//pkg/apis/batch/v1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
],
)

View file

@ -20,6 +20,7 @@ import (
"reflect"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
@ -39,7 +40,7 @@ func TestSetDefaultJob(t *testing.T) {
original: &Job{
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -53,12 +54,12 @@ func TestSetDefaultJob(t *testing.T) {
},
"both unspecified -> sets both to 1 and no default labels": {
original: &Job{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"mylabel": "myvalue"},
},
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -74,7 +75,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(0),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -90,7 +91,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -106,7 +107,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Completions: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -124,7 +125,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -133,7 +134,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -145,7 +146,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(11),
Parallelism: newInt32(10),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},

View file

@ -468,7 +468,7 @@ func (this *Job) String() string {
return "nil"
}
s := strings.Join([]string{`&Job{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`,
`}`,
@ -1520,60 +1520,61 @@ var (
)
var fileDescriptorGenerated = []byte{
// 879 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6f, 0xe3, 0x44,
0x14, 0xcf, 0x47, 0xd3, 0x4d, 0xa6, 0x1f, 0xbb, 0x8c, 0x54, 0x29, 0xf4, 0x90, 0xac, 0x02, 0x42,
0x0b, 0xda, 0xb5, 0x95, 0xee, 0x0a, 0x21, 0x0e, 0x48, 0xb8, 0x08, 0x89, 0xaa, 0x65, 0xab, 0x49,
0x05, 0x88, 0x8f, 0xc3, 0xd8, 0x7e, 0x4d, 0x87, 0xda, 0x1e, 0xcb, 0x33, 0x8e, 0xd4, 0x1b, 0x37,
0xae, 0xfc, 0x31, 0x08, 0xf1, 0x27, 0xf4, 0xd8, 0x23, 0xa7, 0x88, 0x9a, 0xff, 0x62, 0x4f, 0x68,
0xc6, 0xe3, 0x8f, 0x34, 0x69, 0xc9, 0x72, 0xb3, 0xdf, 0xbc, 0xdf, 0xef, 0x7d, 0xfd, 0xde, 0x43,
0x2f, 0x2f, 0x3f, 0x11, 0x16, 0xe3, 0xf6, 0x65, 0xea, 0x42, 0x12, 0x81, 0x04, 0x61, 0xc7, 0x97,
0x53, 0x9b, 0xc6, 0x4c, 0xd8, 0x2e, 0x95, 0xde, 0x85, 0x3d, 0x1b, 0xdb, 0x53, 0x88, 0x20, 0xa1,
0x12, 0x7c, 0x2b, 0x4e, 0xb8, 0xe4, 0xf8, 0xbd, 0x1c, 0x64, 0x55, 0x20, 0x2b, 0xbe, 0x9c, 0x5a,
0x0a, 0x64, 0x69, 0x90, 0x35, 0x1b, 0xef, 0xbf, 0x98, 0x32, 0x79, 0x91, 0xba, 0x96, 0xc7, 0x43,
0x7b, 0xca, 0xa7, 0xdc, 0xd6, 0x58, 0x37, 0x3d, 0xd7, 0x7f, 0xfa, 0x47, 0x7f, 0xe5, 0x9c, 0xfb,
0xaf, 0x4c, 0x22, 0x34, 0x66, 0x21, 0xf5, 0x2e, 0x58, 0x04, 0xc9, 0x55, 0x95, 0x4a, 0x08, 0x92,
0xae, 0xc8, 0x64, 0xdf, 0xbe, 0x0f, 0x95, 0xa4, 0x91, 0x64, 0x21, 0x2c, 0x01, 0x3e, 0xfe, 0x2f,
0x80, 0xf0, 0x2e, 0x20, 0xa4, 0x4b, 0xb8, 0x83, 0x7b, 0xfb, 0x64, 0x27, 0x20, 0x78, 0x9a, 0x78,
0xcb, 0xb1, 0x9e, 0xdf, 0x8f, 0x59, 0x51, 0xca, 0x78, 0xb5, 0x77, 0x2a, 0x59, 0x60, 0xb3, 0x48,
0x0a, 0x99, 0xdc, 0x85, 0x8c, 0x7e, 0x6d, 0xa1, 0xf6, 0x11, 0x77, 0xf1, 0x77, 0xa8, 0xab, 0x1a,
0xe4, 0x53, 0x49, 0xfb, 0xcd, 0xa7, 0xcd, 0x67, 0x5b, 0x07, 0xcf, 0xac, 0x7b, 0x47, 0x64, 0xcd,
0xc6, 0xd6, 0x6b, 0xf7, 0x67, 0xf0, 0xe4, 0x09, 0x48, 0xea, 0xe0, 0xeb, 0xf9, 0xb0, 0x91, 0xcd,
0x87, 0xa8, 0xb2, 0x91, 0x92, 0x0d, 0x7f, 0x8d, 0x36, 0x44, 0x0c, 0x5e, 0xbf, 0xa5, 0x59, 0x9f,
0x5b, 0x6b, 0x0c, 0xde, 0x3a, 0xe2, 0xee, 0x24, 0x06, 0xcf, 0xd9, 0x36, 0xcc, 0x1b, 0xea, 0x8f,
0x68, 0x1e, 0xfc, 0x0d, 0xda, 0x14, 0x92, 0xca, 0x54, 0xf4, 0xdb, 0x9a, 0xd1, 0x5a, 0x9b, 0x51,
0xa3, 0x9c, 0x5d, 0xc3, 0xb9, 0x99, 0xff, 0x13, 0xc3, 0x36, 0xba, 0x69, 0xa3, 0xed, 0x23, 0xee,
0x1e, 0xf2, 0xc8, 0x67, 0x92, 0xf1, 0x08, 0xbf, 0x42, 0x1b, 0xf2, 0x2a, 0x06, 0xdd, 0x8e, 0x9e,
0xf3, 0xb4, 0x48, 0xe5, 0xec, 0x2a, 0x86, 0x37, 0xf3, 0xe1, 0x93, 0xba, 0xaf, 0xb2, 0x11, 0xed,
0x5d, 0x4b, 0xaf, 0xa5, 0x71, 0x9f, 0x2d, 0x86, 0x7b, 0x33, 0x1f, 0x3e, 0x38, 0x53, 0xab, 0xe4,
0x5c, 0x4c, 0x0f, 0x4f, 0xd1, 0x4e, 0x40, 0x85, 0x3c, 0x4d, 0xb8, 0x0b, 0x67, 0x2c, 0x04, 0x53,
0xfd, 0x47, 0x45, 0xf5, 0x75, 0x35, 0x56, 0xf5, 0xab, 0x29, 0xa8, 0xf2, 0x15, 0xc2, 0xd9, 0x33,
0xa9, 0xec, 0x1c, 0xd7, 0x89, 0xc8, 0x22, 0x2f, 0x9e, 0x21, 0xac, 0x0c, 0x67, 0x09, 0x8d, 0x44,
0x5e, 0x9c, 0x8a, 0xb6, 0xf1, 0xd6, 0xd1, 0xf6, 0x4d, 0x34, 0x7c, 0xbc, 0xc4, 0x46, 0x56, 0x44,
0xc0, 0x1f, 0xa0, 0xcd, 0x04, 0xa8, 0xe0, 0x51, 0xbf, 0xa3, 0x1b, 0x57, 0xce, 0x89, 0x68, 0x2b,
0x31, 0xaf, 0xf8, 0x43, 0xf4, 0x28, 0x04, 0x21, 0xe8, 0x14, 0xfa, 0x9b, 0xda, 0xf1, 0xb1, 0x71,
0x7c, 0x74, 0x92, 0x9b, 0x49, 0xf1, 0x3e, 0xfa, 0xa3, 0x89, 0x1e, 0x1d, 0x71, 0xf7, 0x98, 0x09,
0x89, 0x7f, 0x5c, 0x12, 0xb8, 0xb5, 0x5e, 0x31, 0x0a, 0xad, 0x65, 0xfe, 0xc4, 0xc4, 0xe9, 0x16,
0x96, 0x9a, 0xc8, 0x4f, 0x50, 0x87, 0x49, 0x08, 0xd5, 0xd0, 0xdb, 0x0f, 0xef, 0xce, 0xa2, 0x26,
0x9d, 0x1d, 0x43, 0xda, 0xf9, 0x4a, 0xc1, 0x49, 0xce, 0x32, 0xfa, 0xb3, 0xad, 0x13, 0x57, 0xaa,
0xc7, 0x63, 0xb4, 0x15, 0xd3, 0x84, 0x06, 0x01, 0x04, 0x4c, 0x84, 0x3a, 0xf7, 0x8e, 0xf3, 0x38,
0x9b, 0x0f, 0xb7, 0x4e, 0x2b, 0x33, 0xa9, 0xfb, 0x28, 0x88, 0xc7, 0xc3, 0x38, 0x00, 0xd5, 0xdc,
0x5c, 0x88, 0x06, 0x72, 0x58, 0x99, 0x49, 0xdd, 0x07, 0xbf, 0x46, 0x7b, 0xd4, 0x93, 0x6c, 0x06,
0x5f, 0x00, 0xf5, 0x03, 0x16, 0xc1, 0x04, 0x3c, 0x1e, 0xf9, 0xf9, 0x92, 0xb5, 0x9d, 0x77, 0xb3,
0xf9, 0x70, 0xef, 0xf3, 0x55, 0x0e, 0x64, 0x35, 0x0e, 0xff, 0x84, 0xba, 0x02, 0x02, 0xf0, 0x24,
0x4f, 0x8c, 0x78, 0x5e, 0xae, 0xd9, 0x6f, 0xea, 0x42, 0x30, 0x31, 0x50, 0x67, 0x5b, 0x35, 0xbc,
0xf8, 0x23, 0x25, 0x25, 0xfe, 0x14, 0xed, 0x86, 0x34, 0x4a, 0x69, 0xe9, 0xa9, 0x55, 0xd3, 0x75,
0x70, 0x36, 0x1f, 0xee, 0x9e, 0x2c, 0xbc, 0x90, 0x3b, 0x9e, 0xf8, 0x07, 0xd4, 0x95, 0x10, 0xc6,
0x01, 0x95, 0xb9, 0x84, 0xb6, 0x0e, 0x5e, 0x3c, 0x7c, 0xeb, 0x4e, 0xb9, 0x7f, 0x66, 0x00, 0xfa,
0x2c, 0x95, 0x4a, 0x28, 0xac, 0xa4, 0x24, 0x1c, 0xfd, 0xde, 0x46, 0xbd, 0xf2, 0xd8, 0x60, 0x40,
0xc8, 0x2b, 0x16, 0x5a, 0xf4, 0x9b, 0x5a, 0x1c, 0xe3, 0x75, 0xc5, 0x51, 0x9e, 0x82, 0xea, 0xc2,
0x96, 0x26, 0x41, 0x6a, 0xc4, 0xf8, 0x5b, 0xd4, 0x13, 0x92, 0x26, 0x52, 0xaf, 0x6a, 0xeb, 0xad,
0x57, 0x75, 0x27, 0x9b, 0x0f, 0x7b, 0x93, 0x82, 0x80, 0x54, 0x5c, 0xf8, 0x1c, 0xed, 0x56, 0x2a,
0xf9, 0x9f, 0x67, 0x47, 0x8f, 0xe4, 0x70, 0x81, 0x85, 0xdc, 0x61, 0x55, 0xcb, 0x9f, 0xcb, 0x48,
0x6b, 0xa5, 0x53, 0x2d, 0x7f, 0xae, 0x39, 0x62, 0x5e, 0xb1, 0x8d, 0x7a, 0x22, 0xf5, 0x3c, 0x00,
0x1f, 0x7c, 0x3d, 0xf1, 0x8e, 0xf3, 0x8e, 0x71, 0xed, 0x4d, 0x8a, 0x07, 0x52, 0xf9, 0x28, 0xe2,
0x73, 0xca, 0x02, 0xf0, 0xf5, 0xa4, 0x6b, 0xc4, 0x5f, 0x6a, 0x2b, 0x31, 0xaf, 0xce, 0xfb, 0xd7,
0xb7, 0x83, 0xc6, 0xcd, 0xed, 0xa0, 0xf1, 0xd7, 0xed, 0xa0, 0xf1, 0x4b, 0x36, 0x68, 0x5e, 0x67,
0x83, 0xe6, 0x4d, 0x36, 0x68, 0xfe, 0x9d, 0x0d, 0x9a, 0xbf, 0xfd, 0x33, 0x68, 0x7c, 0xdf, 0x9a,
0x8d, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x15, 0xe7, 0x70, 0xeb, 0x08, 0x00, 0x00,
// 881 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xe3, 0x44,
0x14, 0xce, 0x4f, 0xd3, 0x26, 0x93, 0xb6, 0xbb, 0x8c, 0x54, 0x29, 0xf4, 0x22, 0x59, 0x05, 0x84,
0x0a, 0xda, 0xb5, 0x49, 0x77, 0x85, 0x10, 0x17, 0x48, 0xb8, 0x08, 0x89, 0xaa, 0x65, 0xab, 0x49,
0x05, 0x12, 0x3f, 0x12, 0x63, 0xfb, 0x34, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x52, 0xef, 0x78,
0x03, 0x78, 0x18, 0x84, 0x78, 0x84, 0x5e, 0xf6, 0x92, 0xab, 0x88, 0x9a, 0xb7, 0xd8, 0x2b, 0x34,
0xe3, 0x89, 0xed, 0x34, 0x29, 0xa4, 0xdc, 0xd9, 0x67, 0xbe, 0xef, 0x3b, 0x67, 0xce, 0xf9, 0xce,
0xa0, 0x97, 0x57, 0x1f, 0x0b, 0x8b, 0x71, 0xfb, 0x2a, 0x75, 0x21, 0x89, 0x40, 0x82, 0xb0, 0xe3,
0xab, 0x89, 0x4d, 0x63, 0x26, 0x6c, 0x97, 0x4a, 0xef, 0xd2, 0x9e, 0x8e, 0xec, 0x09, 0x44, 0x90,
0x50, 0x09, 0xbe, 0x15, 0x27, 0x5c, 0x72, 0xfc, 0x4e, 0x4e, 0xb2, 0x4a, 0x92, 0x15, 0x5f, 0x4d,
0x2c, 0x45, 0xb2, 0x34, 0xc9, 0x9a, 0x8e, 0xf6, 0x5f, 0x4c, 0x98, 0xbc, 0x4c, 0x5d, 0xcb, 0xe3,
0xa1, 0x3d, 0xe1, 0x13, 0x6e, 0x6b, 0xae, 0x9b, 0x5e, 0xe8, 0x3f, 0xfd, 0xa3, 0xbf, 0x72, 0xcd,
0xfd, 0x57, 0xa6, 0x10, 0x1a, 0xb3, 0x90, 0x7a, 0x97, 0x2c, 0x82, 0xe4, 0xba, 0x2c, 0x25, 0x04,
0x49, 0x57, 0x54, 0xb2, 0x6f, 0x3f, 0xc4, 0x4a, 0xd2, 0x48, 0xb2, 0x10, 0x96, 0x08, 0x1f, 0xfd,
0x17, 0x41, 0x78, 0x97, 0x10, 0xd2, 0x25, 0xde, 0xe1, 0x83, 0x7d, 0xb2, 0x13, 0x10, 0x3c, 0x4d,
0xbc, 0xe5, 0x5c, 0xcf, 0x1f, 0xe6, 0xac, 0xb8, 0xca, 0x68, 0x35, 0x3a, 0x95, 0x2c, 0xb0, 0x59,
0x24, 0x85, 0x4c, 0xee, 0x53, 0x86, 0xbf, 0x34, 0x50, 0xf3, 0x98, 0xbb, 0xf8, 0x47, 0xd4, 0x56,
0x0d, 0xf2, 0xa9, 0xa4, 0xbd, 0xfa, 0xb3, 0xfa, 0x41, 0xf7, 0xf0, 0x43, 0xcb, 0x8c, 0xa8, 0x7a,
0xcf, 0x72, 0x48, 0x0a, 0x6d, 0x4d, 0x47, 0xd6, 0x6b, 0xf7, 0x27, 0xf0, 0xe4, 0x29, 0x48, 0xea,
0xe0, 0x9b, 0xd9, 0xa0, 0x96, 0xcd, 0x06, 0xa8, 0x8c, 0x91, 0x42, 0x15, 0x7f, 0x85, 0x36, 0x44,
0x0c, 0x5e, 0xaf, 0xa1, 0xd5, 0x9f, 0x5b, 0x6b, 0x18, 0xc0, 0x3a, 0xe6, 0xee, 0x38, 0x06, 0xcf,
0xd9, 0x36, 0xca, 0x1b, 0xea, 0x8f, 0x68, 0x1d, 0xfc, 0x35, 0xda, 0x14, 0x92, 0xca, 0x54, 0xf4,
0x9a, 0x5a, 0xd1, 0x5a, 0x5b, 0x51, 0xb3, 0x9c, 0x5d, 0xa3, 0xb9, 0x99, 0xff, 0x13, 0xa3, 0x36,
0xbc, 0x6d, 0xa2, 0xed, 0x63, 0xee, 0x1e, 0xf1, 0xc8, 0x67, 0x92, 0xf1, 0x08, 0xbf, 0x42, 0x1b,
0xf2, 0x3a, 0x06, 0xdd, 0x96, 0x8e, 0xf3, 0x6c, 0x5e, 0xca, 0xf9, 0x75, 0x0c, 0x6f, 0x66, 0x83,
0xa7, 0x55, 0xac, 0x8a, 0x11, 0x8d, 0xae, 0x94, 0xd7, 0xd0, 0xbc, 0x4f, 0x17, 0xd3, 0xbd, 0x99,
0x0d, 0xfe, 0x75, 0xb6, 0x56, 0xa1, 0xb9, 0x58, 0x1e, 0x9e, 0xa0, 0x9d, 0x80, 0x0a, 0x79, 0x96,
0x70, 0x17, 0xce, 0x59, 0x08, 0xe6, 0xf6, 0x1f, 0xac, 0x37, 0x2d, 0xc5, 0x70, 0xf6, 0x4c, 0x29,
0x3b, 0x27, 0x55, 0x21, 0xb2, 0xa8, 0x8b, 0xa7, 0x08, 0xab, 0xc0, 0x79, 0x42, 0x23, 0x91, 0x5f,
0x4e, 0x65, 0xdb, 0x78, 0x74, 0xb6, 0x7d, 0x93, 0x0d, 0x9f, 0x2c, 0xa9, 0x91, 0x15, 0x19, 0xf0,
0x7b, 0x68, 0x33, 0x01, 0x2a, 0x78, 0xd4, 0x6b, 0xe9, 0xc6, 0x15, 0x73, 0x22, 0x3a, 0x4a, 0xcc,
0x29, 0x7e, 0x1f, 0x6d, 0x85, 0x20, 0x04, 0x9d, 0x40, 0x6f, 0x53, 0x03, 0x9f, 0x18, 0xe0, 0xd6,
0x69, 0x1e, 0x26, 0xf3, 0xf3, 0xe1, 0xef, 0x75, 0xb4, 0x75, 0xcc, 0xdd, 0x13, 0x26, 0x24, 0xfe,
0x7e, 0xc9, 0xe8, 0xd6, 0x7a, 0x97, 0x51, 0x6c, 0x6d, 0xf3, 0xa7, 0x26, 0x4f, 0x7b, 0x1e, 0xa9,
0x98, 0xfc, 0x14, 0xb5, 0x98, 0x84, 0x50, 0x0d, 0xbd, 0x79, 0xd0, 0x3d, 0x3c, 0x58, 0xd7, 0x93,
0xce, 0x8e, 0x11, 0x6d, 0x7d, 0xa9, 0xe8, 0x24, 0x57, 0x19, 0xfe, 0xd1, 0xd4, 0x85, 0x2b, 0xd7,
0xe3, 0x11, 0xea, 0xc6, 0x34, 0xa1, 0x41, 0x00, 0x01, 0x13, 0xa1, 0xae, 0xbd, 0xe5, 0x3c, 0xc9,
0x66, 0x83, 0xee, 0x59, 0x19, 0x26, 0x55, 0x8c, 0xa2, 0x78, 0x3c, 0x8c, 0x03, 0x50, 0xcd, 0xcd,
0x8d, 0x68, 0x28, 0x47, 0x65, 0x98, 0x54, 0x31, 0xf8, 0x35, 0xda, 0xa3, 0x9e, 0x64, 0x53, 0xf8,
0x1c, 0xa8, 0x1f, 0xb0, 0x08, 0xc6, 0xe0, 0xf1, 0xc8, 0xcf, 0x97, 0xac, 0xe9, 0xbc, 0x9d, 0xcd,
0x06, 0x7b, 0x9f, 0xad, 0x02, 0x90, 0xd5, 0x3c, 0xfc, 0x03, 0x6a, 0x0b, 0x08, 0xc0, 0x93, 0x3c,
0x31, 0xe6, 0x79, 0xb9, 0x66, 0xbf, 0xa9, 0x0b, 0xc1, 0xd8, 0x50, 0x9d, 0x6d, 0xd5, 0xf0, 0xf9,
0x1f, 0x29, 0x24, 0xf1, 0x27, 0x68, 0x37, 0xa4, 0x51, 0x4a, 0x0b, 0xa4, 0x76, 0x4d, 0xdb, 0xc1,
0xd9, 0x6c, 0xb0, 0x7b, 0xba, 0x70, 0x42, 0xee, 0x21, 0xf1, 0x77, 0xa8, 0x2d, 0x21, 0x8c, 0x03,
0x2a, 0x73, 0x0b, 0x75, 0x0f, 0x5f, 0x3c, 0x3c, 0x2f, 0x55, 0xd2, 0x19, 0xf7, 0xcf, 0x0d, 0x41,
0x3f, 0x4b, 0x85, 0x13, 0xe6, 0x51, 0x52, 0x08, 0x0e, 0x7f, 0x6b, 0xa2, 0x4e, 0xf1, 0xd8, 0x60,
0x40, 0xc8, 0x9b, 0x2f, 0xb4, 0xe8, 0xd5, 0xb5, 0x39, 0x46, 0xeb, 0x9a, 0xa3, 0x78, 0x0a, 0xca,
0x17, 0xb6, 0x08, 0x09, 0x52, 0x11, 0xc6, 0xdf, 0xa0, 0x8e, 0x90, 0x34, 0x91, 0x7a, 0x55, 0x1b,
0x8f, 0x5e, 0xd5, 0x9d, 0x6c, 0x36, 0xe8, 0x8c, 0xe7, 0x02, 0xa4, 0xd4, 0xc2, 0x17, 0x68, 0xb7,
0x74, 0xc9, 0xff, 0x7c, 0x76, 0xf4, 0x48, 0x8e, 0x16, 0x54, 0xc8, 0x3d, 0x55, 0xb5, 0xfc, 0xb9,
0x8d, 0xb4, 0x57, 0x5a, 0xe5, 0xf2, 0xe7, 0x9e, 0x23, 0xe6, 0x14, 0xdb, 0xa8, 0x23, 0x52, 0xcf,
0x03, 0xf0, 0xc1, 0xd7, 0x13, 0x6f, 0x39, 0x6f, 0x19, 0x68, 0x67, 0x3c, 0x3f, 0x20, 0x25, 0x46,
0x09, 0x5f, 0x50, 0x16, 0x80, 0xaf, 0x27, 0x5d, 0x11, 0xfe, 0x42, 0x47, 0x89, 0x39, 0x75, 0xde,
0xbd, 0xb9, 0xeb, 0xd7, 0x6e, 0xef, 0xfa, 0xb5, 0x3f, 0xef, 0xfa, 0xb5, 0x9f, 0xb3, 0x7e, 0xfd,
0x26, 0xeb, 0xd7, 0x6f, 0xb3, 0x7e, 0xfd, 0xaf, 0xac, 0x5f, 0xff, 0xf5, 0xef, 0x7e, 0xed, 0xdb,
0xc6, 0x74, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x9a, 0xe5, 0xae, 0xf3, 0x08, 0x00,
0x00,
}

View file

@ -36,7 +36,7 @@ message Job {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

View file

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api/v1"
)
// GroupName is the group name use in this package
@ -44,10 +43,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&Job{},
&JobList{},
&v1.ListOptions{},
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil

View file

@ -26,9 +26,9 @@ import (
"fmt"
codec1978 "github.com/ugorji/go/codec"
pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkg3_types "k8s.io/apimachinery/pkg/types"
pkg2_types "k8s.io/apimachinery/pkg/types"
pkg4_resource "k8s.io/kubernetes/pkg/api/resource"
pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg3_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr"
"reflect"
"runtime"
@ -66,9 +66,9 @@ func init() {
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_v1.TypeMeta
var v1 pkg3_types.UID
var v1 pkg2_types.UID
var v2 pkg4_resource.Quantity
var v3 pkg2_v1.ObjectMeta
var v3 pkg3_v1.PodTemplateSpec
var v4 pkg5_intstr.IntOrString
var v5 time.Time
_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
@ -164,7 +164,13 @@ func (x *Job) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] {
yy10 := &x.ObjectMeta
yy10.CodecEncodeSelf(e)
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
} else {
r.EncodeNil()
}
@ -174,7 +180,13 @@ func (x *Job) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yy12.CodecEncodeSelf(e)
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
}
}
if yyr2 || yy2arr2 {
@ -298,24 +310,30 @@ func (x *Job) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv8 := &x.ObjectMeta
yyv8.CodecDecodeSelf(d)
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
case "spec":
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv9 := &x.Spec
yyv9.CodecDecodeSelf(d)
yyv10 := &x.Spec
yyv10.CodecDecodeSelf(d)
}
case "status":
if r.TryDecodeAsNil() {
x.Status = JobStatus{}
} else {
yyv10 := &x.Status
yyv10.CodecDecodeSelf(d)
yyv11 := &x.Status
yyv11.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -328,16 +346,16 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj11 int
var yyb11 bool
var yyhl11 bool = l >= 0
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
var yyj12 int
var yyb12 bool
var yyhl12 bool = l >= 0
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -345,21 +363,21 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Kind = ""
} else {
yyv12 := &x.Kind
yym13 := z.DecBinary()
_ = yym13
yyv13 := &x.Kind
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv12)) = r.DecodeString()
*((*string)(yyv13)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -367,38 +385,44 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.APIVersion = ""
} else {
yyv14 := &x.APIVersion
yym15 := z.DecBinary()
_ = yym15
yyv15 := &x.APIVersion
yym16 := z.DecBinary()
_ = yym16
if false {
} else {
*((*string)(yyv14)) = r.DecodeString()
*((*string)(yyv15)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv16 := &x.ObjectMeta
yyv16.CodecDecodeSelf(d)
yyv17 := &x.ObjectMeta
yym18 := z.DecBinary()
_ = yym18
if false {
} else if z.HasExtensions() && z.DecExt(yyv17) {
} else {
z.DecFallback(yyv17, false)
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -406,16 +430,16 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv17 := &x.Spec
yyv17.CodecDecodeSelf(d)
yyv19 := &x.Spec
yyv19.CodecDecodeSelf(d)
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -423,21 +447,21 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Status = JobStatus{}
} else {
yyv18 := &x.Status
yyv18.CodecDecodeSelf(d)
yyv20 := &x.Status
yyv20.CodecDecodeSelf(d)
}
for {
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj11-1, "")
z.DecStructFieldNotFound(yyj12-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
@ -1175,7 +1199,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "template":
if r.TryDecodeAsNil() {
x.Template = pkg2_v1.PodTemplateSpec{}
x.Template = pkg3_v1.PodTemplateSpec{}
} else {
yyv14 := &x.Template
yyv14.CodecDecodeSelf(d)
@ -1337,7 +1361,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.Template = pkg2_v1.PodTemplateSpec{}
x.Template = pkg3_v1.PodTemplateSpec{}
} else {
yyv26 := &x.Template
yyv26.CodecDecodeSelf(d)
@ -2457,7 +2481,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg1 := len(yyv1) > 0
yyv21 := yyv1
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 832)
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 848)
if yyrt1 {
if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1]

View file

@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

View file

@ -52,10 +52,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
}
func autoConvert_v1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -70,10 +67,7 @@ func Convert_v1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope) er
}
func autoConvert_batch_Job_To_v1_Job(in *batch.Job, out *Job, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}

View file

@ -49,8 +49,10 @@ func DeepCopy_v1_Job(in interface{}, out interface{}, c *conversion.Cloner) erro
in := in.(*Job)
out := out.(*Job)
*out = *in
if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*meta_v1.ObjectMeta)
}
if err := DeepCopy_v1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
return err

View file

@ -50,6 +50,7 @@ go_test(
"//pkg/api/v1:go_default_library",
"//pkg/apis/batch/install:go_default_library",
"//pkg/apis/batch/v2alpha1:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
],
)

View file

@ -20,6 +20,7 @@ import (
"reflect"
"testing"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
@ -39,7 +40,7 @@ func TestSetDefaultJob(t *testing.T) {
original: &Job{
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -53,12 +54,12 @@ func TestSetDefaultJob(t *testing.T) {
},
"both unspecified -> sets both to 1 and no default labels": {
original: &Job{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"mylabel": "myvalue"},
},
Spec: JobSpec{
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -74,7 +75,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(0),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -90,7 +91,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Parallelism: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -106,7 +107,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Completions: newInt32(2),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -124,7 +125,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -133,7 +134,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(10),
Parallelism: newInt32(11),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},
@ -145,7 +146,7 @@ func TestSetDefaultJob(t *testing.T) {
Completions: newInt32(11),
Parallelism: newInt32(10),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{Labels: defaultLabels},
ObjectMeta: metav1.ObjectMeta{Labels: defaultLabels},
},
},
},

View file

@ -821,7 +821,7 @@ func (this *CronJob) String() string {
return "nil"
}
s := strings.Join([]string{`&CronJob{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "CronJobSpec", "CronJobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "CronJobStatus", "CronJobStatus", 1), `&`, ``, 1) + `,`,
`}`,
@ -869,7 +869,7 @@ func (this *Job) String() string {
return "nil"
}
s := strings.Join([]string{`&Job{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`,
`Status:` + strings.Replace(strings.Replace(this.Status.String(), "JobStatus", "JobStatus", 1), `&`, ``, 1) + `,`,
`}`,
@ -937,7 +937,7 @@ func (this *JobTemplate) String() string {
return "nil"
}
s := strings.Join([]string{`&JobTemplate{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Template:` + strings.Replace(strings.Replace(this.Template.String(), "JobTemplateSpec", "JobTemplateSpec", 1), `&`, ``, 1) + `,`,
`}`,
}, "")
@ -948,7 +948,7 @@ func (this *JobTemplateSpec) String() string {
return "nil"
}
s := strings.Join([]string{`&JobTemplateSpec{`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_kubernetes_pkg_api_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "JobSpec", "JobSpec", 1), `&`, ``, 1) + `,`,
`}`,
}, "")
@ -2708,77 +2708,77 @@ var (
var fileDescriptorGenerated = []byte{
// 1158 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45,
0x10, 0xce, 0xd8, 0x89, 0x1f, 0xed, 0xcd, 0xab, 0x21, 0x5a, 0x13, 0x24, 0x3b, 0xb2, 0x04, 0xca,
0xae, 0x76, 0x67, 0x14, 0x13, 0x2d, 0xcb, 0x1e, 0x90, 0x76, 0x82, 0x90, 0x88, 0x12, 0x6d, 0xd4,
0xce, 0xb2, 0x2b, 0x08, 0x12, 0xed, 0x71, 0xc7, 0x9e, 0xcd, 0xcc, 0xf4, 0x30, 0xdd, 0x13, 0x29,
0x37, 0xce, 0x9c, 0x90, 0xf8, 0x01, 0xfc, 0x0d, 0x84, 0xb8, 0x20, 0x71, 0xc8, 0x31, 0x48, 0x1c,
0x38, 0x59, 0x64, 0xf8, 0x17, 0x39, 0xa1, 0x6e, 0xf7, 0x3c, 0xfc, 0xca, 0xc6, 0x41, 0x8b, 0xc4,
0xcd, 0x53, 0x5d, 0xdf, 0x57, 0xd5, 0x55, 0x5f, 0x57, 0x19, 0x7c, 0x74, 0xf2, 0x98, 0xe9, 0x36,
0x35, 0x4e, 0xc2, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0x93, 0xae, 0x81, 0x7d, 0x9b, 0x19,
0x6d, 0xcc, 0xad, 0x9e, 0x71, 0xda, 0xc4, 0x8e, 0xdf, 0xc3, 0x5b, 0x46, 0x97, 0x78, 0x24, 0xc0,
0x9c, 0x74, 0x74, 0x3f, 0xa0, 0x9c, 0xc2, 0x7b, 0x03, 0xa8, 0x9e, 0x42, 0x75, 0xff, 0xa4, 0xab,
0x0b, 0xa8, 0x2e, 0xa1, 0x7a, 0x0c, 0x5d, 0x7f, 0xd8, 0xb5, 0x79, 0x2f, 0x6c, 0xeb, 0x16, 0x75,
0x8d, 0x2e, 0xed, 0x52, 0x43, 0x32, 0xb4, 0xc3, 0x63, 0xf9, 0x25, 0x3f, 0xe4, 0xaf, 0x01, 0xf3,
0xfa, 0xb6, 0x4a, 0x0a, 0xfb, 0xb6, 0x8b, 0xad, 0x9e, 0xed, 0x91, 0xe0, 0x2c, 0x4d, 0xcb, 0x25,
0x1c, 0x1b, 0xa7, 0x63, 0xf9, 0xac, 0x1b, 0xd3, 0x50, 0x41, 0xe8, 0x71, 0xdb, 0x25, 0x63, 0x80,
0x47, 0xaf, 0x03, 0x30, 0xab, 0x47, 0x5c, 0x3c, 0x86, 0x6b, 0x4e, 0xad, 0x99, 0x11, 0x10, 0x46,
0xc3, 0xc0, 0x1a, 0x8f, 0xf5, 0x60, 0x3a, 0x66, 0xc2, 0x55, 0xb6, 0x26, 0x7b, 0x87, 0xdc, 0x76,
0x0c, 0xdb, 0xe3, 0x8c, 0x07, 0xa3, 0x90, 0xc6, 0x8f, 0x39, 0x50, 0xdc, 0x09, 0xa8, 0xb7, 0x4b,
0xdb, 0xf0, 0x25, 0x28, 0x89, 0x22, 0x75, 0x30, 0xc7, 0x55, 0x6d, 0x43, 0xdb, 0xac, 0x34, 0x37,
0xf5, 0xa9, 0xcd, 0xd2, 0x4f, 0xb7, 0xf4, 0x67, 0xed, 0x57, 0xc4, 0xe2, 0xfb, 0x84, 0x63, 0x13,
0x9e, 0xf7, 0xeb, 0x73, 0x51, 0xbf, 0x0e, 0x52, 0x1b, 0x4a, 0xd8, 0xe0, 0x4b, 0x30, 0xcf, 0x7c,
0x62, 0x55, 0x73, 0x92, 0xf5, 0x91, 0x7e, 0x63, 0x09, 0xe8, 0x2a, 0xb7, 0x96, 0x4f, 0x2c, 0xf3,
0x8e, 0x8a, 0x31, 0x2f, 0xbe, 0x90, 0x64, 0x84, 0x5f, 0x83, 0x02, 0xe3, 0x98, 0x87, 0xac, 0x9a,
0x97, 0xdc, 0x8f, 0x6f, 0xc1, 0x2d, 0xf1, 0xe6, 0x92, 0x62, 0x2f, 0x0c, 0xbe, 0x91, 0xe2, 0x6d,
0xfc, 0xa6, 0x81, 0x8a, 0xf2, 0xdc, 0xb3, 0x19, 0x87, 0x47, 0x63, 0x55, 0xd2, 0xe3, 0x98, 0x59,
0x45, 0xa4, 0x51, 0x85, 0xb7, 0xa8, 0x96, 0x40, 0xcb, 0x5a, 0xad, 0xa8, 0x48, 0xa5, 0xd8, 0x92,
0xa9, 0xd4, 0x0b, 0xb0, 0x60, 0x73, 0xe2, 0xb2, 0x6a, 0x6e, 0x23, 0xbf, 0x59, 0x69, 0x36, 0x67,
0xbf, 0x8e, 0xb9, 0xa8, 0xe8, 0x17, 0x3e, 0x13, 0x44, 0x68, 0xc0, 0xd7, 0xf8, 0x2e, 0x9f, 0x5c,
0x43, 0x94, 0x0f, 0x3e, 0x00, 0x25, 0xa1, 0xd3, 0x4e, 0xe8, 0x10, 0x79, 0x8d, 0x72, 0x9a, 0x56,
0x4b, 0xd9, 0x51, 0xe2, 0x01, 0x9f, 0x83, 0xbb, 0x8c, 0xe3, 0x80, 0xdb, 0x5e, 0xf7, 0x13, 0x82,
0x3b, 0x8e, 0xed, 0x91, 0x16, 0xb1, 0xa8, 0xd7, 0x61, 0xb2, 0xa7, 0x79, 0xf3, 0xdd, 0xa8, 0x5f,
0xbf, 0xdb, 0x9a, 0xec, 0x82, 0xa6, 0x61, 0xe1, 0x11, 0x58, 0xb5, 0xa8, 0x67, 0x85, 0x41, 0x40,
0x3c, 0xeb, 0xec, 0x80, 0x3a, 0xb6, 0x75, 0x26, 0x1b, 0x59, 0x36, 0x75, 0x95, 0xcd, 0xea, 0xce,
0xa8, 0xc3, 0xd5, 0x24, 0x23, 0x1a, 0x27, 0x82, 0xef, 0x81, 0x22, 0x0b, 0x99, 0x4f, 0xbc, 0x4e,
0x75, 0x7e, 0x43, 0xdb, 0x2c, 0x99, 0x95, 0xa8, 0x5f, 0x2f, 0xb6, 0x06, 0x26, 0x14, 0x9f, 0xc1,
0x6f, 0x40, 0xe5, 0x15, 0x6d, 0x1f, 0x12, 0xd7, 0x77, 0x30, 0x27, 0xd5, 0x05, 0xd9, 0xd3, 0x27,
0x33, 0x14, 0x7e, 0x37, 0x45, 0x4b, 0x9d, 0xbe, 0xa5, 0x52, 0xaf, 0x64, 0x0e, 0x50, 0x36, 0x46,
0xe3, 0x0f, 0x0d, 0x2c, 0x0e, 0xa9, 0x0f, 0x3e, 0x07, 0x05, 0x6c, 0x71, 0xfb, 0x54, 0x34, 0x43,
0x34, 0xfe, 0xe1, 0x4d, 0x5e, 0x1e, 0x22, 0xc7, 0x44, 0x5c, 0x98, 0xa4, 0xe2, 0x7d, 0x2a, 0x49,
0x90, 0x22, 0x83, 0x0e, 0x58, 0x71, 0x30, 0xe3, 0x71, 0x47, 0x0f, 0x6d, 0x97, 0xc8, 0x5a, 0x54,
0x9a, 0xf7, 0x6f, 0x26, 0x5a, 0x81, 0x30, 0xdf, 0x8e, 0xfa, 0xf5, 0x95, 0xbd, 0x11, 0x1e, 0x34,
0xc6, 0xdc, 0xf8, 0x21, 0x07, 0xf2, 0x6f, 0x76, 0x90, 0x1c, 0x0e, 0x0d, 0x92, 0xe6, 0x6c, 0x4d,
0x9a, 0x3a, 0x44, 0x8e, 0x46, 0x86, 0xc8, 0xf6, 0x8c, 0xbc, 0xd7, 0x0f, 0x90, 0x8b, 0x3c, 0xb8,
0xb3, 0x4b, 0xdb, 0x3b, 0xd4, 0xeb, 0xd8, 0xdc, 0xa6, 0x1e, 0xdc, 0x06, 0xf3, 0xfc, 0xcc, 0x8f,
0x9f, 0xdd, 0x46, 0x9c, 0xd0, 0xe1, 0x99, 0x4f, 0xae, 0xfa, 0xf5, 0x95, 0xac, 0xaf, 0xb0, 0x21,
0xe9, 0x0d, 0x3f, 0x4f, 0x92, 0xcc, 0x49, 0xdc, 0xc7, 0xc3, 0xe1, 0xae, 0xfa, 0xf5, 0x6b, 0x97,
0x85, 0x9e, 0x70, 0x0e, 0xa7, 0x07, 0xbb, 0x60, 0x51, 0x34, 0xf2, 0x20, 0xa0, 0xed, 0x81, 0x3e,
0xf2, 0x33, 0xeb, 0x63, 0x4d, 0xa5, 0xb2, 0xb8, 0x97, 0x25, 0x42, 0xc3, 0xbc, 0xf0, 0x14, 0x40,
0x61, 0x38, 0x0c, 0xb0, 0xc7, 0x06, 0x97, 0xbb, 0x9d, 0x1a, 0xd7, 0x55, 0x34, 0xb8, 0x37, 0xc6,
0x86, 0x26, 0x44, 0x80, 0xef, 0x83, 0x42, 0x40, 0x30, 0xa3, 0x9e, 0x7c, 0xda, 0xe5, 0xb4, 0x4f,
0x48, 0x5a, 0x91, 0x3a, 0x85, 0xf7, 0x40, 0xd1, 0x25, 0x8c, 0xe1, 0x2e, 0xa9, 0x16, 0xa4, 0xe3,
0xb2, 0x72, 0x2c, 0xee, 0x0f, 0xcc, 0x28, 0x3e, 0x6f, 0xfc, 0xa2, 0x81, 0xe2, 0x7f, 0xb3, 0x0f,
0x5a, 0xc3, 0xfb, 0x40, 0x9f, 0x4d, 0x99, 0x53, 0x76, 0xc1, 0x4f, 0x79, 0x99, 0xbe, 0xdc, 0x03,
0x5b, 0xa0, 0xe2, 0xe3, 0x00, 0x3b, 0x0e, 0x71, 0x6c, 0xe6, 0xca, 0x1b, 0x2c, 0x98, 0xcb, 0x62,
0x7a, 0x1d, 0xa4, 0x66, 0x94, 0xf5, 0x11, 0x10, 0x8b, 0xba, 0xbe, 0x43, 0x44, 0x89, 0x07, 0x72,
0x54, 0x90, 0x9d, 0xd4, 0x8c, 0xb2, 0x3e, 0xf0, 0x19, 0x58, 0x1b, 0x4c, 0xa4, 0xd1, 0xed, 0x91,
0x97, 0xdb, 0xe3, 0x9d, 0xa8, 0x5f, 0x5f, 0x7b, 0x3a, 0xc9, 0x01, 0x4d, 0xc6, 0xc1, 0xaf, 0x40,
0x89, 0x11, 0x87, 0x58, 0x9c, 0x06, 0x4a, 0x42, 0x1f, 0xdc, 0xb0, 0xea, 0xb8, 0x4d, 0x9c, 0x96,
0x82, 0x9a, 0x77, 0xe4, 0xbe, 0x53, 0x5f, 0x28, 0xa1, 0x84, 0x4f, 0xc0, 0x92, 0x8b, 0xbd, 0x10,
0x27, 0x9e, 0x52, 0x3b, 0x25, 0x13, 0x46, 0xfd, 0xfa, 0xd2, 0xfe, 0xd0, 0x09, 0x1a, 0xf1, 0x84,
0x5f, 0x82, 0x12, 0x8f, 0x97, 0x49, 0x41, 0xa6, 0xf6, 0x9a, 0x61, 0x7e, 0x40, 0x3b, 0x43, 0xfb,
0x23, 0xd1, 0x43, 0xb2, 0x3c, 0x12, 0xc2, 0xc6, 0xcf, 0x79, 0x50, 0x4e, 0xb7, 0xc6, 0x09, 0x00,
0x56, 0xfc, 0xac, 0x99, 0xda, 0x1c, 0x1f, 0xce, 0x26, 0x91, 0x64, 0x2c, 0xa4, 0x93, 0x37, 0x31,
0x31, 0x94, 0xa1, 0x87, 0x2f, 0x40, 0x59, 0xee, 0x71, 0xf9, 0x6c, 0x73, 0x33, 0x3f, 0xdb, 0xc5,
0xa8, 0x5f, 0x2f, 0xb7, 0x62, 0x02, 0x94, 0x72, 0xc1, 0x63, 0xb0, 0x94, 0x6a, 0xe5, 0x96, 0x23,
0x48, 0x36, 0x66, 0x67, 0x88, 0x05, 0x8d, 0xb0, 0x8a, 0x41, 0xa0, 0x76, 0xec, 0xbc, 0x94, 0xec,
0xb4, 0xa5, 0x69, 0x80, 0x32, 0x0b, 0x2d, 0x8b, 0x90, 0x0e, 0xe9, 0xc8, 0xbe, 0x2f, 0x98, 0xab,
0xca, 0xb5, 0xdc, 0x8a, 0x0f, 0x50, 0xea, 0x23, 0x88, 0x8f, 0xb1, 0xed, 0x90, 0x8e, 0xec, 0x77,
0x86, 0xf8, 0x53, 0x69, 0x45, 0xea, 0xb4, 0xf1, 0xbb, 0x06, 0xb2, 0xff, 0x09, 0xde, 0xe0, 0x9e,
0xec, 0x65, 0x34, 0x98, 0xfb, 0xd7, 0x7f, 0x68, 0xae, 0x13, 0xe4, 0xaf, 0x1a, 0x58, 0x1e, 0xf1,
0xff, 0xbf, 0xed, 0x7f, 0xf3, 0xfe, 0xf9, 0x65, 0x6d, 0xee, 0xe2, 0xb2, 0x36, 0xf7, 0xe7, 0x65,
0x6d, 0xee, 0xdb, 0xa8, 0xa6, 0x9d, 0x47, 0x35, 0xed, 0x22, 0xaa, 0x69, 0x7f, 0x45, 0x35, 0xed,
0xfb, 0xbf, 0x6b, 0x73, 0x5f, 0x94, 0x62, 0x9e, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x9d,
0xf9, 0x2b, 0xfa, 0x0e, 0x00, 0x00,
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x6f, 0xe3, 0x44,
0x14, 0xaf, 0x93, 0x36, 0x1f, 0x93, 0x7e, 0x0e, 0x54, 0x1b, 0x8a, 0x94, 0x54, 0x91, 0x40, 0xdd,
0xd5, 0xae, 0x4d, 0x43, 0xb5, 0x2c, 0x7b, 0x40, 0x5a, 0x17, 0x21, 0x51, 0xb5, 0xda, 0x6a, 0xd2,
0x65, 0x11, 0x14, 0x69, 0x27, 0xf6, 0x34, 0xf1, 0xd6, 0xf6, 0x18, 0xcf, 0xb8, 0x52, 0x6e, 0x9c,
0x39, 0x71, 0xe7, 0x0f, 0xe0, 0x5f, 0x40, 0x88, 0x23, 0x87, 0x72, 0xeb, 0x81, 0x03, 0x5c, 0x22,
0x6a, 0xfe, 0x8b, 0x9e, 0x90, 0x27, 0xe3, 0x8f, 0x7c, 0x75, 0x9b, 0x22, 0x55, 0xe2, 0xe6, 0x79,
0xf3, 0x7e, 0xbf, 0x79, 0xf3, 0xde, 0x6f, 0xde, 0x33, 0xf8, 0xf8, 0xf4, 0x09, 0x53, 0x2d, 0xaa,
0x9d, 0x06, 0x6d, 0xe2, 0xbb, 0x84, 0x13, 0xa6, 0x79, 0xa7, 0x1d, 0x0d, 0x7b, 0x16, 0xd3, 0xda,
0x98, 0x1b, 0x5d, 0xed, 0xac, 0x89, 0x6d, 0xaf, 0x8b, 0xb7, 0xb5, 0x0e, 0x71, 0x89, 0x8f, 0x39,
0x31, 0x55, 0xcf, 0xa7, 0x9c, 0xc2, 0xfb, 0x03, 0xa8, 0x9a, 0x42, 0x55, 0xef, 0xb4, 0xa3, 0x46,
0x50, 0x55, 0x40, 0xd5, 0x18, 0xba, 0xf1, 0xa8, 0x63, 0xf1, 0x6e, 0xd0, 0x56, 0x0d, 0xea, 0x68,
0x1d, 0xda, 0xa1, 0x9a, 0x60, 0x68, 0x07, 0x27, 0x62, 0x25, 0x16, 0xe2, 0x6b, 0xc0, 0xbc, 0xb1,
0x23, 0x83, 0xc2, 0x9e, 0xe5, 0x60, 0xa3, 0x6b, 0xb9, 0xc4, 0xef, 0xa5, 0x61, 0x39, 0x84, 0x63,
0xed, 0x6c, 0x2c, 0x9e, 0x0d, 0x6d, 0x1a, 0xca, 0x0f, 0x5c, 0x6e, 0x39, 0x64, 0x0c, 0xf0, 0xf8,
0x4d, 0x00, 0x66, 0x74, 0x89, 0x83, 0xc7, 0x70, 0xcd, 0xa9, 0x39, 0xd3, 0x7c, 0xc2, 0x68, 0xe0,
0x1b, 0xe3, 0x67, 0x3d, 0x9c, 0x8e, 0x99, 0x70, 0x95, 0xed, 0xc9, 0xde, 0x01, 0xb7, 0x6c, 0xcd,
0x72, 0x39, 0xe3, 0xfe, 0x28, 0xa4, 0xf1, 0x53, 0x0e, 0x14, 0x77, 0x7d, 0xea, 0xee, 0xd1, 0x36,
0x7c, 0x05, 0x4a, 0x51, 0x92, 0x4c, 0xcc, 0x71, 0x55, 0xd9, 0x54, 0xb6, 0x2a, 0xcd, 0x0f, 0x54,
0x59, 0xac, 0xec, 0x5d, 0xd3, 0x72, 0x45, 0xde, 0xea, 0xd9, 0xb6, 0xfa, 0xbc, 0xfd, 0x9a, 0x18,
0xfc, 0x80, 0x70, 0xac, 0xc3, 0xf3, 0x7e, 0x7d, 0x2e, 0xec, 0xd7, 0x41, 0x6a, 0x43, 0x09, 0x2b,
0xfc, 0x12, 0xcc, 0x33, 0x8f, 0x18, 0xd5, 0x9c, 0x60, 0x7f, 0xac, 0xde, 0x58, 0x0a, 0xaa, 0x8c,
0xb1, 0xe5, 0x11, 0x43, 0x5f, 0x94, 0x67, 0xcc, 0x47, 0x2b, 0x24, 0x18, 0xe1, 0x2b, 0x50, 0x60,
0x1c, 0xf3, 0x80, 0x55, 0xf3, 0x82, 0xfb, 0xc9, 0x2d, 0xb8, 0x05, 0x5e, 0x5f, 0x96, 0xec, 0x85,
0xc1, 0x1a, 0x49, 0xde, 0xc6, 0x6f, 0x0a, 0xa8, 0x48, 0xcf, 0x7d, 0x8b, 0x71, 0x78, 0x3c, 0x96,
0x2d, 0xf5, 0x66, 0xd9, 0x8a, 0xd0, 0x22, 0x57, 0xab, 0xf2, 0xa4, 0x52, 0x6c, 0xc9, 0x64, 0xea,
0x25, 0x58, 0xb0, 0x38, 0x71, 0x58, 0x35, 0xb7, 0x99, 0xdf, 0xaa, 0x34, 0x9b, 0xb3, 0x5f, 0x47,
0x5f, 0x92, 0xf4, 0x0b, 0x9f, 0x47, 0x44, 0x68, 0xc0, 0xd7, 0xf8, 0x3e, 0x9f, 0x5c, 0x23, 0x4a,
0x1f, 0x7c, 0x08, 0x4a, 0x91, 0x5e, 0xcd, 0xc0, 0x26, 0xe2, 0x1a, 0xe5, 0x34, 0xac, 0x96, 0xb4,
0xa3, 0xc4, 0x03, 0xbe, 0x00, 0xf7, 0x18, 0xc7, 0x3e, 0xb7, 0xdc, 0xce, 0xa7, 0x04, 0x9b, 0xb6,
0xe5, 0x92, 0x16, 0x31, 0xa8, 0x6b, 0x32, 0x51, 0xd3, 0xbc, 0xfe, 0x6e, 0xd8, 0xaf, 0xdf, 0x6b,
0x4d, 0x76, 0x41, 0xd3, 0xb0, 0xf0, 0x18, 0xac, 0x19, 0xd4, 0x35, 0x02, 0xdf, 0x27, 0xae, 0xd1,
0x3b, 0xa4, 0xb6, 0x65, 0xf4, 0x44, 0x21, 0xcb, 0xba, 0x2a, 0xa3, 0x59, 0xdb, 0x1d, 0x75, 0xb8,
0x9a, 0x64, 0x44, 0xe3, 0x44, 0xf0, 0x3d, 0x50, 0x64, 0x01, 0xf3, 0x88, 0x6b, 0x56, 0xe7, 0x37,
0x95, 0xad, 0x92, 0x5e, 0x09, 0xfb, 0xf5, 0x62, 0x6b, 0x60, 0x42, 0xf1, 0x1e, 0xfc, 0x16, 0x54,
0x5e, 0xd3, 0xf6, 0x11, 0x71, 0x3c, 0x1b, 0x73, 0x52, 0x5d, 0x10, 0x35, 0x7d, 0x3a, 0x43, 0xe2,
0xf7, 0x52, 0xb4, 0xd0, 0xe9, 0x5b, 0x32, 0xf4, 0x4a, 0x66, 0x03, 0x65, 0xcf, 0x68, 0xfc, 0xa1,
0x80, 0xa5, 0x21, 0xf5, 0xc1, 0x17, 0xa0, 0x80, 0x0d, 0x6e, 0x9d, 0x45, 0xc5, 0x88, 0x0a, 0xff,
0x68, 0xfa, 0xf9, 0xe9, 0xcb, 0x43, 0xe4, 0x84, 0x44, 0x17, 0x26, 0xa9, 0x78, 0x9f, 0x09, 0x12,
0x24, 0xc9, 0xa0, 0x0d, 0x56, 0x6d, 0xcc, 0x78, 0x5c, 0xd1, 0x23, 0xcb, 0x21, 0x22, 0x17, 0x95,
0xe6, 0x83, 0x9b, 0x89, 0x36, 0x42, 0xe8, 0x6f, 0x87, 0xfd, 0xfa, 0xea, 0xfe, 0x08, 0x0f, 0x1a,
0x63, 0x6e, 0xfc, 0x98, 0x03, 0xf9, 0xbb, 0x69, 0x28, 0x47, 0x43, 0x0d, 0xa5, 0x39, 0x5b, 0xb1,
0xa6, 0x36, 0x93, 0xe3, 0x91, 0x66, 0xb2, 0x33, 0x23, 0xef, 0xf5, 0x8d, 0xe4, 0x22, 0x0f, 0x16,
0xf7, 0x68, 0x7b, 0x97, 0xba, 0xa6, 0xc5, 0x2d, 0xea, 0xc2, 0x1d, 0x30, 0xcf, 0x7b, 0x5e, 0xfc,
0xfc, 0x36, 0xe3, 0x80, 0x8e, 0x7a, 0x1e, 0xb9, 0xea, 0xd7, 0x57, 0xb3, 0xbe, 0x91, 0x0d, 0x09,
0x6f, 0xf8, 0x45, 0x12, 0x64, 0x4e, 0xe0, 0x3e, 0x19, 0x3e, 0xee, 0xaa, 0x5f, 0xbf, 0x76, 0x78,
0xa8, 0x09, 0xe7, 0x70, 0x78, 0xb0, 0x03, 0x96, 0xa2, 0x82, 0x1e, 0xfa, 0xb4, 0x3d, 0xd0, 0x49,
0x7e, 0x66, 0x9d, 0xac, 0xcb, 0x50, 0x96, 0xf6, 0xb3, 0x44, 0x68, 0x98, 0x17, 0x9e, 0x01, 0x18,
0x19, 0x8e, 0x7c, 0xec, 0xb2, 0xc1, 0xe5, 0x6e, 0xa7, 0xca, 0x0d, 0x79, 0x1a, 0xdc, 0x1f, 0x63,
0x43, 0x13, 0x4e, 0x80, 0xef, 0x83, 0x82, 0x4f, 0x30, 0xa3, 0xae, 0x78, 0xe2, 0xe5, 0xb4, 0x4e,
0x48, 0x58, 0x91, 0xdc, 0x85, 0xf7, 0x41, 0xd1, 0x21, 0x8c, 0xe1, 0x0e, 0xa9, 0x16, 0x84, 0xe3,
0x8a, 0x74, 0x2c, 0x1e, 0x0c, 0xcc, 0x28, 0xde, 0x6f, 0xfc, 0xaa, 0x80, 0xe2, 0xdd, 0xcc, 0x85,
0xd6, 0xf0, 0x5c, 0x50, 0x67, 0x53, 0xe6, 0x94, 0x99, 0xf0, 0x73, 0x5e, 0x84, 0x2f, 0xe6, 0xc1,
0x36, 0xa8, 0x78, 0xd8, 0xc7, 0xb6, 0x4d, 0x6c, 0x8b, 0x39, 0xe2, 0x06, 0x0b, 0xfa, 0x4a, 0xd4,
0xc5, 0x0e, 0x53, 0x33, 0xca, 0xfa, 0x44, 0x10, 0x83, 0x3a, 0x9e, 0x4d, 0xa2, 0x14, 0x0f, 0xe4,
0x28, 0x21, 0xbb, 0xa9, 0x19, 0x65, 0x7d, 0xe0, 0x73, 0xb0, 0x3e, 0xe8, 0x4c, 0xa3, 0x53, 0x24,
0x2f, 0xa6, 0xc8, 0x3b, 0x61, 0xbf, 0xbe, 0xfe, 0x6c, 0x92, 0x03, 0x9a, 0x8c, 0x83, 0xdf, 0x80,
0x12, 0x23, 0x36, 0x31, 0x38, 0xf5, 0xa5, 0x84, 0x3e, 0xbc, 0x61, 0xd6, 0x71, 0x9b, 0xd8, 0x2d,
0x09, 0xd5, 0x17, 0xc5, 0xdc, 0x93, 0x2b, 0x94, 0x50, 0xc2, 0xa7, 0x60, 0xd9, 0xc1, 0x6e, 0x80,
0x13, 0x4f, 0xa1, 0x9d, 0x92, 0x0e, 0xc3, 0x7e, 0x7d, 0xf9, 0x60, 0x68, 0x07, 0x8d, 0x78, 0xc2,
0xaf, 0x41, 0x89, 0xc7, 0x43, 0xa5, 0x20, 0x42, 0x7b, 0x43, 0x53, 0x3f, 0xa4, 0xe6, 0xd0, 0x1c,
0x49, 0xf4, 0x90, 0x0c, 0x91, 0x84, 0xb0, 0xf1, 0x4b, 0x1e, 0x94, 0xd3, 0xe9, 0x71, 0x0a, 0x80,
0x11, 0x3f, 0x6b, 0x26, 0x27, 0xc8, 0x47, 0xb3, 0x49, 0x24, 0x69, 0x0b, 0x69, 0xe7, 0x4d, 0x4c,
0x0c, 0x65, 0xe8, 0xe1, 0x4b, 0x50, 0x16, 0xf3, 0x5c, 0x3c, 0xdb, 0xdc, 0xcc, 0xcf, 0x76, 0x29,
0xec, 0xd7, 0xcb, 0xad, 0x98, 0x00, 0xa5, 0x5c, 0xf0, 0x04, 0x2c, 0xa7, 0x5a, 0xb9, 0x65, 0x0b,
0x12, 0x85, 0xd9, 0x1d, 0x62, 0x41, 0x23, 0xac, 0x51, 0x23, 0x90, 0xb3, 0x76, 0x5e, 0x48, 0x76,
0xda, 0xf0, 0xd4, 0x40, 0x99, 0x05, 0x86, 0x41, 0x88, 0x49, 0x4c, 0x51, 0xf7, 0x05, 0x7d, 0x4d,
0xba, 0x96, 0x5b, 0xf1, 0x06, 0x4a, 0x7d, 0x22, 0xe2, 0x13, 0x6c, 0xd9, 0xc4, 0x14, 0xf5, 0xce,
0x10, 0x7f, 0x26, 0xac, 0x48, 0xee, 0x36, 0xfe, 0x52, 0x40, 0xf6, 0xdf, 0xe0, 0x0e, 0xe6, 0x65,
0x37, 0xa3, 0xc5, 0xdc, 0x7f, 0xfe, 0xc1, 0xb9, 0x4e, 0x98, 0xbf, 0x2b, 0x60, 0x65, 0xc4, 0xff,
0xff, 0xfa, 0x3f, 0xa0, 0x3f, 0x38, 0xbf, 0xac, 0xcd, 0x5d, 0x5c, 0xd6, 0xe6, 0xfe, 0xbc, 0xac,
0xcd, 0x7d, 0x17, 0xd6, 0x94, 0xf3, 0xb0, 0xa6, 0x5c, 0x84, 0x35, 0xe5, 0xef, 0xb0, 0xa6, 0xfc,
0xf0, 0x4f, 0x6d, 0xee, 0xab, 0x52, 0xcc, 0xf3, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x36,
0x56, 0x74, 0x1a, 0x0f, 0x00, 0x00,
}

View file

@ -36,7 +36,7 @@ message CronJob {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Spec is a structure defining the expected behavior of a job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -100,7 +100,7 @@ message Job {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -235,7 +235,7 @@ message JobTemplate {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Template defines jobs that will be created from this template
// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -248,7 +248,7 @@ message JobTemplateSpec {
// Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

View file

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api/v1"
)
// GroupName is the group name use in this package
@ -47,10 +46,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&JobTemplate{},
&CronJob{},
&CronJobList{},
&v1.ListOptions{},
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
)
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{})
scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJobList"), &CronJobList{})

View file

@ -26,9 +26,9 @@ import (
"fmt"
codec1978 "github.com/ugorji/go/codec"
pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkg3_types "k8s.io/apimachinery/pkg/types"
pkg2_types "k8s.io/apimachinery/pkg/types"
pkg4_resource "k8s.io/kubernetes/pkg/api/resource"
pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg3_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr"
"reflect"
"runtime"
@ -66,9 +66,9 @@ func init() {
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_v1.TypeMeta
var v1 pkg3_types.UID
var v1 pkg2_types.UID
var v2 pkg4_resource.Quantity
var v3 pkg2_v1.ObjectMeta
var v3 pkg3_v1.PodTemplateSpec
var v4 pkg5_intstr.IntOrString
var v5 time.Time
_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
@ -164,7 +164,13 @@ func (x *Job) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] {
yy10 := &x.ObjectMeta
yy10.CodecEncodeSelf(e)
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
} else {
r.EncodeNil()
}
@ -174,7 +180,13 @@ func (x *Job) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yy12.CodecEncodeSelf(e)
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
}
}
if yyr2 || yy2arr2 {
@ -298,24 +310,30 @@ func (x *Job) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv8 := &x.ObjectMeta
yyv8.CodecDecodeSelf(d)
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
case "spec":
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv9 := &x.Spec
yyv9.CodecDecodeSelf(d)
yyv10 := &x.Spec
yyv10.CodecDecodeSelf(d)
}
case "status":
if r.TryDecodeAsNil() {
x.Status = JobStatus{}
} else {
yyv10 := &x.Status
yyv10.CodecDecodeSelf(d)
yyv11 := &x.Status
yyv11.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -328,16 +346,16 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj11 int
var yyb11 bool
var yyhl11 bool = l >= 0
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
var yyj12 int
var yyb12 bool
var yyhl12 bool = l >= 0
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -345,21 +363,21 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Kind = ""
} else {
yyv12 := &x.Kind
yym13 := z.DecBinary()
_ = yym13
yyv13 := &x.Kind
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv12)) = r.DecodeString()
*((*string)(yyv13)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -367,38 +385,44 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.APIVersion = ""
} else {
yyv14 := &x.APIVersion
yym15 := z.DecBinary()
_ = yym15
yyv15 := &x.APIVersion
yym16 := z.DecBinary()
_ = yym16
if false {
} else {
*((*string)(yyv14)) = r.DecodeString()
*((*string)(yyv15)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv16 := &x.ObjectMeta
yyv16.CodecDecodeSelf(d)
yyv17 := &x.ObjectMeta
yym18 := z.DecBinary()
_ = yym18
if false {
} else if z.HasExtensions() && z.DecExt(yyv17) {
} else {
z.DecFallback(yyv17, false)
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -406,16 +430,16 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv17 := &x.Spec
yyv17.CodecDecodeSelf(d)
yyv19 := &x.Spec
yyv19.CodecDecodeSelf(d)
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -423,21 +447,21 @@ func (x *Job) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Status = JobStatus{}
} else {
yyv18 := &x.Status
yyv18.CodecDecodeSelf(d)
yyv20 := &x.Status
yyv20.CodecDecodeSelf(d)
}
for {
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj11-1, "")
z.DecStructFieldNotFound(yyj12-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
@ -898,7 +922,13 @@ func (x *JobTemplate) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] {
yy10 := &x.ObjectMeta
yy10.CodecEncodeSelf(e)
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
} else {
r.EncodeNil()
}
@ -908,7 +938,13 @@ func (x *JobTemplate) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yy12.CodecEncodeSelf(e)
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
}
}
if yyr2 || yy2arr2 {
@ -1015,17 +1051,23 @@ func (x *JobTemplate) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv8 := &x.ObjectMeta
yyv8.CodecDecodeSelf(d)
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
case "template":
if r.TryDecodeAsNil() {
x.Template = JobTemplateSpec{}
} else {
yyv9 := &x.Template
yyv9.CodecDecodeSelf(d)
yyv10 := &x.Template
yyv10.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -1038,16 +1080,16 @@ func (x *JobTemplate) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj10 int
var yyb10 bool
var yyhl10 bool = l >= 0
yyj10++
if yyhl10 {
yyb10 = yyj10 > l
var yyj11 int
var yyb11 bool
var yyhl11 bool = l >= 0
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
} else {
yyb10 = r.CheckBreak()
yyb11 = r.CheckBreak()
}
if yyb10 {
if yyb11 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -1055,21 +1097,21 @@ func (x *JobTemplate) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Kind = ""
} else {
yyv11 := &x.Kind
yym12 := z.DecBinary()
_ = yym12
yyv12 := &x.Kind
yym13 := z.DecBinary()
_ = yym13
if false {
} else {
*((*string)(yyv11)) = r.DecodeString()
*((*string)(yyv12)) = r.DecodeString()
}
}
yyj10++
if yyhl10 {
yyb10 = yyj10 > l
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
} else {
yyb10 = r.CheckBreak()
yyb11 = r.CheckBreak()
}
if yyb10 {
if yyb11 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -1077,38 +1119,44 @@ func (x *JobTemplate) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.APIVersion = ""
} else {
yyv13 := &x.APIVersion
yym14 := z.DecBinary()
_ = yym14
yyv14 := &x.APIVersion
yym15 := z.DecBinary()
_ = yym15
if false {
} else {
*((*string)(yyv13)) = r.DecodeString()
*((*string)(yyv14)) = r.DecodeString()
}
}
yyj10++
if yyhl10 {
yyb10 = yyj10 > l
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
} else {
yyb10 = r.CheckBreak()
yyb11 = r.CheckBreak()
}
if yyb10 {
if yyb11 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv15 := &x.ObjectMeta
yyv15.CodecDecodeSelf(d)
yyv16 := &x.ObjectMeta
yym17 := z.DecBinary()
_ = yym17
if false {
} else if z.HasExtensions() && z.DecExt(yyv16) {
} else {
z.DecFallback(yyv16, false)
}
}
yyj10++
if yyhl10 {
yyb10 = yyj10 > l
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
} else {
yyb10 = r.CheckBreak()
yyb11 = r.CheckBreak()
}
if yyb10 {
if yyb11 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -1116,21 +1164,21 @@ func (x *JobTemplate) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Template = JobTemplateSpec{}
} else {
yyv16 := &x.Template
yyv16.CodecDecodeSelf(d)
yyv18 := &x.Template
yyv18.CodecDecodeSelf(d)
}
for {
yyj10++
if yyhl10 {
yyb10 = yyj10 > l
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
} else {
yyb10 = r.CheckBreak()
yyb11 = r.CheckBreak()
}
if yyb10 {
if yyb11 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj10-1, "")
z.DecStructFieldNotFound(yyj11-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
@ -1171,7 +1219,13 @@ func (x *JobTemplateSpec) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[0] {
yy4 := &x.ObjectMeta
yy4.CodecEncodeSelf(e)
yym5 := z.EncBinary()
_ = yym5
if false {
} else if z.HasExtensions() && z.EncExt(yy4) {
} else {
z.EncFallback(yy4)
}
} else {
r.EncodeNil()
}
@ -1181,7 +1235,13 @@ func (x *JobTemplateSpec) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy6 := &x.ObjectMeta
yy6.CodecEncodeSelf(e)
yym7 := z.EncBinary()
_ = yym7
if false {
} else if z.HasExtensions() && z.EncExt(yy6) {
} else {
z.EncFallback(yy6)
}
}
}
if yyr2 || yy2arr2 {
@ -1264,17 +1324,23 @@ func (x *JobTemplateSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
switch yys3 {
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv4 := &x.ObjectMeta
yyv4.CodecDecodeSelf(d)
yym5 := z.DecBinary()
_ = yym5
if false {
} else if z.HasExtensions() && z.DecExt(yyv4) {
} else {
z.DecFallback(yyv4, false)
}
}
case "spec":
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv5 := &x.Spec
yyv5.CodecDecodeSelf(d)
yyv6 := &x.Spec
yyv6.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -1287,33 +1353,39 @@ func (x *JobTemplateSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj6 int
var yyb6 bool
var yyhl6 bool = l >= 0
yyj6++
if yyhl6 {
yyb6 = yyj6 > l
var yyj7 int
var yyb7 bool
var yyhl7 bool = l >= 0
yyj7++
if yyhl7 {
yyb7 = yyj7 > l
} else {
yyb6 = r.CheckBreak()
yyb7 = r.CheckBreak()
}
if yyb6 {
if yyb7 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv7 := &x.ObjectMeta
yyv7.CodecDecodeSelf(d)
yyv8 := &x.ObjectMeta
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
yyj6++
if yyhl6 {
yyb6 = yyj6 > l
yyj7++
if yyhl7 {
yyb7 = yyj7 > l
} else {
yyb6 = r.CheckBreak()
yyb7 = r.CheckBreak()
}
if yyb6 {
if yyb7 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -1321,21 +1393,21 @@ func (x *JobTemplateSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder)
if r.TryDecodeAsNil() {
x.Spec = JobSpec{}
} else {
yyv8 := &x.Spec
yyv8.CodecDecodeSelf(d)
yyv10 := &x.Spec
yyv10.CodecDecodeSelf(d)
}
for {
yyj6++
if yyhl6 {
yyb6 = yyj6 > l
yyj7++
if yyhl7 {
yyb7 = yyj7 > l
} else {
yyb6 = r.CheckBreak()
yyb7 = r.CheckBreak()
}
if yyb6 {
if yyb7 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj6-1, "")
z.DecStructFieldNotFound(yyj7-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
@ -1705,7 +1777,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "template":
if r.TryDecodeAsNil() {
x.Template = pkg2_v1.PodTemplateSpec{}
x.Template = pkg3_v1.PodTemplateSpec{}
} else {
yyv14 := &x.Template
yyv14.CodecDecodeSelf(d)
@ -1867,7 +1939,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.Template = pkg2_v1.PodTemplateSpec{}
x.Template = pkg3_v1.PodTemplateSpec{}
} else {
yyv26 := &x.Template
yyv26.CodecDecodeSelf(d)
@ -3037,7 +3109,13 @@ func (x *CronJob) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] {
yy10 := &x.ObjectMeta
yy10.CodecEncodeSelf(e)
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
} else {
r.EncodeNil()
}
@ -3047,7 +3125,13 @@ func (x *CronJob) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yy12.CodecEncodeSelf(e)
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
}
}
if yyr2 || yy2arr2 {
@ -3171,24 +3255,30 @@ func (x *CronJob) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv8 := &x.ObjectMeta
yyv8.CodecDecodeSelf(d)
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
case "spec":
if r.TryDecodeAsNil() {
x.Spec = CronJobSpec{}
} else {
yyv9 := &x.Spec
yyv9.CodecDecodeSelf(d)
yyv10 := &x.Spec
yyv10.CodecDecodeSelf(d)
}
case "status":
if r.TryDecodeAsNil() {
x.Status = CronJobStatus{}
} else {
yyv10 := &x.Status
yyv10.CodecDecodeSelf(d)
yyv11 := &x.Status
yyv11.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -3201,16 +3291,16 @@ func (x *CronJob) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj11 int
var yyb11 bool
var yyhl11 bool = l >= 0
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
var yyj12 int
var yyb12 bool
var yyhl12 bool = l >= 0
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -3218,21 +3308,21 @@ func (x *CronJob) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Kind = ""
} else {
yyv12 := &x.Kind
yym13 := z.DecBinary()
_ = yym13
yyv13 := &x.Kind
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv12)) = r.DecodeString()
*((*string)(yyv13)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -3240,38 +3330,44 @@ func (x *CronJob) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.APIVersion = ""
} else {
yyv14 := &x.APIVersion
yym15 := z.DecBinary()
_ = yym15
yyv15 := &x.APIVersion
yym16 := z.DecBinary()
_ = yym16
if false {
} else {
*((*string)(yyv14)) = r.DecodeString()
*((*string)(yyv15)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv16 := &x.ObjectMeta
yyv16.CodecDecodeSelf(d)
yyv17 := &x.ObjectMeta
yym18 := z.DecBinary()
_ = yym18
if false {
} else if z.HasExtensions() && z.DecExt(yyv17) {
} else {
z.DecFallback(yyv17, false)
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -3279,16 +3375,16 @@ func (x *CronJob) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Spec = CronJobSpec{}
} else {
yyv17 := &x.Spec
yyv17.CodecDecodeSelf(d)
yyv19 := &x.Spec
yyv19.CodecDecodeSelf(d)
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -3296,21 +3392,21 @@ func (x *CronJob) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Status = CronJobStatus{}
} else {
yyv18 := &x.Status
yyv18.CodecDecodeSelf(d)
yyv20 := &x.Status
yyv20.CodecDecodeSelf(d)
}
for {
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj11-1, "")
z.DecStructFieldNotFound(yyj12-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}
@ -4156,7 +4252,7 @@ func (x *CronJobStatus) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym4
if false {
} else {
h.encSlicev1_ObjectReference(([]pkg2_v1.ObjectReference)(x.Active), e)
h.encSlicev1_ObjectReference(([]pkg3_v1.ObjectReference)(x.Active), e)
}
}
} else {
@ -4174,7 +4270,7 @@ func (x *CronJobStatus) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym5
if false {
} else {
h.encSlicev1_ObjectReference(([]pkg2_v1.ObjectReference)(x.Active), e)
h.encSlicev1_ObjectReference(([]pkg3_v1.ObjectReference)(x.Active), e)
}
}
}
@ -4292,7 +4388,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
_ = yym5
if false {
} else {
h.decSlicev1_ObjectReference((*[]pkg2_v1.ObjectReference)(yyv4), d)
h.decSlicev1_ObjectReference((*[]pkg3_v1.ObjectReference)(yyv4), d)
}
}
case "lastScheduleTime":
@ -4349,7 +4445,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
_ = yym10
if false {
} else {
h.decSlicev1_ObjectReference((*[]pkg2_v1.ObjectReference)(yyv9), d)
h.decSlicev1_ObjectReference((*[]pkg3_v1.ObjectReference)(yyv9), d)
}
}
yyj8++
@ -4438,7 +4534,7 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) {
yyrg1 := len(yyv1) > 0
yyv21 := yyv1
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 832)
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 848)
if yyrt1 {
if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1]
@ -4676,7 +4772,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) {
yyrg1 := len(yyv1) > 0
yyv21 := yyv1
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 1080)
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 1096)
if yyrt1 {
if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1]
@ -4756,7 +4852,7 @@ func (x codecSelfer1234) decSliceCronJob(v *[]CronJob, d *codec1978.Decoder) {
}
}
func (x codecSelfer1234) encSlicev1_ObjectReference(v []pkg2_v1.ObjectReference, e *codec1978.Encoder) {
func (x codecSelfer1234) encSlicev1_ObjectReference(v []pkg3_v1.ObjectReference, e *codec1978.Encoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperEncoder(e)
_, _, _ = h, z, r
@ -4769,7 +4865,7 @@ func (x codecSelfer1234) encSlicev1_ObjectReference(v []pkg2_v1.ObjectReference,
z.EncSendContainerState(codecSelfer_containerArrayEnd1234)
}
func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference, d *codec1978.Decoder) {
func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg3_v1.ObjectReference, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
@ -4780,7 +4876,7 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
_ = yyc1
if yyl1 == 0 {
if yyv1 == nil {
yyv1 = []pkg2_v1.ObjectReference{}
yyv1 = []pkg3_v1.ObjectReference{}
yyc1 = true
} else if len(yyv1) != 0 {
yyv1 = yyv1[:0]
@ -4800,10 +4896,10 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1]
} else {
yyv1 = make([]pkg2_v1.ObjectReference, yyrl1)
yyv1 = make([]pkg3_v1.ObjectReference, yyrl1)
}
} else {
yyv1 = make([]pkg2_v1.ObjectReference, yyrl1)
yyv1 = make([]pkg3_v1.ObjectReference, yyrl1)
}
yyc1 = true
yyrr1 = len(yyv1)
@ -4818,7 +4914,7 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
for ; yyj1 < yyrr1; yyj1++ {
yyh1.ElemContainerState(yyj1)
if r.TryDecodeAsNil() {
yyv1[yyj1] = pkg2_v1.ObjectReference{}
yyv1[yyj1] = pkg3_v1.ObjectReference{}
} else {
yyv2 := &yyv1[yyj1]
yyv2.CodecDecodeSelf(d)
@ -4827,10 +4923,10 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
}
if yyrt1 {
for ; yyj1 < yyl1; yyj1++ {
yyv1 = append(yyv1, pkg2_v1.ObjectReference{})
yyv1 = append(yyv1, pkg3_v1.ObjectReference{})
yyh1.ElemContainerState(yyj1)
if r.TryDecodeAsNil() {
yyv1[yyj1] = pkg2_v1.ObjectReference{}
yyv1[yyj1] = pkg3_v1.ObjectReference{}
} else {
yyv3 := &yyv1[yyj1]
yyv3.CodecDecodeSelf(d)
@ -4844,13 +4940,13 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
for ; !r.CheckBreak(); yyj1++ {
if yyj1 >= len(yyv1) {
yyv1 = append(yyv1, pkg2_v1.ObjectReference{}) // var yyz1 pkg2_v1.ObjectReference
yyv1 = append(yyv1, pkg3_v1.ObjectReference{}) // var yyz1 pkg3_v1.ObjectReference
yyc1 = true
}
yyh1.ElemContainerState(yyj1)
if yyj1 < len(yyv1) {
if r.TryDecodeAsNil() {
yyv1[yyj1] = pkg2_v1.ObjectReference{}
yyv1[yyj1] = pkg3_v1.ObjectReference{}
} else {
yyv4 := &yyv1[yyj1]
yyv4.CodecDecodeSelf(d)
@ -4865,7 +4961,7 @@ func (x codecSelfer1234) decSlicev1_ObjectReference(v *[]pkg2_v1.ObjectReference
yyv1 = yyv1[:yyj1]
yyc1 = true
} else if yyj1 == 0 && yyv1 == nil {
yyv1 = []pkg2_v1.ObjectReference{}
yyv1 = []pkg3_v1.ObjectReference{}
yyc1 = true
}
}

View file

@ -29,7 +29,7 @@ type Job struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -60,7 +60,7 @@ type JobTemplate struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Template defines jobs that will be created from this template
// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -73,7 +73,7 @@ type JobTemplateSpec struct {
// Standard object's metadata of the jobs created from this template.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Specification of the desired behavior of the job.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
@ -202,7 +202,7 @@ type CronJob struct {
// Standard object's metadata.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec is a structure defining the expected behavior of a job, including the schedule.
// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

View file

@ -64,10 +64,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
}
func autoConvert_v2alpha1_CronJob_To_batch_CronJob(in *CronJob, out *batch.CronJob, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2alpha1_CronJobSpec_To_batch_CronJobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -82,10 +79,7 @@ func Convert_v2alpha1_CronJob_To_batch_CronJob(in *CronJob, out *batch.CronJob,
}
func autoConvert_batch_CronJob_To_v2alpha1_CronJob(in *batch.CronJob, out *CronJob, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -190,10 +184,7 @@ func Convert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStat
}
func autoConvert_v2alpha1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2alpha1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -208,10 +199,7 @@ func Convert_v2alpha1_Job_To_batch_Job(in *Job, out *batch.Job, s conversion.Sco
}
func autoConvert_batch_Job_To_v2alpha1_Job(in *batch.Job, out *Job, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_batch_JobSpec_To_v2alpha1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -346,10 +334,7 @@ func Convert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out *Job
}
func autoConvert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *JobTemplate, out *batch.JobTemplate, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err
}
@ -361,10 +346,7 @@ func Convert_v2alpha1_JobTemplate_To_batch_JobTemplate(in *JobTemplate, out *bat
}
func autoConvert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, out *JobTemplate, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err
}
@ -376,10 +358,7 @@ func Convert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, ou
}
func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2alpha1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -391,10 +370,7 @@ func Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *JobTemplateSp
}
func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *JobTemplateSpec, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_batch_JobSpec_To_v2alpha1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}

View file

@ -21,10 +21,10 @@ limitations under the License.
package v2alpha1
import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
v1 "k8s.io/kubernetes/pkg/api/v1"
api_v1 "k8s.io/kubernetes/pkg/api/v1"
reflect "reflect"
)
@ -55,8 +55,10 @@ func DeepCopy_v2alpha1_CronJob(in interface{}, out interface{}, c *conversion.Cl
in := in.(*CronJob)
out := out.(*CronJob)
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v2alpha1_CronJobSpec(&in.Spec, &out.Spec, c); err != nil {
return err
@ -115,14 +117,12 @@ func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *convers
*out = *in
if in.Active != nil {
in, out := &in.Active, &out.Active
*out = make([]v1.ObjectReference, len(*in))
for i := range *in {
(*out)[i] = (*in)[i]
}
*out = make([]api_v1.ObjectReference, len(*in))
copy(*out, *in)
}
if in.LastScheduleTime != nil {
in, out := &in.LastScheduleTime, &out.LastScheduleTime
*out = new(meta_v1.Time)
*out = new(v1.Time)
**out = (*in).DeepCopy()
}
return nil
@ -134,8 +134,10 @@ func DeepCopy_v2alpha1_Job(in interface{}, out interface{}, c *conversion.Cloner
in := in.(*Job)
out := out.(*Job)
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
return err
@ -201,7 +203,7 @@ func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cl
if newVal, err := c.DeepCopy(*in); err != nil {
return err
} else {
*out = newVal.(*meta_v1.LabelSelector)
*out = newVal.(*v1.LabelSelector)
}
}
if in.ManualSelector != nil {
@ -209,7 +211,7 @@ func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cl
*out = new(bool)
**out = **in
}
if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
if err := api_v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil {
return err
}
return nil
@ -232,12 +234,12 @@ func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion.
}
if in.StartTime != nil {
in, out := &in.StartTime, &out.StartTime
*out = new(meta_v1.Time)
*out = new(v1.Time)
**out = (*in).DeepCopy()
}
if in.CompletionTime != nil {
in, out := &in.CompletionTime, &out.CompletionTime
*out = new(meta_v1.Time)
*out = new(v1.Time)
**out = (*in).DeepCopy()
}
return nil
@ -249,8 +251,10 @@ func DeepCopy_v2alpha1_JobTemplate(in interface{}, out interface{}, c *conversio
in := in.(*JobTemplate)
out := out.(*JobTemplate)
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, c); err != nil {
return err
@ -264,8 +268,10 @@ func DeepCopy_v2alpha1_JobTemplateSpec(in interface{}, out interface{}, c *conve
in := in.(*JobTemplateSpec)
out := out.(*JobTemplateSpec)
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil {
return err

View file

@ -34,13 +34,13 @@ func getValidManualSelector() *metav1.LabelSelector {
func getValidPodTemplateSpecForManual(selector *metav1.LabelSelector) api.PodTemplateSpec {
return api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: selector.MatchLabels,
},
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyOnFailure,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
}
}
@ -53,13 +53,13 @@ func getValidGeneratedSelector() *metav1.LabelSelector {
func getValidPodTemplateSpecForGenerated(selector *metav1.LabelSelector) api.PodTemplateSpec {
return api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: selector.MatchLabels,
},
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyOnFailure,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
}
}
@ -72,9 +72,9 @@ func TestValidateJob(t *testing.T) {
successCases := map[string]batch.Job{
"manual selector": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -84,9 +84,9 @@ func TestValidateJob(t *testing.T) {
},
},
"generated selector": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -104,9 +104,9 @@ func TestValidateJob(t *testing.T) {
negative64 := int64(-1)
errorCases := map[string]batch.Job{
"spec.parallelism:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -116,9 +116,9 @@ func TestValidateJob(t *testing.T) {
},
},
"spec.completions:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -128,9 +128,9 @@ func TestValidateJob(t *testing.T) {
},
},
"spec.activeDeadlineSeconds:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -140,9 +140,9 @@ func TestValidateJob(t *testing.T) {
},
},
"spec.selector:Required value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
@ -150,64 +150,64 @@ func TestValidateJob(t *testing.T) {
},
},
"spec.template.metadata.labels: Invalid value: {\"y\":\"z\"}: `selector` does not match template `labels`": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
Selector: validManualSelector,
ManualSelector: newBool(true),
Template: api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"y": "z"},
},
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyOnFailure,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
},
},
},
"spec.template.metadata.labels: Invalid value: {\"controller-uid\":\"4d5e6f\"}: `selector` does not match template `labels`": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
Selector: validManualSelector,
ManualSelector: newBool(true),
Template: api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{"controller-uid": "4d5e6f"},
},
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyOnFailure,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
},
},
},
"spec.template.spec.restartPolicy: Unsupported value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
Selector: validManualSelector,
ManualSelector: newBool(true),
Template: api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Labels: validManualSelector.MatchLabels,
},
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyAlways,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
},
},
@ -237,7 +237,7 @@ func TestValidateJobUpdateStatus(t *testing.T) {
successCases := []testcase{
{
old: batch.Job{
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
Status: batch.JobStatus{
Active: 1,
Succeeded: 2,
@ -245,7 +245,7 @@ func TestValidateJobUpdateStatus(t *testing.T) {
},
},
update: batch.Job{
ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault},
ObjectMeta: metav1.ObjectMeta{Name: "abc", Namespace: metav1.NamespaceDefault},
Status: batch.JobStatus{
Active: 1,
Succeeded: 1,
@ -266,9 +266,9 @@ func TestValidateJobUpdateStatus(t *testing.T) {
errorCases := map[string]testcase{
"[status.active: Invalid value: -1: must be greater than or equal to 0, status.succeeded: Invalid value: -2: must be greater than or equal to 0]": {
old: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "abc",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
ResourceVersion: "10",
},
Status: batch.JobStatus{
@ -278,9 +278,9 @@ func TestValidateJobUpdateStatus(t *testing.T) {
},
},
update: batch.Job{
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "abc",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
ResourceVersion: "10",
},
Status: batch.JobStatus{
@ -311,9 +311,9 @@ func TestValidateCronJob(t *testing.T) {
successCases := map[string]batch.CronJob{
"basic scheduled job": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -327,9 +327,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"non-standard scheduled": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -354,9 +354,9 @@ func TestValidateCronJob(t *testing.T) {
errorCases := map[string]batch.CronJob{
"spec.schedule: Invalid value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -370,9 +370,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.schedule: Required value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -386,9 +386,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.startingDeadlineSeconds:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -403,9 +403,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.concurrencyPolicy: Required value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -418,9 +418,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.parallelism:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -435,9 +435,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.completions:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -453,9 +453,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.activeDeadlineSeconds:must be greater than or equal to 0": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -470,9 +470,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.selector: Invalid value: {\"matchLabels\":{\"a\":\"b\"}}: `selector` will be auto-generated": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -487,9 +487,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.manualSelector: Unsupported value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -504,9 +504,9 @@ func TestValidateCronJob(t *testing.T) {
},
},
"spec.jobTemplate.spec.template.spec.restartPolicy: Unsupported value": {
ObjectMeta: api.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "mycronjob",
Namespace: api.NamespaceDefault,
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.CronJobSpec{
@ -518,7 +518,7 @@ func TestValidateCronJob(t *testing.T) {
Spec: api.PodSpec{
RestartPolicy: api.RestartPolicyAlways,
DNSPolicy: api.DNSClusterFirst,
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}},
Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: api.TerminationMessageReadFile}},
},
},
},

View file

@ -55,8 +55,10 @@ func DeepCopy_batch_CronJob(in interface{}, out interface{}, c *conversion.Clone
in := in.(*CronJob)
out := out.(*CronJob)
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_batch_CronJobSpec(&in.Spec, &out.Spec, c); err != nil {
return err
@ -116,9 +118,7 @@ func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion
if in.Active != nil {
in, out := &in.Active, &out.Active
*out = make([]api.ObjectReference, len(*in))
for i := range *in {
(*out)[i] = (*in)[i]
}
copy(*out, *in)
}
if in.LastScheduleTime != nil {
in, out := &in.LastScheduleTime, &out.LastScheduleTime
@ -134,8 +134,10 @@ func DeepCopy_batch_Job(in interface{}, out interface{}, c *conversion.Cloner) e
in := in.(*Job)
out := out.(*Job)
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil {
return err
@ -249,8 +251,10 @@ func DeepCopy_batch_JobTemplate(in interface{}, out interface{}, c *conversion.C
in := in.(*JobTemplate)
out := out.(*JobTemplate)
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_batch_JobTemplateSpec(&in.Template, &out.Template, c); err != nil {
return err
@ -264,8 +268,10 @@ func DeepCopy_batch_JobTemplateSpec(in interface{}, out interface{}, c *conversi
in := in.(*JobTemplateSpec)
out := out.(*JobTemplateSpec)
*out = *in
if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil {
return err