From e1aa8835d9d9a4fd0776b3675feea7a222eeb960 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Mon, 23 May 2016 23:10:59 +0200 Subject: [PATCH] Generated changes to suspend becoming pointer for ScheduledJob --- pkg/apis/batch/deep_copy_generated.go | 8 +- pkg/apis/batch/types.generated.go | 142 +++++++++++------- .../batch/v2alpha1/deep_copy_generated.go | 8 +- pkg/apis/batch/v2alpha1/generated.pb.go | 23 +-- pkg/apis/batch/v2alpha1/generated.proto | 1 - pkg/apis/batch/v2alpha1/types.generated.go | 142 +++++++++++------- 6 files changed, 200 insertions(+), 124 deletions(-) diff --git a/pkg/apis/batch/deep_copy_generated.go b/pkg/apis/batch/deep_copy_generated.go index 31737e07b35..6e08ec41091 100644 --- a/pkg/apis/batch/deep_copy_generated.go +++ b/pkg/apis/batch/deep_copy_generated.go @@ -246,7 +246,13 @@ func DeepCopy_batch_ScheduledJobSpec(in ScheduledJobSpec, out *ScheduledJobSpec, out.StartingDeadlineSeconds = nil } out.ConcurrencyPolicy = in.ConcurrencyPolicy - out.Suspend = in.Suspend + if in.Suspend != nil { + in, out := in.Suspend, &out.Suspend + *out = new(bool) + **out = *in + } else { + out.Suspend = nil + } if err := DeepCopy_batch_JobTemplateSpec(in.JobTemplate, &out.JobTemplate, c); err != nil { return err } diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 68605cc67ad..14c44a0f828 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -3602,33 +3602,43 @@ func (x *ScheduledJobSpec) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym15 := z.EncBinary() - _ = yym15 - if false { + if x.Suspend == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Suspend)) + yy15 := *x.Suspend + yym16 := z.EncBinary() + _ = yym16 + if false { + } else { + r.EncodeBool(bool(yy15)) + } } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("suspend")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym16 := z.EncBinary() - _ = yym16 - if false { + if x.Suspend == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Suspend)) + yy17 := *x.Suspend + yym18 := z.EncBinary() + _ = yym18 + if false { + } else { + r.EncodeBool(bool(yy17)) + } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy18 := &x.JobTemplate - yy18.CodecEncodeSelf(e) + yy20 := &x.JobTemplate + yy20.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("jobTemplate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy20 := &x.JobTemplate - yy20.CodecEncodeSelf(e) + yy22 := &x.JobTemplate + yy22.CodecEncodeSelf(e) } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) @@ -3721,16 +3731,26 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "suspend": if r.TryDecodeAsNil() { - x.Suspend = false + if x.Suspend != nil { + x.Suspend = nil + } } else { - x.Suspend = bool(r.DecodeBool()) + if x.Suspend == nil { + x.Suspend = new(bool) + } + yym9 := z.DecBinary() + _ = yym9 + if false { + } else { + *((*bool)(x.Suspend)) = r.DecodeBool() + } } case "jobTemplate": if r.TryDecodeAsNil() { x.JobTemplate = JobTemplateSpec{} } else { - yyv9 := &x.JobTemplate - yyv9.CodecDecodeSelf(d) + yyv10 := &x.JobTemplate + yyv10.CodecDecodeSelf(d) } default: z.DecStructFieldNotFound(-1, yys3) @@ -3743,16 +3763,16 @@ func (x *ScheduledJobSpec) 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 } @@ -3762,13 +3782,13 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Schedule = string(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 } @@ -3781,20 +3801,20 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.StartingDeadlineSeconds == nil { x.StartingDeadlineSeconds = new(int64) } - yym13 := z.DecBinary() - _ = yym13 + yym14 := z.DecBinary() + _ = yym14 if false { } else { *((*int64)(x.StartingDeadlineSeconds)) = int64(r.DecodeInt(64)) } } - 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 } @@ -3804,29 +3824,39 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ConcurrencyPolicy = ConcurrencyPolicy(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.Suspend = false + if x.Suspend != nil { + x.Suspend = nil + } } else { - x.Suspend = bool(r.DecodeBool()) + if x.Suspend == nil { + x.Suspend = new(bool) + } + yym17 := z.DecBinary() + _ = yym17 + if false { + } else { + *((*bool)(x.Suspend)) = r.DecodeBool() + } } - 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 } @@ -3834,21 +3864,21 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.JobTemplate = JobTemplateSpec{} } else { - yyv16 := &x.JobTemplate - yyv16.CodecDecodeSelf(d) + yyv18 := &x.JobTemplate + 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) } diff --git a/pkg/apis/batch/v2alpha1/deep_copy_generated.go b/pkg/apis/batch/v2alpha1/deep_copy_generated.go index 8e0eb343a5e..92cb71ea080 100644 --- a/pkg/apis/batch/v2alpha1/deep_copy_generated.go +++ b/pkg/apis/batch/v2alpha1/deep_copy_generated.go @@ -286,7 +286,13 @@ func DeepCopy_v2alpha1_ScheduledJobSpec(in ScheduledJobSpec, out *ScheduledJobSp out.StartingDeadlineSeconds = nil } out.ConcurrencyPolicy = in.ConcurrencyPolicy - out.Suspend = in.Suspend + if in.Suspend != nil { + in, out := in.Suspend, &out.Suspend + *out = new(bool) + **out = *in + } else { + out.Suspend = nil + } if err := DeepCopy_v2alpha1_JobTemplateSpec(in.JobTemplate, &out.JobTemplate, c); err != nil { return err } diff --git a/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index a642fa691c7..17192c01c48 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/pkg/apis/batch/v2alpha1/generated.pb.go @@ -636,14 +636,16 @@ func (m *ScheduledJobSpec) MarshalTo(data []byte) (int, error) { i++ i = encodeVarintGenerated(data, i, uint64(len(m.ConcurrencyPolicy))) i += copy(data[i:], m.ConcurrencyPolicy) - data[i] = 0x20 - i++ - if m.Suspend { - data[i] = 1 - } else { - data[i] = 0 + if m.Suspend != nil { + data[i] = 0x20 + i++ + if *m.Suspend { + data[i] = 1 + } else { + data[i] = 0 + } + i++ } - i++ data[i] = 0x2a i++ i = encodeVarintGenerated(data, i, uint64(m.JobTemplate.Size())) @@ -905,7 +907,9 @@ func (m *ScheduledJobSpec) Size() (n int) { } l = len(m.ConcurrencyPolicy) n += 1 + l + sovGenerated(uint64(l)) - n += 2 + if m.Suspend != nil { + n += 2 + } l = m.JobTemplate.Size() n += 1 + l + sovGenerated(uint64(l)) return n @@ -2741,7 +2745,8 @@ func (m *ScheduledJobSpec) Unmarshal(data []byte) error { break } } - m.Suspend = bool(v != 0) + b := bool(v != 0) + m.Suspend = &b case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field JobTemplate", wireType) diff --git a/pkg/apis/batch/v2alpha1/generated.proto b/pkg/apis/batch/v2alpha1/generated.proto index 816045a732c..7780bef31f9 100644 --- a/pkg/apis/batch/v2alpha1/generated.proto +++ b/pkg/apis/batch/v2alpha1/generated.proto @@ -24,7 +24,6 @@ package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; -import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 7b64c81d248..341d1d217a1 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -3578,33 +3578,43 @@ func (x *ScheduledJobSpec) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym15 := z.EncBinary() - _ = yym15 - if false { + if x.Suspend == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Suspend)) + yy15 := *x.Suspend + yym16 := z.EncBinary() + _ = yym16 + if false { + } else { + r.EncodeBool(bool(yy15)) + } } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("suspend")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym16 := z.EncBinary() - _ = yym16 - if false { + if x.Suspend == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Suspend)) + yy17 := *x.Suspend + yym18 := z.EncBinary() + _ = yym18 + if false { + } else { + r.EncodeBool(bool(yy17)) + } } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy18 := &x.JobTemplate - yy18.CodecEncodeSelf(e) + yy20 := &x.JobTemplate + yy20.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("jobTemplate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy20 := &x.JobTemplate - yy20.CodecEncodeSelf(e) + yy22 := &x.JobTemplate + yy22.CodecEncodeSelf(e) } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) @@ -3697,16 +3707,26 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "suspend": if r.TryDecodeAsNil() { - x.Suspend = false + if x.Suspend != nil { + x.Suspend = nil + } } else { - x.Suspend = bool(r.DecodeBool()) + if x.Suspend == nil { + x.Suspend = new(bool) + } + yym9 := z.DecBinary() + _ = yym9 + if false { + } else { + *((*bool)(x.Suspend)) = r.DecodeBool() + } } case "jobTemplate": if r.TryDecodeAsNil() { x.JobTemplate = JobTemplateSpec{} } else { - yyv9 := &x.JobTemplate - yyv9.CodecDecodeSelf(d) + yyv10 := &x.JobTemplate + yyv10.CodecDecodeSelf(d) } default: z.DecStructFieldNotFound(-1, yys3) @@ -3719,16 +3739,16 @@ func (x *ScheduledJobSpec) 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 } @@ -3738,13 +3758,13 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Schedule = string(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 } @@ -3757,20 +3777,20 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.StartingDeadlineSeconds == nil { x.StartingDeadlineSeconds = new(int64) } - yym13 := z.DecBinary() - _ = yym13 + yym14 := z.DecBinary() + _ = yym14 if false { } else { *((*int64)(x.StartingDeadlineSeconds)) = int64(r.DecodeInt(64)) } } - 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 } @@ -3780,29 +3800,39 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ConcurrencyPolicy = ConcurrencyPolicy(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.Suspend = false + if x.Suspend != nil { + x.Suspend = nil + } } else { - x.Suspend = bool(r.DecodeBool()) + if x.Suspend == nil { + x.Suspend = new(bool) + } + yym17 := z.DecBinary() + _ = yym17 + if false { + } else { + *((*bool)(x.Suspend)) = r.DecodeBool() + } } - 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 } @@ -3810,21 +3840,21 @@ func (x *ScheduledJobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.JobTemplate = JobTemplateSpec{} } else { - yyv16 := &x.JobTemplate - yyv16.CodecDecodeSelf(d) + yyv18 := &x.JobTemplate + 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) }