From 2098cc26398f2cbd7dce94a4f359c0595894a2db Mon Sep 17 00:00:00 2001 From: Di Xu Date: Wed, 26 Jul 2017 10:53:45 +0800 Subject: [PATCH 1/2] change the StatefulSet observedGeneration from a pointer to an int for consistency --- pkg/api/testing/fuzzer.go | 3 +++ pkg/apis/apps/v1beta2/conversion.go | 27 ++++++++++++++++++++ staging/src/k8s.io/api/apps/v1beta2/types.go | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 305131b3a53..8ec590deb98 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -731,6 +731,9 @@ func appsFuncs(codecs runtimeserializer.CodecFactory) []interface{} { s.Spec.RevisionHistoryLimit = new(int32) *s.Spec.RevisionHistoryLimit = 10 } + if s.Status.ObservedGeneration == nil { + s.Status.ObservedGeneration = new(int64) + } }, } } diff --git a/pkg/apis/apps/v1beta2/conversion.go b/pkg/apis/apps/v1beta2/conversion.go index 44bfc751102..7fc32b3ccb4 100644 --- a/pkg/apis/apps/v1beta2/conversion.go +++ b/pkg/apis/apps/v1beta2/conversion.go @@ -43,6 +43,8 @@ func addConversionFuncs(scheme *runtime.Scheme) error { Convert_apps_StatefulSetUpdateStrategy_To_v1beta2_StatefulSetUpdateStrategy, Convert_extensions_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet, Convert_v1beta2_RollingUpdateDaemonSet_To_extensions_RollingUpdateDaemonSet, + Convert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus, + Convert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus, // extensions // TODO: below conversions should be dropped in favor of auto-generated // ones, see https://github.com/kubernetes/kubernetes/issues/39865 @@ -223,6 +225,31 @@ func Convert_apps_StatefulSetUpdateStrategy_To_v1beta2_StatefulSetUpdateStrategy return nil } +func Convert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *appsv1beta2.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error { + out.ObservedGeneration = new(int64) + *out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.ReadyReplicas = in.ReadyReplicas + out.CurrentReplicas = in.CurrentReplicas + out.UpdatedReplicas = in.UpdatedReplicas + out.CurrentRevision = in.CurrentRevision + out.UpdateRevision = in.UpdateRevision + return nil +} + +func Convert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.StatefulSetStatus, out *appsv1beta2.StatefulSetStatus, s conversion.Scope) error { + if in.ObservedGeneration != nil { + out.ObservedGeneration = *in.ObservedGeneration + } + out.Replicas = in.Replicas + out.ReadyReplicas = in.ReadyReplicas + out.CurrentReplicas = in.CurrentReplicas + out.UpdatedReplicas = in.UpdatedReplicas + out.CurrentRevision = in.CurrentRevision + out.UpdateRevision = in.UpdateRevision + return nil +} + func Convert_extensions_ScaleStatus_To_v1beta2_ScaleStatus(in *extensions.ScaleStatus, out *appsv1beta2.ScaleStatus, s conversion.Scope) error { out.Replicas = int32(in.Replicas) diff --git a/staging/src/k8s.io/api/apps/v1beta2/types.go b/staging/src/k8s.io/api/apps/v1beta2/types.go index 417f996cb67..6bc333f4ef0 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/types.go +++ b/staging/src/k8s.io/api/apps/v1beta2/types.go @@ -225,7 +225,7 @@ type StatefulSetStatus struct { // observedGeneration is the most recent generation observed for this StatefulSet. It corresponds to the // StatefulSet's generation, which is updated on mutation by the API Server. // +optional - ObservedGeneration *int64 `json:"observedGeneration,omitempty" protobuf:"varint,1,opt,name=observedGeneration"` + ObservedGeneration int64 `json:"observedGeneration,omitempty" protobuf:"varint,1,opt,name=observedGeneration"` // replicas is the number of Pods created by the StatefulSet controller. Replicas int32 `json:"replicas" protobuf:"varint,2,opt,name=replicas"` From 92779979e873c9afdca0b859e400ba85dc5b0e13 Mon Sep 17 00:00:00 2001 From: Di Xu Date: Sat, 29 Jul 2017 04:32:46 +0000 Subject: [PATCH 2/2] auto-gen --- .../apps/v1beta2/zz_generated.conversion.go | 14 +- .../k8s.io/api/apps/v1beta2/generated.pb.go | 289 +++++++++--------- .../api/apps/v1beta2/zz_generated.deepcopy.go | 11 +- 3 files changed, 145 insertions(+), 169 deletions(-) diff --git a/pkg/apis/apps/v1beta2/zz_generated.conversion.go b/pkg/apis/apps/v1beta2/zz_generated.conversion.go index 48b185a5ff1..7bda17f45d6 100644 --- a/pkg/apis/apps/v1beta2/zz_generated.conversion.go +++ b/pkg/apis/apps/v1beta2/zz_generated.conversion.go @@ -190,7 +190,7 @@ func autoConvert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.Statef } func autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error { - out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) + // WARNING: in.ObservedGeneration requires manual conversion: inconvertible types (int64 vs *int64) out.Replicas = in.Replicas out.ReadyReplicas = in.ReadyReplicas out.CurrentReplicas = in.CurrentReplicas @@ -200,13 +200,8 @@ func autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2 return nil } -// Convert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus is an autogenerated conversion function. -func Convert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error { - return autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in, out, s) -} - func autoConvert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1beta2.StatefulSetStatus, s conversion.Scope) error { - out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) + // WARNING: in.ObservedGeneration requires manual conversion: inconvertible types (*int64 vs int64) out.Replicas = in.Replicas out.ReadyReplicas = in.ReadyReplicas out.CurrentReplicas = in.CurrentReplicas @@ -216,11 +211,6 @@ func autoConvert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.St return nil } -// Convert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus is an autogenerated conversion function. -func Convert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1beta2.StatefulSetStatus, s conversion.Scope) error { - return autoConvert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in, out, s) -} - func autoConvert_v1beta2_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy(in *v1beta2.StatefulSetUpdateStrategy, out *apps.StatefulSetUpdateStrategy, s conversion.Scope) error { out.Type = apps.StatefulSetUpdateStrategyType(in.Type) if in.RollingUpdate != nil { diff --git a/staging/src/k8s.io/api/apps/v1beta2/generated.pb.go b/staging/src/k8s.io/api/apps/v1beta2/generated.pb.go index be10f524c27..a6550b091a5 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/generated.pb.go +++ b/staging/src/k8s.io/api/apps/v1beta2/generated.pb.go @@ -1399,11 +1399,9 @@ func (m *StatefulSetStatus) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.ObservedGeneration != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintGenerated(dAtA, i, uint64(*m.ObservedGeneration)) - } + dAtA[i] = 0x8 + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.ObservedGeneration)) dAtA[i] = 0x10 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Replicas)) @@ -1894,9 +1892,7 @@ func (m *StatefulSetSpec) Size() (n int) { func (m *StatefulSetStatus) Size() (n int) { var l int _ = l - if m.ObservedGeneration != nil { - n += 1 + sovGenerated(uint64(*m.ObservedGeneration)) - } + n += 1 + sovGenerated(uint64(m.ObservedGeneration)) n += 1 + sovGenerated(uint64(m.Replicas)) n += 1 + sovGenerated(uint64(m.ReadyReplicas)) n += 1 + sovGenerated(uint64(m.CurrentReplicas)) @@ -2301,7 +2297,7 @@ func (this *StatefulSetStatus) String() string { return "nil" } s := strings.Join([]string{`&StatefulSetStatus{`, - `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, + `ObservedGeneration:` + fmt.Sprintf("%v", this.ObservedGeneration) + `,`, `Replicas:` + fmt.Sprintf("%v", this.Replicas) + `,`, `ReadyReplicas:` + fmt.Sprintf("%v", this.ReadyReplicas) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, @@ -6513,7 +6509,7 @@ func (m *StatefulSetStatus) Unmarshal(dAtA []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ObservedGeneration", wireType) } - var v int64 + m.ObservedGeneration = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -6523,12 +6519,11 @@ func (m *StatefulSetStatus) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int64(b) & 0x7F) << shift + m.ObservedGeneration |= (int64(b) & 0x7F) << shift if b < 0x80 { break } } - m.ObservedGeneration = &v case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Replicas", wireType) @@ -6906,142 +6901,142 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2183 bytes of a gzipped FileDescriptorProto + // 2178 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0x5b, 0x6f, 0x1b, 0xc7, - 0x15, 0xd6, 0xf2, 0x22, 0x91, 0xa3, 0x88, 0xb2, 0x47, 0xaa, 0xc4, 0x28, 0x2d, 0x25, 0x30, 0x81, - 0x2d, 0xc7, 0xf1, 0xd2, 0x56, 0x2e, 0x48, 0x6c, 0x20, 0xad, 0x28, 0x25, 0xb6, 0x03, 0x49, 0x56, + 0x15, 0xd6, 0xf2, 0x22, 0x91, 0xa3, 0x88, 0xb2, 0x47, 0xaa, 0xc4, 0xc8, 0x2d, 0x25, 0x30, 0x81, + 0x2d, 0xc7, 0xf1, 0xd2, 0x56, 0x2e, 0x48, 0x6c, 0x20, 0xad, 0x28, 0xa5, 0xb6, 0x03, 0x49, 0x56, 0x86, 0x92, 0x8b, 0xa6, 0x2d, 0xe0, 0x21, 0x39, 0xa6, 0x36, 0xda, 0x1b, 0xf6, 0x42, 0x84, 0xe8, 0x4b, 0x9f, 0x0a, 0x14, 0x28, 0x90, 0x3c, 0xf7, 0x4f, 0xb4, 0x4f, 0x45, 0xd1, 0xbe, 0x15, 0x45, - 0xe1, 0x97, 0xa2, 0x41, 0x5f, 0x9a, 0x27, 0xa1, 0x66, 0x1e, 0xdb, 0x5f, 0x10, 0xa0, 0x40, 0x31, - 0xb3, 0xb3, 0x97, 0xd9, 0x8b, 0xb4, 0x54, 0x2d, 0xa1, 0xc8, 0x9b, 0x38, 0xe7, 0x3b, 0xdf, 0x9c, - 0x9d, 0x39, 0x73, 0xce, 0xb7, 0xb3, 0x02, 0x3f, 0x38, 0x7e, 0xd7, 0x96, 0x15, 0xa3, 0x75, 0xec, - 0x76, 0x89, 0xa5, 0x13, 0x87, 0xd8, 0xad, 0x21, 0xd1, 0xfb, 0x86, 0xd5, 0xe2, 0x06, 0x6c, 0x2a, - 0x2d, 0x6c, 0x9a, 0x76, 0x6b, 0x78, 0xa7, 0x4b, 0x1c, 0xbc, 0xd1, 0x1a, 0x10, 0x9d, 0x58, 0xd8, - 0x21, 0x7d, 0xd9, 0xb4, 0x0c, 0xc7, 0x80, 0xcb, 0x1e, 0x50, 0xc6, 0xa6, 0x22, 0x53, 0xa0, 0xcc, - 0x81, 0x2b, 0xb7, 0x06, 0x8a, 0x73, 0xe4, 0x76, 0xe5, 0x9e, 0xa1, 0xb5, 0x06, 0xc6, 0xc0, 0x68, - 0x31, 0x7c, 0xd7, 0x7d, 0xca, 0x7e, 0xb1, 0x1f, 0xec, 0x2f, 0x8f, 0x67, 0xa5, 0x19, 0x99, 0xb0, - 0x67, 0x58, 0xa4, 0x35, 0xbc, 0x13, 0x9f, 0x6b, 0xe5, 0x46, 0x04, 0x63, 0x1a, 0xaa, 0xd2, 0x1b, - 0xf1, 0xb0, 0x92, 0xd0, 0xb7, 0x42, 0xa8, 0x86, 0x7b, 0x47, 0x8a, 0x4e, 0xac, 0x51, 0xcb, 0x3c, - 0x1e, 0xd0, 0x01, 0xbb, 0xa5, 0x11, 0x07, 0xa7, 0x4d, 0xd0, 0xca, 0xf2, 0xb2, 0x5c, 0xdd, 0x51, - 0x34, 0x92, 0x70, 0x78, 0xe7, 0x2c, 0x07, 0xbb, 0x77, 0x44, 0x34, 0x9c, 0xf0, 0x7b, 0x33, 0xcb, - 0xcf, 0x75, 0x14, 0xb5, 0xa5, 0xe8, 0x8e, 0xed, 0x58, 0x71, 0xa7, 0xe6, 0x2f, 0x0b, 0xa0, 0xba, - 0x8d, 0x89, 0x66, 0xe8, 0x1d, 0xe2, 0xc0, 0x27, 0xa0, 0x42, 0x1f, 0xa3, 0x8f, 0x1d, 0x5c, 0x97, - 0xd6, 0xa4, 0xf5, 0xd9, 0x8d, 0xdb, 0x72, 0xb8, 0x17, 0x01, 0xab, 0x6c, 0x1e, 0x0f, 0xe8, 0x80, - 0x2d, 0x53, 0xb4, 0x3c, 0xbc, 0x23, 0x3f, 0xea, 0x7e, 0x4a, 0x7a, 0xce, 0x2e, 0x71, 0x70, 0x1b, - 0x3e, 0x3b, 0x59, 0x9d, 0x1a, 0x9f, 0xac, 0x82, 0x70, 0x0c, 0x05, 0xac, 0xf0, 0x01, 0x28, 0xd9, - 0x26, 0xe9, 0xd5, 0x0b, 0x8c, 0xfd, 0x9a, 0x9c, 0xb1, 0xd3, 0x72, 0x10, 0x53, 0xc7, 0x24, 0xbd, - 0xf6, 0x4b, 0x9c, 0xb3, 0x44, 0x7f, 0x21, 0xc6, 0x00, 0xf7, 0xc1, 0xb4, 0xed, 0x60, 0xc7, 0xb5, - 0xeb, 0x45, 0xc6, 0xb5, 0x9e, 0x83, 0x8b, 0xe1, 0xdb, 0x35, 0xce, 0x36, 0xed, 0xfd, 0x46, 0x9c, - 0xa7, 0xf9, 0x3b, 0x09, 0xcc, 0x05, 0xd8, 0x1d, 0xc5, 0x76, 0xe0, 0x4f, 0x12, 0xeb, 0x21, 0xe7, - 0x5b, 0x0f, 0xea, 0xcd, 0x56, 0xe3, 0x0a, 0x9f, 0xab, 0xe2, 0x8f, 0x44, 0xd6, 0xe2, 0x3e, 0x28, - 0x2b, 0x0e, 0xd1, 0xec, 0x7a, 0x61, 0xad, 0xb8, 0x3e, 0xbb, 0xd1, 0x3c, 0xfb, 0x01, 0xda, 0x73, - 0x9c, 0xae, 0xfc, 0x90, 0x3a, 0x22, 0xcf, 0xbf, 0xf9, 0x45, 0x29, 0x12, 0x38, 0x5d, 0x22, 0xf8, - 0x53, 0x50, 0xb1, 0x89, 0x4a, 0x7a, 0x8e, 0x61, 0xf1, 0xc0, 0xdf, 0xcc, 0x19, 0x38, 0xee, 0x12, - 0xb5, 0xc3, 0x5d, 0xdb, 0x2f, 0xd1, 0xc8, 0xfd, 0x5f, 0x28, 0xa0, 0x84, 0x1f, 0x83, 0x8a, 0x43, - 0x34, 0x53, 0xc5, 0x0e, 0xe1, 0x3b, 0xf9, 0x6a, 0x34, 0x78, 0x7a, 0xd6, 0x28, 0xd9, 0xbe, 0xd1, - 0x3f, 0xe0, 0x30, 0xb6, 0x8d, 0xc1, 0x62, 0xf8, 0xa3, 0x28, 0xa0, 0x81, 0x26, 0xa8, 0xb9, 0x66, - 0x9f, 0x22, 0x1d, 0x9a, 0x9f, 0x83, 0x11, 0xdf, 0xd6, 0xdb, 0x67, 0xaf, 0xca, 0xa1, 0xe0, 0xd7, - 0x5e, 0xe2, 0xb3, 0xd4, 0xc4, 0x71, 0x14, 0xe3, 0x87, 0x9b, 0x60, 0x5e, 0x53, 0x74, 0x44, 0x70, - 0x7f, 0xd4, 0x21, 0x3d, 0x43, 0xef, 0xdb, 0xf5, 0xd2, 0x9a, 0xb4, 0x5e, 0x6e, 0x2f, 0x73, 0x82, - 0xf9, 0x5d, 0xd1, 0x8c, 0xe2, 0x78, 0xf8, 0x11, 0x80, 0xfe, 0x03, 0xdc, 0xf7, 0x0e, 0x96, 0x62, - 0xe8, 0xf5, 0xf2, 0x9a, 0xb4, 0x5e, 0x6c, 0xaf, 0x70, 0x16, 0x78, 0x90, 0x40, 0xa0, 0x14, 0x2f, - 0xb8, 0x03, 0x16, 0x2d, 0x32, 0x54, 0x6c, 0xc5, 0xd0, 0x1f, 0x28, 0xb6, 0x63, 0x58, 0xa3, 0x1d, - 0x45, 0x53, 0x9c, 0xfa, 0x34, 0x8b, 0xa9, 0x3e, 0x3e, 0x59, 0x5d, 0x44, 0x29, 0x76, 0x94, 0xea, - 0xd5, 0xfc, 0x6d, 0x19, 0xcc, 0xc7, 0xf2, 0x1e, 0x3e, 0x06, 0x4b, 0x3d, 0xd7, 0xb2, 0x88, 0xee, - 0xec, 0xb9, 0x5a, 0x97, 0x58, 0x9d, 0xde, 0x11, 0xe9, 0xbb, 0x2a, 0xe9, 0xb3, 0x14, 0x29, 0xb7, - 0x1b, 0x3c, 0xe2, 0xa5, 0xad, 0x54, 0x14, 0xca, 0xf0, 0xa6, 0xab, 0xa0, 0xb3, 0xa1, 0x5d, 0xc5, - 0xb6, 0x03, 0xce, 0x02, 0xe3, 0x0c, 0x56, 0x61, 0x2f, 0x81, 0x40, 0x29, 0x5e, 0x34, 0xc6, 0x3e, - 0xb1, 0x15, 0x8b, 0xf4, 0xe3, 0x31, 0x16, 0xc5, 0x18, 0xb7, 0x53, 0x51, 0x28, 0xc3, 0x1b, 0xbe, - 0x0d, 0x66, 0xbd, 0xd9, 0xd8, 0xfe, 0xf1, 0x8d, 0x5e, 0xe0, 0x64, 0xb3, 0x7b, 0xa1, 0x09, 0x45, - 0x71, 0xf4, 0xd1, 0x8c, 0xae, 0x4d, 0xac, 0x21, 0xe9, 0x67, 0x6f, 0xf0, 0xa3, 0x04, 0x02, 0xa5, - 0x78, 0xd1, 0x47, 0xf3, 0x32, 0x30, 0xf1, 0x68, 0xd3, 0xe2, 0xa3, 0x1d, 0xa6, 0xa2, 0x50, 0x86, - 0x37, 0xcd, 0x63, 0x2f, 0xe4, 0xcd, 0x21, 0x56, 0x54, 0xdc, 0x55, 0x49, 0x7d, 0x46, 0xcc, 0xe3, - 0x3d, 0xd1, 0x8c, 0xe2, 0x78, 0x78, 0x1f, 0x5c, 0xf5, 0x86, 0x0e, 0x75, 0x1c, 0x90, 0x54, 0x18, - 0xc9, 0xcb, 0x9c, 0xe4, 0xea, 0x5e, 0x1c, 0x80, 0x92, 0x3e, 0xf0, 0x2e, 0xa8, 0xf5, 0x0c, 0x55, - 0x65, 0xf9, 0xb8, 0x65, 0xb8, 0xba, 0x53, 0xaf, 0xb2, 0xb5, 0x82, 0xf4, 0x3c, 0x6e, 0x09, 0x16, - 0x14, 0x43, 0x36, 0xff, 0x2c, 0x81, 0xe5, 0x8c, 0x33, 0x0d, 0xbf, 0x0f, 0x4a, 0xce, 0xc8, 0x24, - 0x2c, 0x51, 0xab, 0xed, 0x9b, 0x7e, 0x3b, 0x38, 0x18, 0x99, 0xe4, 0x9b, 0x93, 0xd5, 0x57, 0x32, - 0xdc, 0xa8, 0x19, 0x31, 0x47, 0x78, 0x04, 0xe6, 0x2c, 0x3a, 0x9d, 0x3e, 0xf0, 0x20, 0xbc, 0x6c, - 0xb5, 0x32, 0xab, 0x0b, 0x8a, 0xa2, 0xc3, 0x02, 0x7c, 0x75, 0x7c, 0xb2, 0x3a, 0x27, 0xd8, 0x90, - 0x48, 0xdc, 0xfc, 0x55, 0x01, 0x80, 0x6d, 0x62, 0xaa, 0xc6, 0x48, 0x23, 0xfa, 0x65, 0xb4, 0xd4, - 0x87, 0x42, 0x4b, 0xbd, 0x9e, 0x5d, 0x2f, 0x83, 0xa0, 0x32, 0x7b, 0xea, 0xc7, 0xb1, 0x9e, 0x7a, - 0x23, 0x0f, 0xd9, 0xe9, 0x4d, 0xf5, 0x1f, 0x45, 0xb0, 0x10, 0x82, 0xb7, 0x0c, 0xbd, 0xaf, 0xb0, - 0xd3, 0x70, 0x4f, 0xd8, 0xd1, 0xeb, 0xb1, 0x1d, 0x5d, 0x4e, 0x71, 0x89, 0xec, 0xe6, 0x4e, 0x10, - 0x67, 0x81, 0xb9, 0xbf, 0x25, 0x4e, 0xfe, 0xcd, 0xc9, 0x6a, 0x8a, 0xf4, 0x93, 0x03, 0x26, 0x31, - 0x44, 0x78, 0x0d, 0x4c, 0x5b, 0x04, 0xdb, 0x86, 0xce, 0xca, 0x42, 0x35, 0x7c, 0x14, 0xc4, 0x46, - 0x11, 0xb7, 0xc2, 0x1b, 0x60, 0x46, 0x23, 0xb6, 0x8d, 0x07, 0x84, 0x55, 0x80, 0x6a, 0x7b, 0x9e, - 0x03, 0x67, 0x76, 0xbd, 0x61, 0xe4, 0xdb, 0xe1, 0xa7, 0xa0, 0xa6, 0x62, 0x9b, 0xa7, 0xe3, 0x81, - 0xa2, 0x11, 0x76, 0xc6, 0x67, 0x37, 0x5e, 0xcf, 0xb7, 0xf7, 0xd4, 0x23, 0xec, 0x63, 0x3b, 0x02, - 0x13, 0x8a, 0x31, 0xc3, 0x21, 0x80, 0x74, 0xe4, 0xc0, 0xc2, 0xba, 0xed, 0x2d, 0x14, 0x9d, 0x6f, - 0x66, 0xe2, 0xf9, 0x82, 0x7a, 0xb6, 0x93, 0x60, 0x43, 0x29, 0x33, 0x34, 0x7f, 0x2f, 0x81, 0x5a, - 0xb8, 0x4d, 0x97, 0xa0, 0x97, 0x1e, 0x88, 0x7a, 0xe9, 0xd5, 0x1c, 0xc9, 0x99, 0x21, 0x98, 0xfe, - 0x5d, 0x00, 0x30, 0x04, 0xd1, 0xe3, 0xdc, 0xc5, 0xbd, 0x63, 0xb8, 0x06, 0x4a, 0x3a, 0xd6, 0xfc, - 0x9c, 0x0c, 0x0e, 0xc8, 0x1e, 0xd6, 0x08, 0x62, 0x16, 0xf8, 0xb9, 0x04, 0x20, 0x2f, 0xc3, 0x9b, - 0xba, 0x6e, 0x38, 0xac, 0xb2, 0xfb, 0x01, 0x6d, 0xe5, 0x08, 0xc8, 0x9f, 0x4b, 0x3e, 0x4c, 0xb0, - 0x7c, 0xa0, 0x3b, 0xd6, 0x28, 0xdc, 0x85, 0x24, 0x00, 0xa5, 0x4c, 0x0d, 0x7f, 0x0c, 0x80, 0xc5, - 0x39, 0x0f, 0x0c, 0x7e, 0x6c, 0xaf, 0x9f, 0x5a, 0xd5, 0x28, 0x74, 0xcb, 0xd0, 0x9f, 0x2a, 0x83, - 0xb0, 0xb0, 0xa0, 0x80, 0x02, 0x45, 0xe8, 0x56, 0x3e, 0x00, 0xcb, 0x19, 0x71, 0xc2, 0x2b, 0xa0, - 0x78, 0x4c, 0x46, 0xde, 0x52, 0x21, 0xfa, 0x27, 0x5c, 0x04, 0xe5, 0x21, 0x56, 0x5d, 0xaf, 0xb4, - 0x56, 0x91, 0xf7, 0xe3, 0x6e, 0xe1, 0x5d, 0x89, 0x8a, 0x91, 0x9a, 0x58, 0x7d, 0xe0, 0x3a, 0xa8, - 0x58, 0xc4, 0x54, 0x95, 0x1e, 0xb6, 0xb9, 0xfa, 0x60, 0x5a, 0x13, 0xf1, 0x31, 0x14, 0x58, 0x05, - 0x29, 0x5b, 0xb8, 0x58, 0x29, 0x5b, 0x7c, 0x31, 0x52, 0xf6, 0x47, 0xa0, 0x62, 0xfb, 0x22, 0xb6, - 0xc4, 0x28, 0x6f, 0xe6, 0xaa, 0xa3, 0x5c, 0xbf, 0x06, 0xd4, 0x81, 0x72, 0x0d, 0xe8, 0xd2, 0x34, - 0x6b, 0x79, 0x42, 0xcd, 0xfa, 0x42, 0x75, 0x26, 0xad, 0x9d, 0x26, 0x76, 0x6d, 0xd2, 0x67, 0x05, - 0xa7, 0x12, 0xd6, 0xce, 0x7d, 0x36, 0x8a, 0xb8, 0x15, 0xfe, 0x50, 0x48, 0xd3, 0xca, 0x64, 0x69, - 0x5a, 0xcb, 0x4e, 0x51, 0x78, 0x08, 0x96, 0x4d, 0xcb, 0x18, 0x58, 0xc4, 0xb6, 0xb7, 0x09, 0xee, - 0xab, 0x8a, 0x4e, 0xfc, 0x95, 0xa9, 0xb2, 0x27, 0x7a, 0x65, 0x7c, 0xb2, 0xba, 0xbc, 0x9f, 0x0e, - 0x41, 0x59, 0xbe, 0xcd, 0x3f, 0x95, 0xc0, 0x95, 0x78, 0x8f, 0xcb, 0x50, 0x83, 0xd2, 0xb9, 0xd4, - 0xe0, 0x1b, 0x91, 0x03, 0xe0, 0x49, 0xe5, 0x60, 0xdf, 0x53, 0x0e, 0xc1, 0x26, 0x98, 0xe7, 0x67, - 0xdf, 0x37, 0x72, 0x3d, 0x1c, 0xec, 0xfb, 0xa1, 0x68, 0x46, 0x71, 0x3c, 0xd5, 0x78, 0xa1, 0x74, - 0xf3, 0x49, 0x4a, 0xa2, 0xc6, 0xdb, 0x8c, 0x03, 0x50, 0xd2, 0x07, 0xee, 0x82, 0x05, 0x57, 0x4f, - 0x52, 0x79, 0x79, 0xf8, 0x0a, 0xa7, 0x5a, 0x38, 0x4c, 0x42, 0x50, 0x9a, 0x1f, 0x7c, 0x02, 0x40, - 0xcf, 0x6f, 0xcc, 0x76, 0x7d, 0x9a, 0x55, 0xd2, 0x37, 0x72, 0x9c, 0x97, 0xa0, 0x9b, 0x87, 0x55, - 0x2c, 0x18, 0xb2, 0x51, 0x84, 0x13, 0xde, 0x03, 0x73, 0x16, 0x93, 0xf6, 0x7e, 0xa8, 0x9e, 0x3c, - 0xfe, 0x0e, 0x77, 0x9b, 0x43, 0x51, 0x23, 0x12, 0xb1, 0x29, 0x8a, 0xb6, 0x92, 0x5b, 0xd1, 0xfe, - 0x51, 0x8a, 0xb6, 0x99, 0x40, 0xcc, 0xde, 0x15, 0xa4, 0xcf, 0xb5, 0x98, 0xf4, 0x59, 0x4a, 0x7a, - 0x44, 0x94, 0x8f, 0x92, 0xae, 0x63, 0x6f, 0xe7, 0xd4, 0xb1, 0x61, 0x63, 0xcc, 0x27, 0x64, 0xf9, - 0x32, 0x5c, 0xce, 0xdd, 0x50, 0x5e, 0x21, 0x1b, 0x06, 0xf5, 0x02, 0x84, 0x6c, 0x84, 0xec, 0x74, - 0x21, 0xfb, 0xaf, 0x02, 0x58, 0x08, 0xc1, 0xb9, 0x85, 0x6c, 0x8a, 0xcb, 0x85, 0x09, 0xd9, 0x74, - 0x25, 0x58, 0xbc, 0x68, 0x25, 0x78, 0x01, 0x02, 0x9a, 0x89, 0xcb, 0x70, 0xe9, 0xfe, 0x9f, 0xc4, - 0x65, 0x18, 0x55, 0x86, 0xb8, 0xfc, 0x4d, 0x21, 0x1a, 0xfa, 0xb7, 0x5e, 0xed, 0xfc, 0xef, 0xd7, - 0x68, 0xcd, 0xbf, 0x14, 0xc1, 0x95, 0xf8, 0x39, 0x14, 0x1a, 0xa4, 0x74, 0x66, 0x83, 0xdc, 0x07, - 0x8b, 0x4f, 0x5d, 0x55, 0x1d, 0xb1, 0x65, 0x88, 0x74, 0x49, 0xaf, 0xb5, 0x7e, 0x97, 0x7b, 0x2e, - 0x7e, 0x98, 0x82, 0x41, 0xa9, 0x9e, 0x19, 0xcd, 0xbe, 0x78, 0xae, 0x66, 0x9f, 0xe8, 0x40, 0xa5, - 0x09, 0x3a, 0x50, 0x6a, 0xe3, 0x2e, 0x9f, 0xa3, 0x71, 0x4f, 0xd6, 0x69, 0x53, 0x0a, 0xd7, 0x59, - 0x9d, 0xb6, 0xf9, 0x3e, 0xa8, 0x89, 0xd2, 0xcd, 0xdb, 0x45, 0x4f, 0x37, 0x72, 0xa1, 0x14, 0xd9, - 0x45, 0x6f, 0x1c, 0x05, 0x88, 0xe6, 0x2f, 0x24, 0xb0, 0x94, 0x7e, 0xf1, 0x02, 0x55, 0x50, 0xd3, - 0xf0, 0x67, 0xd1, 0xfb, 0xa9, 0xb3, 0x9a, 0x90, 0xeb, 0x28, 0xaa, 0xec, 0x7d, 0xf6, 0x90, 0x1f, - 0xea, 0xce, 0x23, 0xab, 0xe3, 0x58, 0x8a, 0x3e, 0xf0, 0x3a, 0xf7, 0xae, 0xc0, 0x85, 0x62, 0xdc, - 0xcd, 0xaf, 0x25, 0xb0, 0x9c, 0xd1, 0x39, 0x2f, 0x37, 0x12, 0xf8, 0x09, 0xa8, 0x68, 0xf8, 0xb3, - 0x8e, 0x6b, 0x0d, 0xd2, 0x7a, 0x7d, 0xbe, 0x79, 0x58, 0x35, 0xd8, 0xe5, 0x2c, 0x28, 0xe0, 0x6b, - 0x3e, 0x02, 0x6b, 0xc2, 0x43, 0xd2, 0x93, 0x47, 0x9e, 0xba, 0x2a, 0x3b, 0x84, 0x5c, 0xac, 0xdc, - 0x04, 0x55, 0x13, 0x5b, 0x8e, 0x12, 0x48, 0xdd, 0x72, 0x7b, 0x6e, 0x7c, 0xb2, 0x5a, 0xdd, 0xf7, - 0x07, 0x51, 0x68, 0x6f, 0xfe, 0x47, 0x02, 0xe5, 0x4e, 0x0f, 0xab, 0xe4, 0x12, 0xd4, 0xc2, 0xb6, - 0xa0, 0x16, 0xb2, 0x3f, 0x9e, 0xb0, 0x78, 0x32, 0x85, 0xc2, 0x4e, 0x4c, 0x28, 0xbc, 0x76, 0x06, - 0xcf, 0xe9, 0x1a, 0xe1, 0x3d, 0x50, 0x0d, 0xa6, 0x9b, 0xac, 0x80, 0x35, 0x7f, 0x5d, 0x00, 0xb3, - 0x91, 0x29, 0x26, 0x2c, 0x7f, 0x4f, 0x84, 0xb6, 0x41, 0x0f, 0xf6, 0x46, 0x9e, 0x07, 0x91, 0xfd, - 0x16, 0xe1, 0xdd, 0x3d, 0x84, 0x6f, 0x9e, 0xc9, 0xce, 0xf1, 0x3e, 0xa8, 0x39, 0xd8, 0x1a, 0x10, - 0xc7, 0xb7, 0xb1, 0x05, 0xab, 0x86, 0xb7, 0x54, 0x07, 0x82, 0x15, 0xc5, 0xd0, 0x2b, 0xf7, 0xc0, - 0x9c, 0x30, 0xd9, 0x44, 0x17, 0x08, 0x9f, 0xd3, 0xc5, 0x09, 0x93, 0xf3, 0x12, 0xb2, 0xeb, 0x23, - 0x21, 0xbb, 0xb2, 0xbf, 0x2d, 0x46, 0x8f, 0x4c, 0x56, 0x8e, 0xa1, 0x58, 0x8e, 0xbd, 0x9e, 0x8b, - 0xed, 0xf4, 0x4c, 0xfb, 0x83, 0x04, 0xe6, 0x23, 0xe8, 0x4b, 0x10, 0x48, 0x0f, 0x45, 0x81, 0xf4, - 0x5a, 0x9e, 0x87, 0xc8, 0x50, 0x48, 0x7f, 0x2d, 0x0b, 0xc1, 0x7f, 0xeb, 0x25, 0xd2, 0xcf, 0xc0, - 0xe2, 0xd0, 0x50, 0x5d, 0x8d, 0x6c, 0xa9, 0x58, 0xd1, 0x7c, 0x00, 0x55, 0x01, 0xc5, 0xf8, 0xbb, - 0x49, 0x40, 0x4f, 0x2c, 0x5b, 0xb1, 0x1d, 0xa2, 0x3b, 0x8f, 0x43, 0xcf, 0x50, 0xc7, 0x3c, 0x4e, - 0xa1, 0x43, 0xa9, 0x93, 0xc0, 0xb7, 0xc1, 0x2c, 0xd5, 0x23, 0x4a, 0x8f, 0xec, 0x61, 0xcd, 0x17, - 0xde, 0xc1, 0x97, 0xaf, 0x4e, 0x68, 0x42, 0x51, 0x1c, 0x3c, 0x02, 0x0b, 0xa6, 0xd1, 0xdf, 0xc5, - 0x3a, 0x1e, 0x10, 0xda, 0xf6, 0xf6, 0xd9, 0xff, 0x46, 0xb0, 0x5b, 0xa2, 0x6a, 0xfb, 0x1d, 0xff, - 0x2d, 0x7f, 0x3f, 0x09, 0xa1, 0x2f, 0x3d, 0x29, 0xc3, 0xec, 0xa5, 0x27, 0x8d, 0x12, 0x5a, 0x89, - 0x2f, 0xbf, 0xde, 0xdd, 0xf5, 0x46, 0x9e, 0x0c, 0x3b, 0xe7, 0xb7, 0xdf, 0xac, 0x4b, 0xb0, 0xca, - 0xb9, 0x3e, 0xb6, 0xfe, 0xad, 0x08, 0xae, 0x26, 0x8e, 0x2e, 0xfc, 0xf0, 0x94, 0xdb, 0xa2, 0xa5, - 0x0b, 0xbb, 0x29, 0x4a, 0x48, 0xcd, 0xe2, 0x04, 0x52, 0x73, 0x13, 0xcc, 0xf3, 0x6f, 0xbc, 0x31, - 0xa5, 0x1a, 0x68, 0xf9, 0x2d, 0xd1, 0x8c, 0xe2, 0xf8, 0xb4, 0x9b, 0xaa, 0xf2, 0x84, 0x37, 0x55, - 0xd1, 0x28, 0xb8, 0x74, 0xf4, 0xd2, 0x2e, 0x19, 0x05, 0x57, 0x90, 0x71, 0x3c, 0xed, 0x56, 0x1e, - 0x6b, 0xc0, 0x30, 0x23, 0x76, 0xab, 0x43, 0xc1, 0x8a, 0x62, 0xe8, 0xe6, 0xdf, 0x25, 0xf0, 0x72, - 0x66, 0x96, 0xc1, 0x4d, 0xe1, 0x95, 0xff, 0x56, 0xec, 0x95, 0xff, 0x7b, 0x99, 0x8e, 0x91, 0x17, - 0x7f, 0x2b, 0xfd, 0x1e, 0xe7, 0xbd, 0x7c, 0xf7, 0x38, 0x29, 0x42, 0xed, 0xec, 0x0b, 0x9d, 0xf6, - 0xad, 0x67, 0xcf, 0x1b, 0x53, 0x5f, 0x3e, 0x6f, 0x4c, 0x7d, 0xf5, 0xbc, 0x31, 0xf5, 0xf3, 0x71, - 0x43, 0x7a, 0x36, 0x6e, 0x48, 0x5f, 0x8e, 0x1b, 0xd2, 0x57, 0xe3, 0x86, 0xf4, 0xcf, 0x71, 0x43, - 0xfa, 0xe2, 0xeb, 0xc6, 0xd4, 0x27, 0x33, 0x7c, 0xc6, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x91, - 0x67, 0xbc, 0x00, 0xc8, 0x25, 0x00, 0x00, + 0xe1, 0x97, 0x02, 0x41, 0xfb, 0xd0, 0x3c, 0x09, 0x35, 0xf3, 0xd8, 0xfe, 0x82, 0x00, 0x05, 0x8a, + 0x99, 0x9d, 0xbd, 0xcc, 0x5e, 0xa4, 0xa5, 0x6a, 0xab, 0x85, 0xdf, 0xc4, 0x39, 0xdf, 0xf9, 0xe6, + 0xec, 0xcc, 0x99, 0x73, 0xbe, 0x9d, 0x15, 0xf8, 0xde, 0xf1, 0x7b, 0xb6, 0xac, 0x18, 0xad, 0x63, + 0xb7, 0x4b, 0x2c, 0x9d, 0x38, 0xc4, 0x6e, 0x0d, 0x89, 0xde, 0x37, 0xac, 0x16, 0x37, 0x60, 0x53, + 0x69, 0x61, 0xd3, 0xb4, 0x5b, 0xc3, 0xdb, 0x5d, 0xe2, 0xe0, 0x8d, 0xd6, 0x80, 0xe8, 0xc4, 0xc2, + 0x0e, 0xe9, 0xcb, 0xa6, 0x65, 0x38, 0x06, 0x5c, 0xf6, 0x80, 0x32, 0x36, 0x15, 0x99, 0x02, 0x65, + 0x0e, 0x5c, 0xb9, 0x39, 0x50, 0x9c, 0x23, 0xb7, 0x2b, 0xf7, 0x0c, 0xad, 0x35, 0x30, 0x06, 0x46, + 0x8b, 0xe1, 0xbb, 0xee, 0x13, 0xf6, 0x8b, 0xfd, 0x60, 0x7f, 0x79, 0x3c, 0x2b, 0xcd, 0xc8, 0x84, + 0x3d, 0xc3, 0x22, 0xad, 0xe1, 0xed, 0xf8, 0x5c, 0x2b, 0xd7, 0x23, 0x18, 0xd3, 0x50, 0x95, 0xde, + 0x88, 0x87, 0x95, 0x84, 0xbe, 0x1d, 0x42, 0x35, 0xdc, 0x3b, 0x52, 0x74, 0x62, 0x8d, 0x5a, 0xe6, + 0xf1, 0x80, 0x0e, 0xd8, 0x2d, 0x8d, 0x38, 0x38, 0x6d, 0x82, 0x56, 0x96, 0x97, 0xe5, 0xea, 0x8e, + 0xa2, 0x91, 0x84, 0xc3, 0xbb, 0x67, 0x39, 0xd8, 0xbd, 0x23, 0xa2, 0xe1, 0x84, 0xdf, 0x5b, 0x59, + 0x7e, 0xae, 0xa3, 0xa8, 0x2d, 0x45, 0x77, 0x6c, 0xc7, 0x8a, 0x3b, 0x35, 0x7f, 0x51, 0x00, 0xd5, + 0x6d, 0x4c, 0x34, 0x43, 0xef, 0x10, 0x07, 0x3e, 0x06, 0x15, 0xfa, 0x18, 0x7d, 0xec, 0xe0, 0xba, + 0xb4, 0x26, 0xad, 0xcf, 0x6e, 0xdc, 0x92, 0xc3, 0xbd, 0x08, 0x58, 0x65, 0xf3, 0x78, 0x40, 0x07, + 0x6c, 0x99, 0xa2, 0xe5, 0xe1, 0x6d, 0xf9, 0x61, 0xf7, 0x53, 0xd2, 0x73, 0x76, 0x89, 0x83, 0xdb, + 0xf0, 0xe9, 0xc9, 0xea, 0xd4, 0xf8, 0x64, 0x15, 0x84, 0x63, 0x28, 0x60, 0x85, 0xf7, 0x41, 0xc9, + 0x36, 0x49, 0xaf, 0x5e, 0x60, 0xec, 0x57, 0xe5, 0x8c, 0x9d, 0x96, 0x83, 0x98, 0x3a, 0x26, 0xe9, + 0xb5, 0x5f, 0xe1, 0x9c, 0x25, 0xfa, 0x0b, 0x31, 0x06, 0xb8, 0x0f, 0xa6, 0x6d, 0x07, 0x3b, 0xae, + 0x5d, 0x2f, 0x32, 0xae, 0xf5, 0x1c, 0x5c, 0x0c, 0xdf, 0xae, 0x71, 0xb6, 0x69, 0xef, 0x37, 0xe2, + 0x3c, 0xcd, 0xdf, 0x4a, 0x60, 0x2e, 0xc0, 0xee, 0x28, 0xb6, 0x03, 0x7f, 0x9c, 0x58, 0x0f, 0x39, + 0xdf, 0x7a, 0x50, 0x6f, 0xb6, 0x1a, 0x97, 0xf8, 0x5c, 0x15, 0x7f, 0x24, 0xb2, 0x16, 0xf7, 0x40, + 0x59, 0x71, 0x88, 0x66, 0xd7, 0x0b, 0x6b, 0xc5, 0xf5, 0xd9, 0x8d, 0xe6, 0xd9, 0x0f, 0xd0, 0x9e, + 0xe3, 0x74, 0xe5, 0x07, 0xd4, 0x11, 0x79, 0xfe, 0xcd, 0x2f, 0x4a, 0x91, 0xc0, 0xe9, 0x12, 0xc1, + 0x9f, 0x80, 0x8a, 0x4d, 0x54, 0xd2, 0x73, 0x0c, 0x8b, 0x07, 0xfe, 0x56, 0xce, 0xc0, 0x71, 0x97, + 0xa8, 0x1d, 0xee, 0xda, 0x7e, 0x85, 0x46, 0xee, 0xff, 0x42, 0x01, 0x25, 0xfc, 0x18, 0x54, 0x1c, + 0xa2, 0x99, 0x2a, 0x76, 0x08, 0xdf, 0xc9, 0xd7, 0xa2, 0xc1, 0xd3, 0xb3, 0x46, 0xc9, 0xf6, 0x8d, + 0xfe, 0x01, 0x87, 0xb1, 0x6d, 0x0c, 0x16, 0xc3, 0x1f, 0x45, 0x01, 0x0d, 0x34, 0x41, 0xcd, 0x35, + 0xfb, 0x14, 0xe9, 0xd0, 0xfc, 0x1c, 0x8c, 0xf8, 0xb6, 0xde, 0x3a, 0x7b, 0x55, 0x0e, 0x05, 0xbf, + 0xf6, 0x12, 0x9f, 0xa5, 0x26, 0x8e, 0xa3, 0x18, 0x3f, 0xdc, 0x04, 0xf3, 0x9a, 0xa2, 0x23, 0x82, + 0xfb, 0xa3, 0x0e, 0xe9, 0x19, 0x7a, 0xdf, 0xae, 0x97, 0xd6, 0xa4, 0xf5, 0x72, 0x7b, 0x99, 0x13, + 0xcc, 0xef, 0x8a, 0x66, 0x14, 0xc7, 0xc3, 0x8f, 0x00, 0xf4, 0x1f, 0xe0, 0x9e, 0x77, 0xb0, 0x14, + 0x43, 0xaf, 0x97, 0xd7, 0xa4, 0xf5, 0x62, 0x7b, 0x85, 0xb3, 0xc0, 0x83, 0x04, 0x02, 0xa5, 0x78, + 0xc1, 0x1d, 0xb0, 0x68, 0x91, 0xa1, 0x62, 0x2b, 0x86, 0x7e, 0x5f, 0xb1, 0x1d, 0xc3, 0x1a, 0xed, + 0x28, 0x9a, 0xe2, 0xd4, 0xa7, 0x59, 0x4c, 0xf5, 0xf1, 0xc9, 0xea, 0x22, 0x4a, 0xb1, 0xa3, 0x54, + 0xaf, 0xe6, 0x6f, 0xca, 0x60, 0x3e, 0x96, 0xf7, 0xf0, 0x11, 0x58, 0xea, 0xb9, 0x96, 0x45, 0x74, + 0x67, 0xcf, 0xd5, 0xba, 0xc4, 0xea, 0xf4, 0x8e, 0x48, 0xdf, 0x55, 0x49, 0x9f, 0xa5, 0x48, 0xb9, + 0xdd, 0xe0, 0x11, 0x2f, 0x6d, 0xa5, 0xa2, 0x50, 0x86, 0x37, 0x5d, 0x05, 0x9d, 0x0d, 0xed, 0x2a, + 0xb6, 0x1d, 0x70, 0x16, 0x18, 0x67, 0xb0, 0x0a, 0x7b, 0x09, 0x04, 0x4a, 0xf1, 0xa2, 0x31, 0xf6, + 0x89, 0xad, 0x58, 0xa4, 0x1f, 0x8f, 0xb1, 0x28, 0xc6, 0xb8, 0x9d, 0x8a, 0x42, 0x19, 0xde, 0xf0, + 0x1d, 0x30, 0xeb, 0xcd, 0xc6, 0xf6, 0x8f, 0x6f, 0xf4, 0x02, 0x27, 0x9b, 0xdd, 0x0b, 0x4d, 0x28, + 0x8a, 0xa3, 0x8f, 0x66, 0x74, 0x6d, 0x62, 0x0d, 0x49, 0x3f, 0x7b, 0x83, 0x1f, 0x26, 0x10, 0x28, + 0xc5, 0x8b, 0x3e, 0x9a, 0x97, 0x81, 0x89, 0x47, 0x9b, 0x16, 0x1f, 0xed, 0x30, 0x15, 0x85, 0x32, + 0xbc, 0x69, 0x1e, 0x7b, 0x21, 0x6f, 0x0e, 0xb1, 0xa2, 0xe2, 0xae, 0x4a, 0xea, 0x33, 0x62, 0x1e, + 0xef, 0x89, 0x66, 0x14, 0xc7, 0xc3, 0x7b, 0xe0, 0xb2, 0x37, 0x74, 0xa8, 0xe3, 0x80, 0xa4, 0xc2, + 0x48, 0x5e, 0xe5, 0x24, 0x97, 0xf7, 0xe2, 0x00, 0x94, 0xf4, 0x81, 0x77, 0x40, 0xad, 0x67, 0xa8, + 0x2a, 0xcb, 0xc7, 0x2d, 0xc3, 0xd5, 0x9d, 0x7a, 0x95, 0xad, 0x15, 0xa4, 0xe7, 0x71, 0x4b, 0xb0, + 0xa0, 0x18, 0xb2, 0xf9, 0x27, 0x09, 0x2c, 0x67, 0x9c, 0x69, 0xf8, 0x5d, 0x50, 0x72, 0x46, 0x26, + 0x61, 0x89, 0x5a, 0x6d, 0xdf, 0xf0, 0xdb, 0xc1, 0xc1, 0xc8, 0x24, 0xdf, 0x9c, 0xac, 0x5e, 0xc9, + 0x70, 0xa3, 0x66, 0xc4, 0x1c, 0xe1, 0x11, 0x98, 0xb3, 0xe8, 0x74, 0xfa, 0xc0, 0x83, 0xf0, 0xb2, + 0xd5, 0xca, 0xac, 0x2e, 0x28, 0x8a, 0x0e, 0x0b, 0xf0, 0xe5, 0xf1, 0xc9, 0xea, 0x9c, 0x60, 0x43, + 0x22, 0x71, 0xf3, 0x97, 0x05, 0x00, 0xb6, 0x89, 0xa9, 0x1a, 0x23, 0x8d, 0xe8, 0x17, 0xd1, 0x52, + 0x1f, 0x08, 0x2d, 0xf5, 0x5a, 0x76, 0xbd, 0x0c, 0x82, 0xca, 0xec, 0xa9, 0x1f, 0xc7, 0x7a, 0xea, + 0xf5, 0x3c, 0x64, 0xa7, 0x37, 0xd5, 0xbf, 0x17, 0xc1, 0x42, 0x08, 0xde, 0x32, 0xf4, 0xbe, 0xc2, + 0x4e, 0xc3, 0x5d, 0x61, 0x47, 0xaf, 0xc5, 0x76, 0x74, 0x39, 0xc5, 0x25, 0xb2, 0x9b, 0x3b, 0x41, + 0x9c, 0x05, 0xe6, 0xfe, 0xb6, 0x38, 0xf9, 0x37, 0x27, 0xab, 0x29, 0xd2, 0x4f, 0x0e, 0x98, 0xc4, + 0x10, 0xe1, 0x55, 0x30, 0x6d, 0x11, 0x6c, 0x1b, 0x3a, 0x2b, 0x0b, 0xd5, 0xf0, 0x51, 0x10, 0x1b, + 0x45, 0xdc, 0x0a, 0xaf, 0x83, 0x19, 0x8d, 0xd8, 0x36, 0x1e, 0x10, 0x56, 0x01, 0xaa, 0xed, 0x79, + 0x0e, 0x9c, 0xd9, 0xf5, 0x86, 0x91, 0x6f, 0x87, 0x9f, 0x82, 0x9a, 0x8a, 0x6d, 0x9e, 0x8e, 0x07, + 0x8a, 0x46, 0xd8, 0x19, 0x9f, 0xdd, 0x78, 0x23, 0xdf, 0xde, 0x53, 0x8f, 0xb0, 0x8f, 0xed, 0x08, + 0x4c, 0x28, 0xc6, 0x0c, 0x87, 0x00, 0xd2, 0x91, 0x03, 0x0b, 0xeb, 0xb6, 0xb7, 0x50, 0x74, 0xbe, + 0x99, 0x89, 0xe7, 0x0b, 0xea, 0xd9, 0x4e, 0x82, 0x0d, 0xa5, 0xcc, 0xd0, 0xfc, 0x9d, 0x04, 0x6a, + 0xe1, 0x36, 0x5d, 0x80, 0x5e, 0xba, 0x2f, 0xea, 0xa5, 0xd7, 0x72, 0x24, 0x67, 0x86, 0x60, 0xfa, + 0x57, 0x01, 0xc0, 0x10, 0x44, 0x8f, 0x73, 0x17, 0xf7, 0x8e, 0xe1, 0x1a, 0x28, 0xe9, 0x58, 0xf3, + 0x73, 0x32, 0x38, 0x20, 0x7b, 0x58, 0x23, 0x88, 0x59, 0xe0, 0xe7, 0x12, 0x80, 0xbc, 0x0c, 0x6f, + 0xea, 0xba, 0xe1, 0xb0, 0xca, 0xee, 0x07, 0xb4, 0x95, 0x23, 0x20, 0x7f, 0x2e, 0xf9, 0x30, 0xc1, + 0xf2, 0xa1, 0xee, 0x58, 0xa3, 0x70, 0x17, 0x92, 0x00, 0x94, 0x32, 0x35, 0xfc, 0x11, 0x00, 0x16, + 0xe7, 0x3c, 0x30, 0xf8, 0xb1, 0xbd, 0x76, 0x6a, 0x55, 0xa3, 0xd0, 0x2d, 0x43, 0x7f, 0xa2, 0x0c, + 0xc2, 0xc2, 0x82, 0x02, 0x0a, 0x14, 0xa1, 0x5b, 0xf9, 0x10, 0x2c, 0x67, 0xc4, 0x09, 0x2f, 0x81, + 0xe2, 0x31, 0x19, 0x79, 0x4b, 0x85, 0xe8, 0x9f, 0x70, 0x11, 0x94, 0x87, 0x58, 0x75, 0xbd, 0xd2, + 0x5a, 0x45, 0xde, 0x8f, 0x3b, 0x85, 0xf7, 0x24, 0x2a, 0x46, 0x6a, 0x62, 0xf5, 0x81, 0xeb, 0xa0, + 0x62, 0x11, 0x53, 0x55, 0x7a, 0xd8, 0xe6, 0xea, 0x83, 0x69, 0x4d, 0xc4, 0xc7, 0x50, 0x60, 0x15, + 0xa4, 0x6c, 0xe1, 0xc5, 0x4a, 0xd9, 0xe2, 0xf3, 0x91, 0xb2, 0x3f, 0x04, 0x15, 0xdb, 0x17, 0xb1, + 0x25, 0x46, 0x79, 0x23, 0x57, 0x1d, 0xe5, 0xfa, 0x35, 0xa0, 0x0e, 0x94, 0x6b, 0x40, 0x97, 0xa6, + 0x59, 0xcb, 0x13, 0x6a, 0xd6, 0xe7, 0xaa, 0x33, 0x69, 0xed, 0x34, 0xb1, 0x6b, 0x93, 0x3e, 0x2b, + 0x38, 0x95, 0xb0, 0x76, 0xee, 0xb3, 0x51, 0xc4, 0xad, 0xf0, 0x07, 0x42, 0x9a, 0x56, 0x26, 0x4b, + 0xd3, 0x5a, 0x76, 0x8a, 0xc2, 0x43, 0xb0, 0x6c, 0x5a, 0xc6, 0xc0, 0x22, 0xb6, 0xbd, 0x4d, 0x70, + 0x5f, 0x55, 0x74, 0xe2, 0xaf, 0x4c, 0x95, 0x3d, 0xd1, 0x95, 0xf1, 0xc9, 0xea, 0xf2, 0x7e, 0x3a, + 0x04, 0x65, 0xf9, 0x36, 0xff, 0x58, 0x02, 0x97, 0xe2, 0x3d, 0x2e, 0x43, 0x0d, 0x4a, 0xe7, 0x52, + 0x83, 0x6f, 0x46, 0x0e, 0x80, 0x27, 0x95, 0x83, 0x7d, 0x4f, 0x39, 0x04, 0x9b, 0x60, 0x9e, 0x9f, + 0x7d, 0xdf, 0xc8, 0xf5, 0x70, 0xb0, 0xef, 0x87, 0xa2, 0x19, 0xc5, 0xf1, 0x54, 0xe3, 0x85, 0xd2, + 0xcd, 0x27, 0x29, 0x89, 0x1a, 0x6f, 0x33, 0x0e, 0x40, 0x49, 0x1f, 0xb8, 0x0b, 0x16, 0x5c, 0x3d, + 0x49, 0xe5, 0xe5, 0xe1, 0x15, 0x4e, 0xb5, 0x70, 0x98, 0x84, 0xa0, 0x34, 0x3f, 0xf8, 0x18, 0x80, + 0x9e, 0xdf, 0x98, 0xed, 0xfa, 0x34, 0xab, 0xa4, 0x6f, 0xe6, 0x38, 0x2f, 0x41, 0x37, 0x0f, 0xab, + 0x58, 0x30, 0x64, 0xa3, 0x08, 0x27, 0xbc, 0x0b, 0xe6, 0x2c, 0x26, 0xed, 0xfd, 0x50, 0x3d, 0x79, + 0xfc, 0x2d, 0xee, 0x36, 0x87, 0xa2, 0x46, 0x24, 0x62, 0x53, 0x14, 0x6d, 0x25, 0xb7, 0xa2, 0xfd, + 0x83, 0x14, 0x6d, 0x33, 0x81, 0x98, 0xbd, 0x23, 0x48, 0x9f, 0xab, 0x31, 0xe9, 0xb3, 0x94, 0xf4, + 0x88, 0x28, 0x1f, 0x25, 0x5d, 0xc7, 0xde, 0xca, 0xa9, 0x63, 0xc3, 0xc6, 0x98, 0x4f, 0xc8, 0xf2, + 0x65, 0xb8, 0x98, 0xbb, 0xa1, 0xbc, 0x42, 0x36, 0x0c, 0xea, 0x39, 0x08, 0xd9, 0x08, 0xd9, 0xe9, + 0x42, 0xf6, 0x9f, 0x05, 0xb0, 0x10, 0x82, 0x73, 0x0b, 0xd9, 0x14, 0x97, 0x17, 0x26, 0x64, 0xd3, + 0x95, 0x60, 0xf1, 0x45, 0x2b, 0xc1, 0x17, 0x20, 0xa0, 0x99, 0xb8, 0x0c, 0x97, 0xee, 0xff, 0x49, + 0x5c, 0x86, 0x51, 0x65, 0x88, 0xcb, 0x5f, 0x17, 0xa2, 0xa1, 0xbf, 0xf4, 0x6a, 0xe7, 0xbf, 0xbf, + 0x46, 0x6b, 0xfe, 0xb9, 0x08, 0x2e, 0xc5, 0xcf, 0xa1, 0xd0, 0x20, 0xa5, 0x33, 0x1b, 0xe4, 0x3e, + 0x58, 0x7c, 0xe2, 0xaa, 0xea, 0x88, 0x2d, 0x43, 0xa4, 0x4b, 0x7a, 0xad, 0xf5, 0xdb, 0xdc, 0x73, + 0xf1, 0xfb, 0x29, 0x18, 0x94, 0xea, 0x99, 0xd1, 0xec, 0x8b, 0xe7, 0x6a, 0xf6, 0x89, 0x0e, 0x54, + 0x9a, 0xa0, 0x03, 0xa5, 0x36, 0xee, 0xf2, 0x39, 0x1a, 0xf7, 0x64, 0x9d, 0x36, 0xa5, 0x70, 0x9d, + 0xd5, 0x69, 0x9b, 0x1f, 0x80, 0x9a, 0x28, 0xdd, 0xbc, 0x5d, 0xf4, 0x74, 0x23, 0x17, 0x4a, 0x91, + 0x5d, 0xf4, 0xc6, 0x51, 0x80, 0x68, 0xfe, 0x5c, 0x02, 0x4b, 0xe9, 0x17, 0x2f, 0x50, 0x05, 0x35, + 0x0d, 0x7f, 0x16, 0xbd, 0x9f, 0x3a, 0xab, 0x09, 0xb9, 0x8e, 0xa2, 0xca, 0xde, 0x67, 0x0f, 0xf9, + 0x81, 0xee, 0x3c, 0xb4, 0x3a, 0x8e, 0xa5, 0xe8, 0x03, 0xaf, 0x73, 0xef, 0x0a, 0x5c, 0x28, 0xc6, + 0xdd, 0xfc, 0x5a, 0x02, 0xcb, 0x19, 0x9d, 0xf3, 0x62, 0x23, 0x81, 0x9f, 0x80, 0x8a, 0x86, 0x3f, + 0xeb, 0xb8, 0xd6, 0x20, 0xad, 0xd7, 0xe7, 0x9b, 0x87, 0x55, 0x83, 0x5d, 0xce, 0x82, 0x02, 0xbe, + 0xe6, 0x43, 0xb0, 0x26, 0x3c, 0x24, 0x3d, 0x79, 0xe4, 0x89, 0xab, 0xb2, 0x43, 0xc8, 0xc5, 0xca, + 0x0d, 0x50, 0x35, 0xb1, 0xe5, 0x28, 0x81, 0xd4, 0x2d, 0xb7, 0xe7, 0xc6, 0x27, 0xab, 0xd5, 0x7d, + 0x7f, 0x10, 0x85, 0xf6, 0xe6, 0xbf, 0x25, 0x50, 0xee, 0xf4, 0xb0, 0x4a, 0x2e, 0x40, 0x2d, 0x6c, + 0x0b, 0x6a, 0x21, 0xfb, 0xe3, 0x09, 0x8b, 0x27, 0x53, 0x28, 0xec, 0xc4, 0x84, 0xc2, 0xeb, 0x67, + 0xf0, 0x9c, 0xae, 0x11, 0xde, 0x07, 0xd5, 0x60, 0xba, 0xc9, 0x0a, 0x58, 0xf3, 0x57, 0x05, 0x30, + 0x1b, 0x99, 0x62, 0xc2, 0xf2, 0xf7, 0x58, 0x68, 0x1b, 0xf4, 0x60, 0x6f, 0xe4, 0x79, 0x10, 0xd9, + 0x6f, 0x11, 0xde, 0xdd, 0x43, 0xf8, 0xe6, 0x99, 0xec, 0x1c, 0x1f, 0x80, 0x9a, 0x83, 0xad, 0x01, + 0x71, 0x7c, 0x1b, 0x5b, 0xb0, 0x6a, 0x78, 0x4b, 0x75, 0x20, 0x58, 0x51, 0x0c, 0xbd, 0x72, 0x17, + 0xcc, 0x09, 0x93, 0x4d, 0x74, 0x81, 0xf0, 0x39, 0x5d, 0x9c, 0x30, 0x39, 0x2f, 0x20, 0xbb, 0x3e, + 0x12, 0xb2, 0x2b, 0xfb, 0xdb, 0x62, 0xf4, 0xc8, 0x64, 0xe5, 0x18, 0x8a, 0xe5, 0xd8, 0x1b, 0xb9, + 0xd8, 0x4e, 0xcf, 0xb4, 0xdf, 0x4b, 0x60, 0x3e, 0x82, 0xbe, 0x00, 0x81, 0xf4, 0x40, 0x14, 0x48, + 0xaf, 0xe7, 0x79, 0x88, 0x0c, 0x85, 0xf4, 0x97, 0xb2, 0x10, 0xfc, 0x4b, 0x2f, 0x91, 0x7e, 0x0a, + 0x16, 0x87, 0x86, 0xea, 0x6a, 0x64, 0x4b, 0xc5, 0x8a, 0xe6, 0x03, 0xa8, 0x0a, 0x28, 0xc6, 0xdf, + 0x4d, 0x02, 0x7a, 0x62, 0xd9, 0x8a, 0xed, 0x10, 0xdd, 0x79, 0x14, 0x7a, 0x86, 0x3a, 0xe6, 0x51, + 0x0a, 0x1d, 0x4a, 0x9d, 0x04, 0xbe, 0x03, 0x66, 0xa9, 0x1e, 0x51, 0x7a, 0x64, 0x0f, 0x6b, 0xbe, + 0xf0, 0x0e, 0xbe, 0x7c, 0x75, 0x42, 0x13, 0x8a, 0xe2, 0xe0, 0x11, 0x58, 0x30, 0x8d, 0xfe, 0x2e, + 0xd6, 0xf1, 0x80, 0xd0, 0xb6, 0xb7, 0xcf, 0xfe, 0x37, 0x82, 0xdd, 0x12, 0x55, 0xdb, 0xef, 0xfa, + 0x6f, 0xf9, 0xfb, 0x49, 0x08, 0x7d, 0xe9, 0x49, 0x19, 0x66, 0x2f, 0x3d, 0x69, 0x94, 0xd0, 0x4a, + 0x7c, 0xf9, 0xf5, 0xee, 0xae, 0x37, 0xf2, 0x64, 0xd8, 0x39, 0xbf, 0xfd, 0x66, 0x5d, 0x82, 0x55, + 0xce, 0xf5, 0xb1, 0xf5, 0x6f, 0x45, 0x70, 0x39, 0x71, 0x74, 0xff, 0x87, 0xb7, 0x45, 0x09, 0xb9, + 0x59, 0x9c, 0x40, 0x6e, 0x6e, 0x82, 0x79, 0xfe, 0x9d, 0x37, 0xa6, 0x56, 0x03, 0x3d, 0xbf, 0x25, + 0x9a, 0x51, 0x1c, 0x9f, 0x76, 0x5b, 0x55, 0x9e, 0xf0, 0xb6, 0x2a, 0x1a, 0x05, 0x97, 0x8f, 0x5e, + 0xea, 0x25, 0xa3, 0xe0, 0x2a, 0x32, 0x8e, 0xa7, 0x1d, 0xcb, 0x63, 0x0d, 0x18, 0x66, 0xc4, 0x8e, + 0x75, 0x28, 0x58, 0x51, 0x0c, 0xdd, 0xfc, 0xab, 0x04, 0x5e, 0xcd, 0xcc, 0x34, 0xb8, 0x29, 0xbc, + 0xf6, 0xdf, 0x8c, 0xbd, 0xf6, 0x7f, 0x27, 0xd3, 0x31, 0xf2, 0xf2, 0x6f, 0xa5, 0xdf, 0xe5, 0xbc, + 0x9f, 0xef, 0x2e, 0x27, 0x45, 0xac, 0x9d, 0x7d, 0xa9, 0xd3, 0xbe, 0xf9, 0xf4, 0x59, 0x63, 0xea, + 0xcb, 0x67, 0x8d, 0xa9, 0xaf, 0x9e, 0x35, 0xa6, 0x7e, 0x36, 0x6e, 0x48, 0x4f, 0xc7, 0x0d, 0xe9, + 0xcb, 0x71, 0x43, 0xfa, 0x6a, 0xdc, 0x90, 0xfe, 0x31, 0x6e, 0x48, 0x5f, 0x7c, 0xdd, 0x98, 0xfa, + 0x64, 0x86, 0xcf, 0xf8, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xc7, 0xc0, 0x83, 0xcc, 0x25, + 0x00, 0x00, } diff --git a/staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go b/staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go index 7f5ebaedfcd..6aa42b005d1 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go @@ -853,7 +853,7 @@ func (in *StatefulSet) DeepCopyInto(out *StatefulSet) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - in.Status.DeepCopyInto(&out.Status) + out.Status = in.Status return } @@ -965,15 +965,6 @@ func (x *StatefulSetSpec) DeepCopy() *StatefulSetSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StatefulSetStatus) DeepCopyInto(out *StatefulSetStatus) { *out = *in - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - if *in == nil { - *out = nil - } else { - *out = new(int64) - **out = **in - } - } return }