diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 9870ea64c9a..b7a6f7ef16a 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -274,7 +274,7 @@ func makeTempDirOrDie(prefix string, baseDir string) string { func podsOnNodes(c *client.Client, podNamespace string, labelSelector labels.Selector) wait.ConditionFunc { // Wait until all pods are running on the node. return func() (bool, error) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + options := api.ListOptions{LabelSelector: labelSelector} pods, err := c.Pods(podNamespace).List(options) if err != nil { glog.Infof("Unable to get pods to list: %v", err) @@ -401,7 +401,7 @@ containers: namespace := kubetypes.NamespaceDefault if err := wait.Poll(time.Second, longTestTimeout, podRunning(c, namespace, podName)); err != nil { - if pods, err := c.Pods(namespace).List(unversioned.ListOptions{}); err == nil { + if pods, err := c.Pods(namespace).List(api.ListOptions{}); err == nil { for _, pod := range pods.Items { glog.Infof("pod found: %s/%s", namespace, pod.Name) } @@ -509,7 +509,7 @@ func runSelfLinkTestOnNamespace(c *client.Client, namespace string) { glog.Fatalf("Failed listing service with supplied self link '%v': %v", svc.SelfLink, err) } - svcList, err := services.List(unversioned.ListOptions{}) + svcList, err := services.List(api.ListOptions{}) if err != nil { glog.Fatalf("Failed listing services: %v", err) } @@ -730,7 +730,7 @@ func runPatchTest(c *client.Client) { func runMasterServiceTest(client *client.Client) { time.Sleep(12 * time.Second) - svcList, err := client.Services(api.NamespaceDefault).List(unversioned.ListOptions{}) + svcList, err := client.Services(api.NamespaceDefault).List(api.ListOptions{}) if err != nil { glog.Fatalf("Unexpected error listing services: %v", err) } @@ -857,7 +857,7 @@ func runServiceTest(client *client.Client) { glog.Fatalf("FAILED: service in other namespace should have no endpoints: %v", err) } - svcList, err := client.Services(api.NamespaceAll).List(unversioned.ListOptions{}) + svcList, err := client.Services(api.NamespaceAll).List(api.ListOptions{}) if err != nil { glog.Fatalf("Failed to list services across namespaces: %v", err) } diff --git a/contrib/mesos/pkg/executor/executor_test.go b/contrib/mesos/pkg/executor/executor_test.go index 494ce56052e..569b933e6ea 100644 --- a/contrib/mesos/pkg/executor/executor_test.go +++ b/contrib/mesos/pkg/executor/executor_test.go @@ -520,10 +520,10 @@ func NewMockPodsListWatch(initialPodList api.PodList) *MockPodsListWatch { list: initialPodList, } lw.ListWatch = cache.ListWatch{ - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return lw.fakeWatcher, nil }, - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return &lw.list, nil }, } diff --git a/contrib/mesos/pkg/scheduler/components/framework/framework.go b/contrib/mesos/pkg/scheduler/components/framework/framework.go index f91c36fdbdd..97eaaf3be90 100644 --- a/contrib/mesos/pkg/scheduler/components/framework/framework.go +++ b/contrib/mesos/pkg/scheduler/components/framework/framework.go @@ -43,7 +43,6 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubelet/container" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" @@ -650,7 +649,7 @@ func (k *framework) makeTaskRegistryReconciler() taskreconciler.Action { // tasks identified by annotations in the Kubernetes pod registry. func (k *framework) makePodRegistryReconciler() taskreconciler.Action { return taskreconciler.Action(func(drv bindings.SchedulerDriver, cancel <-chan struct{}) <-chan error { - podList, err := k.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + podList, err := k.client.Pods(api.NamespaceAll).List(api.ListOptions{}) if err != nil { return proc.ErrorChanf("failed to reconcile pod registry: %v", err) } @@ -726,7 +725,7 @@ func (k *framework) explicitlyReconcileTasks(driver bindings.SchedulerDriver, ta } func (ks *framework) recoverTasks() error { - podList, err := ks.client.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + podList, err := ks.client.Pods(api.NamespaceAll).List(api.ListOptions{}) if err != nil { log.V(1).Infof("failed to recover pod registry, madness may ensue: %v", err) return err diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go index 05a383c35be..547992f80ee 100644 --- a/contrib/mesos/pkg/scheduler/integration/integration_test.go +++ b/contrib/mesos/pkg/scheduler/integration/integration_test.go @@ -170,10 +170,10 @@ func NewMockPodsListWatch(initialPodList api.PodList) *MockPodsListWatch { list: initialPodList, } lw.ListWatch = cache.ListWatch{ - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return lw.fakeWatcher, nil }, - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { lw.lock.Lock() defer lw.lock.Unlock() diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index 5ef0e19e1ba..a4c5cd565d3 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" kservice "k8s.io/kubernetes/pkg/controller/endpoint" @@ -58,10 +57,10 @@ func NewEndpointController(client *client.Client) *endpointController { } e.serviceStore.Store, e.serviceController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Services(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.Services(api.NamespaceAll).Watch(options) }, }, @@ -78,10 +77,10 @@ func NewEndpointController(client *client.Client) *endpointController { e.podStore.Store, e.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.Pods(api.NamespaceAll).Watch(options) }, }, @@ -385,7 +384,7 @@ func (e *endpointController) syncService(key string) { // some stragglers could have been left behind if the endpoint controller // reboots). func (e *endpointController) checkLeftoverEndpoints() { - list, err := e.client.Endpoints(api.NamespaceAll).List(unversioned.ListOptions{}) + list, err := e.client.Endpoints(api.NamespaceAll).List(api.ListOptions{}) if err != nil { glog.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err) return diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go index e7c57d41373..9702b00ec20 100644 --- a/pkg/api/conversion.go +++ b/pkg/api/conversion.go @@ -31,6 +31,14 @@ var Codec = runtime.CodecFor(Scheme, "") func init() { Scheme.AddDefaultingFuncs( + func(obj *ListOptions) { + if obj.LabelSelector == nil { + obj.LabelSelector = labels.Everything() + } + if obj.FieldSelector == nil { + obj.FieldSelector = fields.Everything() + } + }, func(obj *unversioned.ListOptions) { if obj.LabelSelector.Selector == nil { obj.LabelSelector = unversioned.LabelSelector{labels.Everything()} diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go index 31cb597a3a9..604a2e1c62e 100644 --- a/pkg/api/deep_copy_generated.go +++ b/pkg/api/deep_copy_generated.go @@ -24,6 +24,8 @@ import ( resource "k8s.io/kubernetes/pkg/api/resource" unversioned "k8s.io/kubernetes/pkg/api/unversioned" conversion "k8s.io/kubernetes/pkg/conversion" + fields "k8s.io/kubernetes/pkg/fields" + labels "k8s.io/kubernetes/pkg/labels" runtime "k8s.io/kubernetes/pkg/runtime" intstr "k8s.io/kubernetes/pkg/util/intstr" inf "speter.net/go/exp/math/dec/inf" @@ -807,6 +809,35 @@ func deepCopy_api_List(in List, out *List, c *conversion.Cloner) error { return nil } +func deepCopy_api_ListOptions(in ListOptions, out *ListOptions, c *conversion.Cloner) error { + if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { + return err + } + if newVal, err := c.DeepCopy(in.LabelSelector); err != nil { + return err + } else if newVal == nil { + out.LabelSelector = nil + } else { + out.LabelSelector = newVal.(labels.Selector) + } + if newVal, err := c.DeepCopy(in.FieldSelector); err != nil { + return err + } else if newVal == nil { + out.FieldSelector = nil + } else { + out.FieldSelector = newVal.(fields.Selector) + } + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + return nil +} + func deepCopy_api_LoadBalancerIngress(in LoadBalancerIngress, out *LoadBalancerIngress, c *conversion.Cloner) error { out.IP = in.IP out.Hostname = in.Hostname @@ -2374,6 +2405,7 @@ func init() { deepCopy_api_LimitRangeList, deepCopy_api_LimitRangeSpec, deepCopy_api_List, + deepCopy_api_ListOptions, deepCopy_api_LoadBalancerIngress, deepCopy_api_LoadBalancerStatus, deepCopy_api_LocalObjectReference, diff --git a/pkg/api/register.go b/pkg/api/register.go index 8caa25a401e..a949be2ebbc 100644 --- a/pkg/api/register.go +++ b/pkg/api/register.go @@ -71,6 +71,7 @@ func init() { &PersistentVolumeClaim{}, &PersistentVolumeClaimList{}, &DeleteOptions{}, + &ListOptions{}, &PodAttachOptions{}, &PodLogOptions{}, &PodExecOptions{}, @@ -83,7 +84,6 @@ func init() { // Register Unversioned types // TODO this should not be done here - Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.ListOptions{}) Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{}) Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIVersions{}) Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.APIGroupList{}) @@ -123,6 +123,7 @@ func (*PersistentVolumeList) IsAnAPIObject() {} func (*PersistentVolumeClaim) IsAnAPIObject() {} func (*PersistentVolumeClaimList) IsAnAPIObject() {} func (*DeleteOptions) IsAnAPIObject() {} +func (*ListOptions) IsAnAPIObject() {} func (*PodAttachOptions) IsAnAPIObject() {} func (*PodLogOptions) IsAnAPIObject() {} func (*PodExecOptions) IsAnAPIObject() {} diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index 914dd6978c2..8fa1065472c 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -97,6 +97,12 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer { j.ResourceVersion = strconv.FormatUint(c.RandUint64(), 10) j.SelfLink = c.RandString() }, + func(j *api.ListOptions, c fuzz.Continue) { + label, _ := labels.Parse("a=b") + j.LabelSelector = label + field, _ := fields.ParseSelector("a=b") + j.FieldSelector = field + }, func(j *unversioned.ListOptions, c fuzz.Continue) { // TODO: add some parsing label, _ := labels.Parse("a=b") diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 4d2b50c5776..f7b556e4f6a 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -27,7 +27,9 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" - pkg6_runtime "k8s.io/kubernetes/pkg/runtime" + pkg7_fields "k8s.io/kubernetes/pkg/fields" + pkg6_labels "k8s.io/kubernetes/pkg/labels" + pkg8_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -68,12 +70,14 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity var v1 pkg2_unversioned.Time - var v2 pkg6_runtime.Object - var v3 pkg1_types.UID - var v4 pkg5_intstr.IntOrString - var v5 pkg4_inf.Dec - var v6 time.Time - _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6 + var v2 pkg7_fields.Selector + var v3 pkg6_labels.Selector + var v4 pkg8_runtime.Object + var v5 pkg1_types.UID + var v6 pkg5_intstr.IntOrString + var v7 pkg4_inf.Dec + var v8 time.Time + _, _, _, _, _, _, _, _, _ = v0, v1, v2, v3, v4, v5, v6, v7, v8 } } @@ -33051,7 +33055,7 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -33065,16 +33069,16 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2616 := !z.EncBinary() yy2arr2616 := z.EncBasicHandle().StructToArray - var yyq2616 [10]bool + var yyq2616 [7]bool _, _, _ = yysep2616, yyq2616, yy2arr2616 const yyr2616 bool = false yyq2616[0] = x.Kind != "" yyq2616[1] = x.APIVersion != "" var yynn2616 int if yyr2616 || yy2arr2616 { - r.EncodeArrayStart(10) + r.EncodeArrayStart(7) } else { - yynn2616 = 8 + yynn2616 = 5 for _, b := range yyq2616 { if b { yynn2616++ @@ -33135,40 +33139,60 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2616 || yy2arr2616 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2624 := z.EncBinary() - _ = yym2624 - if false { + if x.LabelSelector == nil { + r.EncodeNil() } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Container)) + yym2624 := z.EncBinary() + _ = yym2624 + if false { + } else if z.HasExtensions() && z.EncExt(x.LabelSelector) { + } else { + z.EncFallback(x.LabelSelector) + } } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("Container")) + r.EncodeString(codecSelferC_UTF81234, string("LabelSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2625 := z.EncBinary() - _ = yym2625 - if false { + if x.LabelSelector == nil { + r.EncodeNil() } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Container)) + yym2625 := z.EncBinary() + _ = yym2625 + if false { + } else if z.HasExtensions() && z.EncExt(x.LabelSelector) { + } else { + z.EncFallback(x.LabelSelector) + } } } if yyr2616 || yy2arr2616 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2627 := z.EncBinary() - _ = yym2627 - if false { + if x.FieldSelector == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Follow)) + yym2627 := z.EncBinary() + _ = yym2627 + if false { + } else if z.HasExtensions() && z.EncExt(x.FieldSelector) { + } else { + z.EncFallback(x.FieldSelector) + } } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("Follow")) + r.EncodeString(codecSelferC_UTF81234, string("FieldSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2628 := z.EncBinary() - _ = yym2628 - if false { + if x.FieldSelector == nil { + r.EncodeNil() } else { - r.EncodeBool(bool(x.Follow)) + yym2628 := z.EncBinary() + _ = yym2628 + if false { + } else if z.HasExtensions() && z.EncExt(x.FieldSelector) { + } else { + z.EncFallback(x.FieldSelector) + } } } if yyr2616 || yy2arr2616 { @@ -33177,159 +33201,64 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym2630 if false { } else { - r.EncodeBool(bool(x.Previous)) + r.EncodeBool(bool(x.Watch)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("Previous")) + r.EncodeString(codecSelferC_UTF81234, string("Watch")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym2631 := z.EncBinary() _ = yym2631 if false { } else { - r.EncodeBool(bool(x.Previous)) + r.EncodeBool(bool(x.Watch)) } } if yyr2616 || yy2arr2616 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if x.SinceSeconds == nil { - r.EncodeNil() + yym2633 := z.EncBinary() + _ = yym2633 + if false { } else { - yy2633 := *x.SinceSeconds - yym2634 := z.EncBinary() - _ = yym2634 - if false { - } else { - r.EncodeInt(int64(yy2633)) - } + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("SinceSeconds")) + r.EncodeString(codecSelferC_UTF81234, string("ResourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.SinceSeconds == nil { - r.EncodeNil() + yym2634 := z.EncBinary() + _ = yym2634 + if false { } else { - yy2635 := *x.SinceSeconds - yym2636 := z.EncBinary() - _ = yym2636 - if false { - } else { - r.EncodeInt(int64(yy2635)) - } + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } if yyr2616 || yy2arr2616 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if x.SinceTime == nil { + if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yym2638 := z.EncBinary() - _ = yym2638 + yy2636 := *x.TimeoutSeconds + yym2637 := z.EncBinary() + _ = yym2637 if false { - } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym2638 { - z.EncBinaryMarshal(x.SinceTime) - } else if !yym2638 && z.IsJSONHandle() { - z.EncJSONMarshal(x.SinceTime) } else { - z.EncFallback(x.SinceTime) + r.EncodeInt(int64(yy2636)) } } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("SinceTime")) + r.EncodeString(codecSelferC_UTF81234, string("TimeoutSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.SinceTime == nil { + if x.TimeoutSeconds == nil { r.EncodeNil() } else { + yy2638 := *x.TimeoutSeconds yym2639 := z.EncBinary() _ = yym2639 if false { - } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym2639 { - z.EncBinaryMarshal(x.SinceTime) - } else if !yym2639 && z.IsJSONHandle() { - z.EncJSONMarshal(x.SinceTime) } else { - z.EncFallback(x.SinceTime) - } - } - } - if yyr2616 || yy2arr2616 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2641 := z.EncBinary() - _ = yym2641 - if false { - } else { - r.EncodeBool(bool(x.Timestamps)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("Timestamps")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2642 := z.EncBinary() - _ = yym2642 - if false { - } else { - r.EncodeBool(bool(x.Timestamps)) - } - } - if yyr2616 || yy2arr2616 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if x.TailLines == nil { - r.EncodeNil() - } else { - yy2644 := *x.TailLines - yym2645 := z.EncBinary() - _ = yym2645 - if false { - } else { - r.EncodeInt(int64(yy2644)) - } - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("TailLines")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.TailLines == nil { - r.EncodeNil() - } else { - yy2646 := *x.TailLines - yym2647 := z.EncBinary() - _ = yym2647 - if false { - } else { - r.EncodeInt(int64(yy2646)) - } - } - } - if yyr2616 || yy2arr2616 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if x.LimitBytes == nil { - r.EncodeNil() - } else { - yy2649 := *x.LimitBytes - yym2650 := z.EncBinary() - _ = yym2650 - if false { - } else { - r.EncodeInt(int64(yy2649)) - } - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("LimitBytes")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.LimitBytes == nil { - r.EncodeNil() - } else { - yy2651 := *x.LimitBytes - yym2652 := z.EncBinary() - _ = yym2652 - if false { - } else { - r.EncodeInt(int64(yy2651)) + r.EncodeInt(int64(yy2638)) } } } @@ -33342,29 +33271,604 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } +func (x *ListOptions) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym2640 := z.DecBinary() + _ = yym2640 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct2641 := r.ContainerType() + if yyct2641 == codecSelferValueTypeMap1234 { + yyl2641 := r.ReadMapStart() + if yyl2641 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl2641, d) + } + } else if yyct2641 == codecSelferValueTypeArray1234 { + yyl2641 := r.ReadArrayStart() + if yyl2641 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl2641, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys2642Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2642Slc + var yyhl2642 bool = l >= 0 + for yyj2642 := 0; ; yyj2642++ { + if yyhl2642 { + if yyj2642 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys2642Slc = r.DecodeBytes(yys2642Slc, true, true) + yys2642 := string(yys2642Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys2642 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "LabelSelector": + if r.TryDecodeAsNil() { + x.LabelSelector = nil + } else { + yyv2645 := &x.LabelSelector + yym2646 := z.DecBinary() + _ = yym2646 + if false { + } else if z.HasExtensions() && z.DecExt(yyv2645) { + } else { + z.DecFallback(yyv2645, true) + } + } + case "FieldSelector": + if r.TryDecodeAsNil() { + x.FieldSelector = nil + } else { + yyv2647 := &x.FieldSelector + yym2648 := z.DecBinary() + _ = yym2648 + if false { + } else if z.HasExtensions() && z.DecExt(yyv2647) { + } else { + z.DecFallback(yyv2647, true) + } + } + case "Watch": + if r.TryDecodeAsNil() { + x.Watch = false + } else { + x.Watch = bool(r.DecodeBool()) + } + case "ResourceVersion": + if r.TryDecodeAsNil() { + x.ResourceVersion = "" + } else { + x.ResourceVersion = string(r.DecodeString()) + } + case "TimeoutSeconds": + if r.TryDecodeAsNil() { + if x.TimeoutSeconds != nil { + x.TimeoutSeconds = nil + } + } else { + if x.TimeoutSeconds == nil { + x.TimeoutSeconds = new(int64) + } + yym2652 := z.DecBinary() + _ = yym2652 + if false { + } else { + *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) + } + } + default: + z.DecStructFieldNotFound(-1, yys2642) + } // end switch yys2642 + } // end for yyj2642 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj2653 int + var yyb2653 bool + var yyhl2653 bool = l >= 0 + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.LabelSelector = nil + } else { + yyv2656 := &x.LabelSelector + yym2657 := z.DecBinary() + _ = yym2657 + if false { + } else if z.HasExtensions() && z.DecExt(yyv2656) { + } else { + z.DecFallback(yyv2656, true) + } + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.FieldSelector = nil + } else { + yyv2658 := &x.FieldSelector + yym2659 := z.DecBinary() + _ = yym2659 + if false { + } else if z.HasExtensions() && z.DecExt(yyv2658) { + } else { + z.DecFallback(yyv2658, true) + } + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Watch = false + } else { + x.Watch = bool(r.DecodeBool()) + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ResourceVersion = "" + } else { + x.ResourceVersion = string(r.DecodeString()) + } + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.TimeoutSeconds != nil { + x.TimeoutSeconds = nil + } + } else { + if x.TimeoutSeconds == nil { + x.TimeoutSeconds = new(int64) + } + yym2663 := z.DecBinary() + _ = yym2663 + if false { + } else { + *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) + } + } + for { + yyj2653++ + if yyhl2653 { + yyb2653 = yyj2653 > l + } else { + yyb2653 = r.CheckBreak() + } + if yyb2653 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj2653-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym2664 := z.EncBinary() + _ = yym2664 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep2665 := !z.EncBinary() + yy2arr2665 := z.EncBasicHandle().StructToArray + var yyq2665 [10]bool + _, _, _ = yysep2665, yyq2665, yy2arr2665 + const yyr2665 bool = false + yyq2665[0] = x.Kind != "" + yyq2665[1] = x.APIVersion != "" + var yynn2665 int + if yyr2665 || yy2arr2665 { + r.EncodeArrayStart(10) + } else { + yynn2665 = 8 + for _, b := range yyq2665 { + if b { + yynn2665++ + } + } + r.EncodeMapStart(yynn2665) + yynn2665 = 0 + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2665[0] { + yym2667 := z.EncBinary() + _ = yym2667 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2665[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("kind")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2668 := z.EncBinary() + _ = yym2668 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq2665[1] { + yym2670 := z.EncBinary() + _ = yym2670 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq2665[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2671 := z.EncBinary() + _ = yym2671 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym2673 := z.EncBinary() + _ = yym2673 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Container)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("Container")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2674 := z.EncBinary() + _ = yym2674 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Container)) + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym2676 := z.EncBinary() + _ = yym2676 + if false { + } else { + r.EncodeBool(bool(x.Follow)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("Follow")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2677 := z.EncBinary() + _ = yym2677 + if false { + } else { + r.EncodeBool(bool(x.Follow)) + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym2679 := z.EncBinary() + _ = yym2679 + if false { + } else { + r.EncodeBool(bool(x.Previous)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("Previous")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2680 := z.EncBinary() + _ = yym2680 + if false { + } else { + r.EncodeBool(bool(x.Previous)) + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if x.SinceSeconds == nil { + r.EncodeNil() + } else { + yy2682 := *x.SinceSeconds + yym2683 := z.EncBinary() + _ = yym2683 + if false { + } else { + r.EncodeInt(int64(yy2682)) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("SinceSeconds")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.SinceSeconds == nil { + r.EncodeNil() + } else { + yy2684 := *x.SinceSeconds + yym2685 := z.EncBinary() + _ = yym2685 + if false { + } else { + r.EncodeInt(int64(yy2684)) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if x.SinceTime == nil { + r.EncodeNil() + } else { + yym2687 := z.EncBinary() + _ = yym2687 + if false { + } else if z.HasExtensions() && z.EncExt(x.SinceTime) { + } else if yym2687 { + z.EncBinaryMarshal(x.SinceTime) + } else if !yym2687 && z.IsJSONHandle() { + z.EncJSONMarshal(x.SinceTime) + } else { + z.EncFallback(x.SinceTime) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("SinceTime")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.SinceTime == nil { + r.EncodeNil() + } else { + yym2688 := z.EncBinary() + _ = yym2688 + if false { + } else if z.HasExtensions() && z.EncExt(x.SinceTime) { + } else if yym2688 { + z.EncBinaryMarshal(x.SinceTime) + } else if !yym2688 && z.IsJSONHandle() { + z.EncJSONMarshal(x.SinceTime) + } else { + z.EncFallback(x.SinceTime) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym2690 := z.EncBinary() + _ = yym2690 + if false { + } else { + r.EncodeBool(bool(x.Timestamps)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("Timestamps")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym2691 := z.EncBinary() + _ = yym2691 + if false { + } else { + r.EncodeBool(bool(x.Timestamps)) + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if x.TailLines == nil { + r.EncodeNil() + } else { + yy2693 := *x.TailLines + yym2694 := z.EncBinary() + _ = yym2694 + if false { + } else { + r.EncodeInt(int64(yy2693)) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("TailLines")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.TailLines == nil { + r.EncodeNil() + } else { + yy2695 := *x.TailLines + yym2696 := z.EncBinary() + _ = yym2696 + if false { + } else { + r.EncodeInt(int64(yy2695)) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if x.LimitBytes == nil { + r.EncodeNil() + } else { + yy2698 := *x.LimitBytes + yym2699 := z.EncBinary() + _ = yym2699 + if false { + } else { + r.EncodeInt(int64(yy2698)) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("LimitBytes")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.LimitBytes == nil { + r.EncodeNil() + } else { + yy2700 := *x.LimitBytes + yym2701 := z.EncBinary() + _ = yym2701 + if false { + } else { + r.EncodeInt(int64(yy2700)) + } + } + } + if yyr2665 || yy2arr2665 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + func (x *PodLogOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2653 := z.DecBinary() - _ = yym2653 + yym2702 := z.DecBinary() + _ = yym2702 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2654 := r.ContainerType() - if yyct2654 == codecSelferValueTypeMap1234 { - yyl2654 := r.ReadMapStart() - if yyl2654 == 0 { + yyct2703 := r.ContainerType() + if yyct2703 == codecSelferValueTypeMap1234 { + yyl2703 := r.ReadMapStart() + if yyl2703 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2654, d) + x.codecDecodeSelfFromMap(yyl2703, d) } - } else if yyct2654 == codecSelferValueTypeArray1234 { - yyl2654 := r.ReadArrayStart() - if yyl2654 == 0 { + } else if yyct2703 == codecSelferValueTypeArray1234 { + yyl2703 := r.ReadArrayStart() + if yyl2703 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2654, d) + x.codecDecodeSelfFromArray(yyl2703, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -33376,12 +33880,12 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2655Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2655Slc - var yyhl2655 bool = l >= 0 - for yyj2655 := 0; ; yyj2655++ { - if yyhl2655 { - if yyj2655 >= l { + var yys2704Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2704Slc + var yyhl2704 bool = l >= 0 + for yyj2704 := 0; ; yyj2704++ { + if yyhl2704 { + if yyj2704 >= l { break } } else { @@ -33390,10 +33894,10 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2655Slc = r.DecodeBytes(yys2655Slc, true, true) - yys2655 := string(yys2655Slc) + yys2704Slc = r.DecodeBytes(yys2704Slc, true, true) + yys2704 := string(yys2704Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2655 { + switch yys2704 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -33433,8 +33937,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym2662 := z.DecBinary() - _ = yym2662 + yym2711 := z.DecBinary() + _ = yym2711 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) @@ -33449,13 +33953,13 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.SinceTime == nil { x.SinceTime = new(pkg2_unversioned.Time) } - yym2664 := z.DecBinary() - _ = yym2664 + yym2713 := z.DecBinary() + _ = yym2713 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym2664 { + } else if yym2713 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym2664 && z.IsJSONHandle() { + } else if !yym2713 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) @@ -33476,8 +33980,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym2667 := z.DecBinary() - _ = yym2667 + yym2716 := z.DecBinary() + _ = yym2716 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) @@ -33492,17 +33996,17 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym2669 := z.DecBinary() - _ = yym2669 + yym2718 := z.DecBinary() + _ = yym2718 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys2655) - } // end switch yys2655 - } // end for yyj2655 + z.DecStructFieldNotFound(-1, yys2704) + } // end switch yys2704 + } // end for yyj2704 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -33510,16 +34014,16 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2670 int - var yyb2670 bool - var yyhl2670 bool = l >= 0 - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + var yyj2719 int + var yyb2719 bool + var yyhl2719 bool = l >= 0 + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33529,13 +34033,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33545,13 +34049,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33561,13 +34065,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33577,13 +34081,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Follow = bool(r.DecodeBool()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33593,13 +34097,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Previous = bool(r.DecodeBool()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33612,20 +34116,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym2677 := z.DecBinary() - _ = yym2677 + yym2726 := z.DecBinary() + _ = yym2726 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) } } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33638,25 +34142,25 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.SinceTime == nil { x.SinceTime = new(pkg2_unversioned.Time) } - yym2679 := z.DecBinary() - _ = yym2679 + yym2728 := z.DecBinary() + _ = yym2728 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym2679 { + } else if yym2728 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym2679 && z.IsJSONHandle() { + } else if !yym2728 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) } } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33666,13 +34170,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Timestamps = bool(r.DecodeBool()) } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33685,20 +34189,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym2682 := z.DecBinary() - _ = yym2682 + yym2731 := z.DecBinary() + _ = yym2731 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) } } - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -33711,25 +34215,25 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym2684 := z.DecBinary() - _ = yym2684 + yym2733 := z.DecBinary() + _ = yym2733 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } for { - yyj2670++ - if yyhl2670 { - yyb2670 = yyj2670 > l + yyj2719++ + if yyhl2719 { + yyb2719 = yyj2719 > l } else { - yyb2670 = r.CheckBreak() + yyb2719 = r.CheckBreak() } - if yyb2670 { + if yyb2719 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2670-1, "") + z.DecStructFieldNotFound(yyj2719-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -33741,41 +34245,41 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2685 := z.EncBinary() - _ = yym2685 + yym2734 := z.EncBinary() + _ = yym2734 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2686 := !z.EncBinary() - yy2arr2686 := z.EncBasicHandle().StructToArray - var yyq2686 [7]bool - _, _, _ = yysep2686, yyq2686, yy2arr2686 - const yyr2686 bool = false - yyq2686[0] = x.Kind != "" - yyq2686[1] = x.APIVersion != "" - yyq2686[2] = x.Stdin != false - yyq2686[3] = x.Stdout != false - yyq2686[4] = x.Stderr != false - yyq2686[5] = x.TTY != false - yyq2686[6] = x.Container != "" - var yynn2686 int - if yyr2686 || yy2arr2686 { + yysep2735 := !z.EncBinary() + yy2arr2735 := z.EncBasicHandle().StructToArray + var yyq2735 [7]bool + _, _, _ = yysep2735, yyq2735, yy2arr2735 + const yyr2735 bool = false + yyq2735[0] = x.Kind != "" + yyq2735[1] = x.APIVersion != "" + yyq2735[2] = x.Stdin != false + yyq2735[3] = x.Stdout != false + yyq2735[4] = x.Stderr != false + yyq2735[5] = x.TTY != false + yyq2735[6] = x.Container != "" + var yynn2735 int + if yyr2735 || yy2arr2735 { r.EncodeArrayStart(7) } else { - yynn2686 = 0 - for _, b := range yyq2686 { + yynn2735 = 0 + for _, b := range yyq2735 { if b { - yynn2686++ + yynn2735++ } } - r.EncodeMapStart(yynn2686) - yynn2686 = 0 + r.EncodeMapStart(yynn2735) + yynn2735 = 0 } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[0] { - yym2688 := z.EncBinary() - _ = yym2688 + if yyq2735[0] { + yym2737 := z.EncBinary() + _ = yym2737 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -33784,23 +34288,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2686[0] { + if yyq2735[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2689 := z.EncBinary() - _ = yym2689 + yym2738 := z.EncBinary() + _ = yym2738 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[1] { - yym2691 := z.EncBinary() - _ = yym2691 + if yyq2735[1] { + yym2740 := z.EncBinary() + _ = yym2740 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -33809,23 +34313,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2686[1] { + if yyq2735[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2692 := z.EncBinary() - _ = yym2692 + yym2741 := z.EncBinary() + _ = yym2741 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[2] { - yym2694 := z.EncBinary() - _ = yym2694 + if yyq2735[2] { + yym2743 := z.EncBinary() + _ = yym2743 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -33834,23 +34338,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq2686[2] { + if yyq2735[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2695 := z.EncBinary() - _ = yym2695 + yym2744 := z.EncBinary() + _ = yym2744 if false { } else { r.EncodeBool(bool(x.Stdin)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[3] { - yym2697 := z.EncBinary() - _ = yym2697 + if yyq2735[3] { + yym2746 := z.EncBinary() + _ = yym2746 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -33859,23 +34363,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq2686[3] { + if yyq2735[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2698 := z.EncBinary() - _ = yym2698 + yym2747 := z.EncBinary() + _ = yym2747 if false { } else { r.EncodeBool(bool(x.Stdout)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[4] { - yym2700 := z.EncBinary() - _ = yym2700 + if yyq2735[4] { + yym2749 := z.EncBinary() + _ = yym2749 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -33884,23 +34388,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq2686[4] { + if yyq2735[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2701 := z.EncBinary() - _ = yym2701 + yym2750 := z.EncBinary() + _ = yym2750 if false { } else { r.EncodeBool(bool(x.Stderr)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[5] { - yym2703 := z.EncBinary() - _ = yym2703 + if yyq2735[5] { + yym2752 := z.EncBinary() + _ = yym2752 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -33909,23 +34413,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq2686[5] { + if yyq2735[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tty")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2704 := z.EncBinary() - _ = yym2704 + yym2753 := z.EncBinary() + _ = yym2753 if false { } else { r.EncodeBool(bool(x.TTY)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2686[6] { - yym2706 := z.EncBinary() - _ = yym2706 + if yyq2735[6] { + yym2755 := z.EncBinary() + _ = yym2755 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -33934,19 +34438,19 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2686[6] { + if yyq2735[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2707 := z.EncBinary() - _ = yym2707 + yym2756 := z.EncBinary() + _ = yym2756 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } } - if yyr2686 || yy2arr2686 { + if yyr2735 || yy2arr2735 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -33959,25 +34463,25 @@ func (x *PodAttachOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2708 := z.DecBinary() - _ = yym2708 + yym2757 := z.DecBinary() + _ = yym2757 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2709 := r.ContainerType() - if yyct2709 == codecSelferValueTypeMap1234 { - yyl2709 := r.ReadMapStart() - if yyl2709 == 0 { + yyct2758 := r.ContainerType() + if yyct2758 == codecSelferValueTypeMap1234 { + yyl2758 := r.ReadMapStart() + if yyl2758 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2709, d) + x.codecDecodeSelfFromMap(yyl2758, d) } - } else if yyct2709 == codecSelferValueTypeArray1234 { - yyl2709 := r.ReadArrayStart() - if yyl2709 == 0 { + } else if yyct2758 == codecSelferValueTypeArray1234 { + yyl2758 := r.ReadArrayStart() + if yyl2758 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2709, d) + x.codecDecodeSelfFromArray(yyl2758, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -33989,12 +34493,12 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2710Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2710Slc - var yyhl2710 bool = l >= 0 - for yyj2710 := 0; ; yyj2710++ { - if yyhl2710 { - if yyj2710 >= l { + var yys2759Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2759Slc + var yyhl2759 bool = l >= 0 + for yyj2759 := 0; ; yyj2759++ { + if yyhl2759 { + if yyj2759 >= l { break } } else { @@ -34003,10 +34507,10 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2710Slc = r.DecodeBytes(yys2710Slc, true, true) - yys2710 := string(yys2710Slc) + yys2759Slc = r.DecodeBytes(yys2759Slc, true, true) + yys2759 := string(yys2759Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2710 { + switch yys2759 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -34050,9 +34554,9 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Container = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2710) - } // end switch yys2710 - } // end for yyj2710 + z.DecStructFieldNotFound(-1, yys2759) + } // end switch yys2759 + } // end for yyj2759 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -34060,16 +34564,16 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2718 int - var yyb2718 bool - var yyhl2718 bool = l >= 0 - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + var yyj2767 int + var yyb2767 bool + var yyhl2767 bool = l >= 0 + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34079,13 +34583,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34095,13 +34599,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34111,13 +34615,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdin = bool(r.DecodeBool()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34127,13 +34631,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdout = bool(r.DecodeBool()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34143,13 +34647,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stderr = bool(r.DecodeBool()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34159,13 +34663,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.TTY = bool(r.DecodeBool()) } - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34176,17 +34680,17 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Container = string(r.DecodeString()) } for { - yyj2718++ - if yyhl2718 { - yyb2718 = yyj2718 > l + yyj2767++ + if yyhl2767 { + yyb2767 = yyj2767 > l } else { - yyb2718 = r.CheckBreak() + yyb2767 = r.CheckBreak() } - if yyb2718 { + if yyb2767 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2718-1, "") + z.DecStructFieldNotFound(yyj2767-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -34198,36 +34702,36 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2726 := z.EncBinary() - _ = yym2726 + yym2775 := z.EncBinary() + _ = yym2775 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2727 := !z.EncBinary() - yy2arr2727 := z.EncBasicHandle().StructToArray - var yyq2727 [8]bool - _, _, _ = yysep2727, yyq2727, yy2arr2727 - const yyr2727 bool = false - yyq2727[0] = x.Kind != "" - yyq2727[1] = x.APIVersion != "" - var yynn2727 int - if yyr2727 || yy2arr2727 { + yysep2776 := !z.EncBinary() + yy2arr2776 := z.EncBasicHandle().StructToArray + var yyq2776 [8]bool + _, _, _ = yysep2776, yyq2776, yy2arr2776 + const yyr2776 bool = false + yyq2776[0] = x.Kind != "" + yyq2776[1] = x.APIVersion != "" + var yynn2776 int + if yyr2776 || yy2arr2776 { r.EncodeArrayStart(8) } else { - yynn2727 = 6 - for _, b := range yyq2727 { + yynn2776 = 6 + for _, b := range yyq2776 { if b { - yynn2727++ + yynn2776++ } } - r.EncodeMapStart(yynn2727) - yynn2727 = 0 + r.EncodeMapStart(yynn2776) + yynn2776 = 0 } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2727[0] { - yym2729 := z.EncBinary() - _ = yym2729 + if yyq2776[0] { + yym2778 := z.EncBinary() + _ = yym2778 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -34236,23 +34740,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2727[0] { + if yyq2776[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2730 := z.EncBinary() - _ = yym2730 + yym2779 := z.EncBinary() + _ = yym2779 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2727[1] { - yym2732 := z.EncBinary() - _ = yym2732 + if yyq2776[1] { + yym2781 := z.EncBinary() + _ = yym2781 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -34261,22 +34765,22 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2727[1] { + if yyq2776[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2733 := z.EncBinary() - _ = yym2733 + yym2782 := z.EncBinary() + _ = yym2782 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2735 := z.EncBinary() - _ = yym2735 + yym2784 := z.EncBinary() + _ = yym2784 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -34285,17 +34789,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2736 := z.EncBinary() - _ = yym2736 + yym2785 := z.EncBinary() + _ = yym2785 if false { } else { r.EncodeBool(bool(x.Stdin)) } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2738 := z.EncBinary() - _ = yym2738 + yym2787 := z.EncBinary() + _ = yym2787 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -34304,17 +34808,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2739 := z.EncBinary() - _ = yym2739 + yym2788 := z.EncBinary() + _ = yym2788 if false { } else { r.EncodeBool(bool(x.Stdout)) } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2741 := z.EncBinary() - _ = yym2741 + yym2790 := z.EncBinary() + _ = yym2790 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -34323,17 +34827,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2742 := z.EncBinary() - _ = yym2742 + yym2791 := z.EncBinary() + _ = yym2791 if false { } else { r.EncodeBool(bool(x.Stderr)) } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2744 := z.EncBinary() - _ = yym2744 + yym2793 := z.EncBinary() + _ = yym2793 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -34342,17 +34846,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("TTY")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2745 := z.EncBinary() - _ = yym2745 + yym2794 := z.EncBinary() + _ = yym2794 if false { } else { r.EncodeBool(bool(x.TTY)) } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2747 := z.EncBinary() - _ = yym2747 + yym2796 := z.EncBinary() + _ = yym2796 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -34361,20 +34865,20 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2748 := z.EncBinary() - _ = yym2748 + yym2797 := z.EncBinary() + _ = yym2797 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Command == nil { r.EncodeNil() } else { - yym2750 := z.EncBinary() - _ = yym2750 + yym2799 := z.EncBinary() + _ = yym2799 if false { } else { z.F.EncSliceStringV(x.Command, false, e) @@ -34387,15 +34891,15 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.Command == nil { r.EncodeNil() } else { - yym2751 := z.EncBinary() - _ = yym2751 + yym2800 := z.EncBinary() + _ = yym2800 if false { } else { z.F.EncSliceStringV(x.Command, false, e) } } } - if yyr2727 || yy2arr2727 { + if yyr2776 || yy2arr2776 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -34408,25 +34912,25 @@ func (x *PodExecOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2752 := z.DecBinary() - _ = yym2752 + yym2801 := z.DecBinary() + _ = yym2801 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2753 := r.ContainerType() - if yyct2753 == codecSelferValueTypeMap1234 { - yyl2753 := r.ReadMapStart() - if yyl2753 == 0 { + yyct2802 := r.ContainerType() + if yyct2802 == codecSelferValueTypeMap1234 { + yyl2802 := r.ReadMapStart() + if yyl2802 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2753, d) + x.codecDecodeSelfFromMap(yyl2802, d) } - } else if yyct2753 == codecSelferValueTypeArray1234 { - yyl2753 := r.ReadArrayStart() - if yyl2753 == 0 { + } else if yyct2802 == codecSelferValueTypeArray1234 { + yyl2802 := r.ReadArrayStart() + if yyl2802 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2753, d) + x.codecDecodeSelfFromArray(yyl2802, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -34438,12 +34942,12 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2754Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2754Slc - var yyhl2754 bool = l >= 0 - for yyj2754 := 0; ; yyj2754++ { - if yyhl2754 { - if yyj2754 >= l { + var yys2803Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2803Slc + var yyhl2803 bool = l >= 0 + for yyj2803 := 0; ; yyj2803++ { + if yyhl2803 { + if yyj2803 >= l { break } } else { @@ -34452,10 +34956,10 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2754Slc = r.DecodeBytes(yys2754Slc, true, true) - yys2754 := string(yys2754Slc) + yys2803Slc = r.DecodeBytes(yys2803Slc, true, true) + yys2803 := string(yys2803Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2754 { + switch yys2803 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -34502,18 +35006,18 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv2762 := &x.Command - yym2763 := z.DecBinary() - _ = yym2763 + yyv2811 := &x.Command + yym2812 := z.DecBinary() + _ = yym2812 if false { } else { - z.F.DecSliceStringX(yyv2762, false, d) + z.F.DecSliceStringX(yyv2811, false, d) } } default: - z.DecStructFieldNotFound(-1, yys2754) - } // end switch yys2754 - } // end for yyj2754 + z.DecStructFieldNotFound(-1, yys2803) + } // end switch yys2803 + } // end for yyj2803 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -34521,16 +35025,16 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2764 int - var yyb2764 bool - var yyhl2764 bool = l >= 0 - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + var yyj2813 int + var yyb2813 bool + var yyhl2813 bool = l >= 0 + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34540,13 +35044,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34556,13 +35060,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34572,13 +35076,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdin = bool(r.DecodeBool()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34588,13 +35092,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdout = bool(r.DecodeBool()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34604,13 +35108,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stderr = bool(r.DecodeBool()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34620,13 +35124,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.TTY = bool(r.DecodeBool()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34636,13 +35140,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34650,26 +35154,26 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv2772 := &x.Command - yym2773 := z.DecBinary() - _ = yym2773 + yyv2821 := &x.Command + yym2822 := z.DecBinary() + _ = yym2822 if false { } else { - z.F.DecSliceStringX(yyv2772, false, d) + z.F.DecSliceStringX(yyv2821, false, d) } } for { - yyj2764++ - if yyhl2764 { - yyb2764 = yyj2764 > l + yyj2813++ + if yyhl2813 { + yyb2813 = yyj2813 > l } else { - yyb2764 = r.CheckBreak() + yyb2813 = r.CheckBreak() } - if yyb2764 { + if yyb2813 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2764-1, "") + z.DecStructFieldNotFound(yyj2813-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -34681,36 +35185,36 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2774 := z.EncBinary() - _ = yym2774 + yym2823 := z.EncBinary() + _ = yym2823 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2775 := !z.EncBinary() - yy2arr2775 := z.EncBasicHandle().StructToArray - var yyq2775 [3]bool - _, _, _ = yysep2775, yyq2775, yy2arr2775 - const yyr2775 bool = false - yyq2775[0] = x.Kind != "" - yyq2775[1] = x.APIVersion != "" - var yynn2775 int - if yyr2775 || yy2arr2775 { + yysep2824 := !z.EncBinary() + yy2arr2824 := z.EncBasicHandle().StructToArray + var yyq2824 [3]bool + _, _, _ = yysep2824, yyq2824, yy2arr2824 + const yyr2824 bool = false + yyq2824[0] = x.Kind != "" + yyq2824[1] = x.APIVersion != "" + var yynn2824 int + if yyr2824 || yy2arr2824 { r.EncodeArrayStart(3) } else { - yynn2775 = 1 - for _, b := range yyq2775 { + yynn2824 = 1 + for _, b := range yyq2824 { if b { - yynn2775++ + yynn2824++ } } - r.EncodeMapStart(yynn2775) - yynn2775 = 0 + r.EncodeMapStart(yynn2824) + yynn2824 = 0 } - if yyr2775 || yy2arr2775 { + if yyr2824 || yy2arr2824 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2775[0] { - yym2777 := z.EncBinary() - _ = yym2777 + if yyq2824[0] { + yym2826 := z.EncBinary() + _ = yym2826 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -34719,23 +35223,23 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2775[0] { + if yyq2824[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2778 := z.EncBinary() - _ = yym2778 + yym2827 := z.EncBinary() + _ = yym2827 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2775 || yy2arr2775 { + if yyr2824 || yy2arr2824 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2775[1] { - yym2780 := z.EncBinary() - _ = yym2780 + if yyq2824[1] { + yym2829 := z.EncBinary() + _ = yym2829 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -34744,22 +35248,22 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2775[1] { + if yyq2824[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2781 := z.EncBinary() - _ = yym2781 + yym2830 := z.EncBinary() + _ = yym2830 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2775 || yy2arr2775 { + if yyr2824 || yy2arr2824 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2783 := z.EncBinary() - _ = yym2783 + yym2832 := z.EncBinary() + _ = yym2832 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -34768,14 +35272,14 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2784 := z.EncBinary() - _ = yym2784 + yym2833 := z.EncBinary() + _ = yym2833 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } - if yyr2775 || yy2arr2775 { + if yyr2824 || yy2arr2824 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -34788,25 +35292,25 @@ func (x *PodProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2785 := z.DecBinary() - _ = yym2785 + yym2834 := z.DecBinary() + _ = yym2834 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2786 := r.ContainerType() - if yyct2786 == codecSelferValueTypeMap1234 { - yyl2786 := r.ReadMapStart() - if yyl2786 == 0 { + yyct2835 := r.ContainerType() + if yyct2835 == codecSelferValueTypeMap1234 { + yyl2835 := r.ReadMapStart() + if yyl2835 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2786, d) + x.codecDecodeSelfFromMap(yyl2835, d) } - } else if yyct2786 == codecSelferValueTypeArray1234 { - yyl2786 := r.ReadArrayStart() - if yyl2786 == 0 { + } else if yyct2835 == codecSelferValueTypeArray1234 { + yyl2835 := r.ReadArrayStart() + if yyl2835 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2786, d) + x.codecDecodeSelfFromArray(yyl2835, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -34818,12 +35322,12 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2787Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2787Slc - var yyhl2787 bool = l >= 0 - for yyj2787 := 0; ; yyj2787++ { - if yyhl2787 { - if yyj2787 >= l { + var yys2836Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2836Slc + var yyhl2836 bool = l >= 0 + for yyj2836 := 0; ; yyj2836++ { + if yyhl2836 { + if yyj2836 >= l { break } } else { @@ -34832,10 +35336,10 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2787Slc = r.DecodeBytes(yys2787Slc, true, true) - yys2787 := string(yys2787Slc) + yys2836Slc = r.DecodeBytes(yys2836Slc, true, true) + yys2836 := string(yys2836Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2787 { + switch yys2836 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -34855,9 +35359,9 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2787) - } // end switch yys2787 - } // end for yyj2787 + z.DecStructFieldNotFound(-1, yys2836) + } // end switch yys2836 + } // end for yyj2836 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -34865,16 +35369,16 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2791 int - var yyb2791 bool - var yyhl2791 bool = l >= 0 - yyj2791++ - if yyhl2791 { - yyb2791 = yyj2791 > l + var yyj2840 int + var yyb2840 bool + var yyhl2840 bool = l >= 0 + yyj2840++ + if yyhl2840 { + yyb2840 = yyj2840 > l } else { - yyb2791 = r.CheckBreak() + yyb2840 = r.CheckBreak() } - if yyb2791 { + if yyb2840 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34884,13 +35388,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj2791++ - if yyhl2791 { - yyb2791 = yyj2791 > l + yyj2840++ + if yyhl2840 { + yyb2840 = yyj2840 > l } else { - yyb2791 = r.CheckBreak() + yyb2840 = r.CheckBreak() } - if yyb2791 { + if yyb2840 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34900,13 +35404,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj2791++ - if yyhl2791 { - yyb2791 = yyj2791 > l + yyj2840++ + if yyhl2840 { + yyb2840 = yyj2840 > l } else { - yyb2791 = r.CheckBreak() + yyb2840 = r.CheckBreak() } - if yyb2791 { + if yyb2840 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -34917,17 +35421,17 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Path = string(r.DecodeString()) } for { - yyj2791++ - if yyhl2791 { - yyb2791 = yyj2791 > l + yyj2840++ + if yyhl2840 { + yyb2840 = yyj2840 > l } else { - yyb2791 = r.CheckBreak() + yyb2840 = r.CheckBreak() } - if yyb2791 { + if yyb2840 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2791-1, "") + z.DecStructFieldNotFound(yyj2840-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -34939,41 +35443,41 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2795 := z.EncBinary() - _ = yym2795 + yym2844 := z.EncBinary() + _ = yym2844 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2796 := !z.EncBinary() - yy2arr2796 := z.EncBasicHandle().StructToArray - var yyq2796 [7]bool - _, _, _ = yysep2796, yyq2796, yy2arr2796 - const yyr2796 bool = false - yyq2796[0] = x.Kind != "" - yyq2796[1] = x.Namespace != "" - yyq2796[2] = x.Name != "" - yyq2796[3] = x.UID != "" - yyq2796[4] = x.APIVersion != "" - yyq2796[5] = x.ResourceVersion != "" - yyq2796[6] = x.FieldPath != "" - var yynn2796 int - if yyr2796 || yy2arr2796 { + yysep2845 := !z.EncBinary() + yy2arr2845 := z.EncBasicHandle().StructToArray + var yyq2845 [7]bool + _, _, _ = yysep2845, yyq2845, yy2arr2845 + const yyr2845 bool = false + yyq2845[0] = x.Kind != "" + yyq2845[1] = x.Namespace != "" + yyq2845[2] = x.Name != "" + yyq2845[3] = x.UID != "" + yyq2845[4] = x.APIVersion != "" + yyq2845[5] = x.ResourceVersion != "" + yyq2845[6] = x.FieldPath != "" + var yynn2845 int + if yyr2845 || yy2arr2845 { r.EncodeArrayStart(7) } else { - yynn2796 = 0 - for _, b := range yyq2796 { + yynn2845 = 0 + for _, b := range yyq2845 { if b { - yynn2796++ + yynn2845++ } } - r.EncodeMapStart(yynn2796) - yynn2796 = 0 + r.EncodeMapStart(yynn2845) + yynn2845 = 0 } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[0] { - yym2798 := z.EncBinary() - _ = yym2798 + if yyq2845[0] { + yym2847 := z.EncBinary() + _ = yym2847 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -34982,23 +35486,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[0] { + if yyq2845[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2799 := z.EncBinary() - _ = yym2799 + yym2848 := z.EncBinary() + _ = yym2848 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[1] { - yym2801 := z.EncBinary() - _ = yym2801 + if yyq2845[1] { + yym2850 := z.EncBinary() + _ = yym2850 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) @@ -35007,23 +35511,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[1] { + if yyq2845[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("namespace")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2802 := z.EncBinary() - _ = yym2802 + yym2851 := z.EncBinary() + _ = yym2851 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[2] { - yym2804 := z.EncBinary() - _ = yym2804 + if yyq2845[2] { + yym2853 := z.EncBinary() + _ = yym2853 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -35032,23 +35536,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[2] { + if yyq2845[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2805 := z.EncBinary() - _ = yym2805 + yym2854 := z.EncBinary() + _ = yym2854 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[3] { - yym2807 := z.EncBinary() - _ = yym2807 + if yyq2845[3] { + yym2856 := z.EncBinary() + _ = yym2856 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -35058,12 +35562,12 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[3] { + if yyq2845[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("uid")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2808 := z.EncBinary() - _ = yym2808 + yym2857 := z.EncBinary() + _ = yym2857 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -35071,11 +35575,11 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[4] { - yym2810 := z.EncBinary() - _ = yym2810 + if yyq2845[4] { + yym2859 := z.EncBinary() + _ = yym2859 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -35084,23 +35588,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[4] { + if yyq2845[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2811 := z.EncBinary() - _ = yym2811 + yym2860 := z.EncBinary() + _ = yym2860 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[5] { - yym2813 := z.EncBinary() - _ = yym2813 + if yyq2845[5] { + yym2862 := z.EncBinary() + _ = yym2862 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) @@ -35109,23 +35613,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[5] { + if yyq2845[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2814 := z.EncBinary() - _ = yym2814 + yym2863 := z.EncBinary() + _ = yym2863 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2796[6] { - yym2816 := z.EncBinary() - _ = yym2816 + if yyq2845[6] { + yym2865 := z.EncBinary() + _ = yym2865 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) @@ -35134,19 +35638,19 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2796[6] { + if yyq2845[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fieldPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2817 := z.EncBinary() - _ = yym2817 + yym2866 := z.EncBinary() + _ = yym2866 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) } } } - if yyr2796 || yy2arr2796 { + if yyr2845 || yy2arr2845 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -35159,25 +35663,25 @@ func (x *ObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2818 := z.DecBinary() - _ = yym2818 + yym2867 := z.DecBinary() + _ = yym2867 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2819 := r.ContainerType() - if yyct2819 == codecSelferValueTypeMap1234 { - yyl2819 := r.ReadMapStart() - if yyl2819 == 0 { + yyct2868 := r.ContainerType() + if yyct2868 == codecSelferValueTypeMap1234 { + yyl2868 := r.ReadMapStart() + if yyl2868 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2819, d) + x.codecDecodeSelfFromMap(yyl2868, d) } - } else if yyct2819 == codecSelferValueTypeArray1234 { - yyl2819 := r.ReadArrayStart() - if yyl2819 == 0 { + } else if yyct2868 == codecSelferValueTypeArray1234 { + yyl2868 := r.ReadArrayStart() + if yyl2868 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2819, d) + x.codecDecodeSelfFromArray(yyl2868, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -35189,12 +35693,12 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2820Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2820Slc - var yyhl2820 bool = l >= 0 - for yyj2820 := 0; ; yyj2820++ { - if yyhl2820 { - if yyj2820 >= l { + var yys2869Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2869Slc + var yyhl2869 bool = l >= 0 + for yyj2869 := 0; ; yyj2869++ { + if yyhl2869 { + if yyj2869 >= l { break } } else { @@ -35203,10 +35707,10 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2820Slc = r.DecodeBytes(yys2820Slc, true, true) - yys2820 := string(yys2820Slc) + yys2869Slc = r.DecodeBytes(yys2869Slc, true, true) + yys2869 := string(yys2869Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2820 { + switch yys2869 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -35250,9 +35754,9 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.FieldPath = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2820) - } // end switch yys2820 - } // end for yyj2820 + z.DecStructFieldNotFound(-1, yys2869) + } // end switch yys2869 + } // end for yyj2869 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -35260,16 +35764,16 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2828 int - var yyb2828 bool - var yyhl2828 bool = l >= 0 - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + var yyj2877 int + var yyb2877 bool + var yyhl2877 bool = l >= 0 + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35279,13 +35783,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35295,13 +35799,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Namespace = string(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35311,13 +35815,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Name = string(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35327,13 +35831,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.UID = pkg1_types.UID(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35343,13 +35847,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35359,13 +35863,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ResourceVersion = string(r.DecodeString()) } - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35376,17 +35880,17 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.FieldPath = string(r.DecodeString()) } for { - yyj2828++ - if yyhl2828 { - yyb2828 = yyj2828 > l + yyj2877++ + if yyhl2877 { + yyb2877 = yyj2877 > l } else { - yyb2828 = r.CheckBreak() + yyb2877 = r.CheckBreak() } - if yyb2828 { + if yyb2877 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2828-1, "") + z.DecStructFieldNotFound(yyj2877-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -35398,33 +35902,33 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2836 := z.EncBinary() - _ = yym2836 + yym2885 := z.EncBinary() + _ = yym2885 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2837 := !z.EncBinary() - yy2arr2837 := z.EncBasicHandle().StructToArray - var yyq2837 [1]bool - _, _, _ = yysep2837, yyq2837, yy2arr2837 - const yyr2837 bool = false - var yynn2837 int - if yyr2837 || yy2arr2837 { + yysep2886 := !z.EncBinary() + yy2arr2886 := z.EncBasicHandle().StructToArray + var yyq2886 [1]bool + _, _, _ = yysep2886, yyq2886, yy2arr2886 + const yyr2886 bool = false + var yynn2886 int + if yyr2886 || yy2arr2886 { r.EncodeArrayStart(1) } else { - yynn2837 = 1 - for _, b := range yyq2837 { + yynn2886 = 1 + for _, b := range yyq2886 { if b { - yynn2837++ + yynn2886++ } } - r.EncodeMapStart(yynn2837) - yynn2837 = 0 + r.EncodeMapStart(yynn2886) + yynn2886 = 0 } - if yyr2837 || yy2arr2837 { + if yyr2886 || yy2arr2886 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym2839 := z.EncBinary() - _ = yym2839 + yym2888 := z.EncBinary() + _ = yym2888 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -35433,14 +35937,14 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2840 := z.EncBinary() - _ = yym2840 + yym2889 := z.EncBinary() + _ = yym2889 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } - if yyr2837 || yy2arr2837 { + if yyr2886 || yy2arr2886 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -35453,25 +35957,25 @@ func (x *LocalObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2841 := z.DecBinary() - _ = yym2841 + yym2890 := z.DecBinary() + _ = yym2890 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2842 := r.ContainerType() - if yyct2842 == codecSelferValueTypeMap1234 { - yyl2842 := r.ReadMapStart() - if yyl2842 == 0 { + yyct2891 := r.ContainerType() + if yyct2891 == codecSelferValueTypeMap1234 { + yyl2891 := r.ReadMapStart() + if yyl2891 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2842, d) + x.codecDecodeSelfFromMap(yyl2891, d) } - } else if yyct2842 == codecSelferValueTypeArray1234 { - yyl2842 := r.ReadArrayStart() - if yyl2842 == 0 { + } else if yyct2891 == codecSelferValueTypeArray1234 { + yyl2891 := r.ReadArrayStart() + if yyl2891 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2842, d) + x.codecDecodeSelfFromArray(yyl2891, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -35483,12 +35987,12 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2843Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2843Slc - var yyhl2843 bool = l >= 0 - for yyj2843 := 0; ; yyj2843++ { - if yyhl2843 { - if yyj2843 >= l { + var yys2892Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2892Slc + var yyhl2892 bool = l >= 0 + for yyj2892 := 0; ; yyj2892++ { + if yyhl2892 { + if yyj2892 >= l { break } } else { @@ -35497,10 +36001,10 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2843Slc = r.DecodeBytes(yys2843Slc, true, true) - yys2843 := string(yys2843Slc) + yys2892Slc = r.DecodeBytes(yys2892Slc, true, true) + yys2892 := string(yys2892Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2843 { + switch yys2892 { case "Name": if r.TryDecodeAsNil() { x.Name = "" @@ -35508,9 +36012,9 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.Name = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2843) - } // end switch yys2843 - } // end for yyj2843 + z.DecStructFieldNotFound(-1, yys2892) + } // end switch yys2892 + } // end for yyj2892 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -35518,16 +36022,16 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2845 int - var yyb2845 bool - var yyhl2845 bool = l >= 0 - yyj2845++ - if yyhl2845 { - yyb2845 = yyj2845 > l + var yyj2894 int + var yyb2894 bool + var yyhl2894 bool = l >= 0 + yyj2894++ + if yyhl2894 { + yyb2894 = yyj2894 > l } else { - yyb2845 = r.CheckBreak() + yyb2894 = r.CheckBreak() } - if yyb2845 { + if yyb2894 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35538,17 +36042,17 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.Name = string(r.DecodeString()) } for { - yyj2845++ - if yyhl2845 { - yyb2845 = yyj2845 > l + yyj2894++ + if yyhl2894 { + yyb2894 = yyj2894 > l } else { - yyb2845 = r.CheckBreak() + yyb2894 = r.CheckBreak() } - if yyb2845 { + if yyb2894 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2845-1, "") + z.DecStructFieldNotFound(yyj2894-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -35560,37 +36064,37 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2847 := z.EncBinary() - _ = yym2847 + yym2896 := z.EncBinary() + _ = yym2896 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2848 := !z.EncBinary() - yy2arr2848 := z.EncBasicHandle().StructToArray - var yyq2848 [3]bool - _, _, _ = yysep2848, yyq2848, yy2arr2848 - const yyr2848 bool = false - yyq2848[0] = x.Kind != "" - yyq2848[1] = x.APIVersion != "" - yyq2848[2] = true - var yynn2848 int - if yyr2848 || yy2arr2848 { + yysep2897 := !z.EncBinary() + yy2arr2897 := z.EncBasicHandle().StructToArray + var yyq2897 [3]bool + _, _, _ = yysep2897, yyq2897, yy2arr2897 + const yyr2897 bool = false + yyq2897[0] = x.Kind != "" + yyq2897[1] = x.APIVersion != "" + yyq2897[2] = true + var yynn2897 int + if yyr2897 || yy2arr2897 { r.EncodeArrayStart(3) } else { - yynn2848 = 0 - for _, b := range yyq2848 { + yynn2897 = 0 + for _, b := range yyq2897 { if b { - yynn2848++ + yynn2897++ } } - r.EncodeMapStart(yynn2848) - yynn2848 = 0 + r.EncodeMapStart(yynn2897) + yynn2897 = 0 } - if yyr2848 || yy2arr2848 { + if yyr2897 || yy2arr2897 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2848[0] { - yym2850 := z.EncBinary() - _ = yym2850 + if yyq2897[0] { + yym2899 := z.EncBinary() + _ = yym2899 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -35599,23 +36103,23 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2848[0] { + if yyq2897[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2851 := z.EncBinary() - _ = yym2851 + yym2900 := z.EncBinary() + _ = yym2900 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2848 || yy2arr2848 { + if yyr2897 || yy2arr2897 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2848[1] { - yym2853 := z.EncBinary() - _ = yym2853 + if yyq2897[1] { + yym2902 := z.EncBinary() + _ = yym2902 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -35624,36 +36128,36 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2848[1] { + if yyq2897[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2854 := z.EncBinary() - _ = yym2854 + yym2903 := z.EncBinary() + _ = yym2903 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2848 || yy2arr2848 { + if yyr2897 || yy2arr2897 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2848[2] { - yy2856 := &x.Reference - yy2856.CodecEncodeSelf(e) + if yyq2897[2] { + yy2905 := &x.Reference + yy2905.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq2848[2] { + if yyq2897[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reference")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2857 := &x.Reference - yy2857.CodecEncodeSelf(e) + yy2906 := &x.Reference + yy2906.CodecEncodeSelf(e) } } - if yyr2848 || yy2arr2848 { + if yyr2897 || yy2arr2897 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -35666,25 +36170,25 @@ func (x *SerializedReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2858 := z.DecBinary() - _ = yym2858 + yym2907 := z.DecBinary() + _ = yym2907 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2859 := r.ContainerType() - if yyct2859 == codecSelferValueTypeMap1234 { - yyl2859 := r.ReadMapStart() - if yyl2859 == 0 { + yyct2908 := r.ContainerType() + if yyct2908 == codecSelferValueTypeMap1234 { + yyl2908 := r.ReadMapStart() + if yyl2908 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2859, d) + x.codecDecodeSelfFromMap(yyl2908, d) } - } else if yyct2859 == codecSelferValueTypeArray1234 { - yyl2859 := r.ReadArrayStart() - if yyl2859 == 0 { + } else if yyct2908 == codecSelferValueTypeArray1234 { + yyl2908 := r.ReadArrayStart() + if yyl2908 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2859, d) + x.codecDecodeSelfFromArray(yyl2908, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -35696,12 +36200,12 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2860Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2860Slc - var yyhl2860 bool = l >= 0 - for yyj2860 := 0; ; yyj2860++ { - if yyhl2860 { - if yyj2860 >= l { + var yys2909Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2909Slc + var yyhl2909 bool = l >= 0 + for yyj2909 := 0; ; yyj2909++ { + if yyhl2909 { + if yyj2909 >= l { break } } else { @@ -35710,10 +36214,10 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2860Slc = r.DecodeBytes(yys2860Slc, true, true) - yys2860 := string(yys2860Slc) + yys2909Slc = r.DecodeBytes(yys2909Slc, true, true) + yys2909 := string(yys2909Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2860 { + switch yys2909 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -35730,13 +36234,13 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv2863 := &x.Reference - yyv2863.CodecDecodeSelf(d) + yyv2912 := &x.Reference + yyv2912.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys2860) - } // end switch yys2860 - } // end for yyj2860 + z.DecStructFieldNotFound(-1, yys2909) + } // end switch yys2909 + } // end for yyj2909 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -35744,16 +36248,16 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2864 int - var yyb2864 bool - var yyhl2864 bool = l >= 0 - yyj2864++ - if yyhl2864 { - yyb2864 = yyj2864 > l + var yyj2913 int + var yyb2913 bool + var yyhl2913 bool = l >= 0 + yyj2913++ + if yyhl2913 { + yyb2913 = yyj2913 > l } else { - yyb2864 = r.CheckBreak() + yyb2913 = r.CheckBreak() } - if yyb2864 { + if yyb2913 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35763,13 +36267,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj2864++ - if yyhl2864 { - yyb2864 = yyj2864 > l + yyj2913++ + if yyhl2913 { + yyb2913 = yyj2913 > l } else { - yyb2864 = r.CheckBreak() + yyb2913 = r.CheckBreak() } - if yyb2864 { + if yyb2913 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35779,13 +36283,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj2864++ - if yyhl2864 { - yyb2864 = yyj2864 > l + yyj2913++ + if yyhl2913 { + yyb2913 = yyj2913 > l } else { - yyb2864 = r.CheckBreak() + yyb2913 = r.CheckBreak() } - if yyb2864 { + if yyb2913 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35793,21 +36297,21 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv2867 := &x.Reference - yyv2867.CodecDecodeSelf(d) + yyv2916 := &x.Reference + yyv2916.CodecDecodeSelf(d) } for { - yyj2864++ - if yyhl2864 { - yyb2864 = yyj2864 > l + yyj2913++ + if yyhl2913 { + yyb2913 = yyj2913 > l } else { - yyb2864 = r.CheckBreak() + yyb2913 = r.CheckBreak() } - if yyb2864 { + if yyb2913 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2864-1, "") + z.DecStructFieldNotFound(yyj2913-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -35819,36 +36323,36 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2868 := z.EncBinary() - _ = yym2868 + yym2917 := z.EncBinary() + _ = yym2917 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2869 := !z.EncBinary() - yy2arr2869 := z.EncBasicHandle().StructToArray - var yyq2869 [2]bool - _, _, _ = yysep2869, yyq2869, yy2arr2869 - const yyr2869 bool = false - yyq2869[0] = x.Component != "" - yyq2869[1] = x.Host != "" - var yynn2869 int - if yyr2869 || yy2arr2869 { + yysep2918 := !z.EncBinary() + yy2arr2918 := z.EncBasicHandle().StructToArray + var yyq2918 [2]bool + _, _, _ = yysep2918, yyq2918, yy2arr2918 + const yyr2918 bool = false + yyq2918[0] = x.Component != "" + yyq2918[1] = x.Host != "" + var yynn2918 int + if yyr2918 || yy2arr2918 { r.EncodeArrayStart(2) } else { - yynn2869 = 0 - for _, b := range yyq2869 { + yynn2918 = 0 + for _, b := range yyq2918 { if b { - yynn2869++ + yynn2918++ } } - r.EncodeMapStart(yynn2869) - yynn2869 = 0 + r.EncodeMapStart(yynn2918) + yynn2918 = 0 } - if yyr2869 || yy2arr2869 { + if yyr2918 || yy2arr2918 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2869[0] { - yym2871 := z.EncBinary() - _ = yym2871 + if yyq2918[0] { + yym2920 := z.EncBinary() + _ = yym2920 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) @@ -35857,23 +36361,23 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2869[0] { + if yyq2918[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("component")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2872 := z.EncBinary() - _ = yym2872 + yym2921 := z.EncBinary() + _ = yym2921 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) } } } - if yyr2869 || yy2arr2869 { + if yyr2918 || yy2arr2918 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2869[1] { - yym2874 := z.EncBinary() - _ = yym2874 + if yyq2918[1] { + yym2923 := z.EncBinary() + _ = yym2923 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) @@ -35882,19 +36386,19 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2869[1] { + if yyq2918[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("host")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2875 := z.EncBinary() - _ = yym2875 + yym2924 := z.EncBinary() + _ = yym2924 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) } } } - if yyr2869 || yy2arr2869 { + if yyr2918 || yy2arr2918 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -35907,25 +36411,25 @@ func (x *EventSource) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2876 := z.DecBinary() - _ = yym2876 + yym2925 := z.DecBinary() + _ = yym2925 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2877 := r.ContainerType() - if yyct2877 == codecSelferValueTypeMap1234 { - yyl2877 := r.ReadMapStart() - if yyl2877 == 0 { + yyct2926 := r.ContainerType() + if yyct2926 == codecSelferValueTypeMap1234 { + yyl2926 := r.ReadMapStart() + if yyl2926 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2877, d) + x.codecDecodeSelfFromMap(yyl2926, d) } - } else if yyct2877 == codecSelferValueTypeArray1234 { - yyl2877 := r.ReadArrayStart() - if yyl2877 == 0 { + } else if yyct2926 == codecSelferValueTypeArray1234 { + yyl2926 := r.ReadArrayStart() + if yyl2926 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2877, d) + x.codecDecodeSelfFromArray(yyl2926, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -35937,12 +36441,12 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2878Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2878Slc - var yyhl2878 bool = l >= 0 - for yyj2878 := 0; ; yyj2878++ { - if yyhl2878 { - if yyj2878 >= l { + var yys2927Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2927Slc + var yyhl2927 bool = l >= 0 + for yyj2927 := 0; ; yyj2927++ { + if yyhl2927 { + if yyj2927 >= l { break } } else { @@ -35951,10 +36455,10 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2878Slc = r.DecodeBytes(yys2878Slc, true, true) - yys2878 := string(yys2878Slc) + yys2927Slc = r.DecodeBytes(yys2927Slc, true, true) + yys2927 := string(yys2927Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2878 { + switch yys2927 { case "component": if r.TryDecodeAsNil() { x.Component = "" @@ -35968,9 +36472,9 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2878) - } // end switch yys2878 - } // end for yyj2878 + z.DecStructFieldNotFound(-1, yys2927) + } // end switch yys2927 + } // end for yyj2927 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -35978,16 +36482,16 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2881 int - var yyb2881 bool - var yyhl2881 bool = l >= 0 - yyj2881++ - if yyhl2881 { - yyb2881 = yyj2881 > l + var yyj2930 int + var yyb2930 bool + var yyhl2930 bool = l >= 0 + yyj2930++ + if yyhl2930 { + yyb2930 = yyj2930 > l } else { - yyb2881 = r.CheckBreak() + yyb2930 = r.CheckBreak() } - if yyb2881 { + if yyb2930 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -35997,13 +36501,13 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Component = string(r.DecodeString()) } - yyj2881++ - if yyhl2881 { - yyb2881 = yyj2881 > l + yyj2930++ + if yyhl2930 { + yyb2930 = yyj2930 > l } else { - yyb2881 = r.CheckBreak() + yyb2930 = r.CheckBreak() } - if yyb2881 { + if yyb2930 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36014,17 +36518,17 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } for { - yyj2881++ - if yyhl2881 { - yyb2881 = yyj2881 > l + yyj2930++ + if yyhl2930 { + yyb2930 = yyj2930 > l } else { - yyb2881 = r.CheckBreak() + yyb2930 = r.CheckBreak() } - if yyb2881 { + if yyb2930 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2881-1, "") + z.DecStructFieldNotFound(yyj2930-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -36036,45 +36540,45 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2884 := z.EncBinary() - _ = yym2884 + yym2933 := z.EncBinary() + _ = yym2933 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2885 := !z.EncBinary() - yy2arr2885 := z.EncBasicHandle().StructToArray - var yyq2885 [11]bool - _, _, _ = yysep2885, yyq2885, yy2arr2885 - const yyr2885 bool = false - yyq2885[0] = x.Kind != "" - yyq2885[1] = x.APIVersion != "" - yyq2885[2] = true - yyq2885[3] = true - yyq2885[4] = x.Reason != "" - yyq2885[5] = x.Message != "" - yyq2885[6] = true - yyq2885[7] = true - yyq2885[8] = true - yyq2885[9] = x.Count != 0 - yyq2885[10] = x.Type != "" - var yynn2885 int - if yyr2885 || yy2arr2885 { + yysep2934 := !z.EncBinary() + yy2arr2934 := z.EncBasicHandle().StructToArray + var yyq2934 [11]bool + _, _, _ = yysep2934, yyq2934, yy2arr2934 + const yyr2934 bool = false + yyq2934[0] = x.Kind != "" + yyq2934[1] = x.APIVersion != "" + yyq2934[2] = true + yyq2934[3] = true + yyq2934[4] = x.Reason != "" + yyq2934[5] = x.Message != "" + yyq2934[6] = true + yyq2934[7] = true + yyq2934[8] = true + yyq2934[9] = x.Count != 0 + yyq2934[10] = x.Type != "" + var yynn2934 int + if yyr2934 || yy2arr2934 { r.EncodeArrayStart(11) } else { - yynn2885 = 0 - for _, b := range yyq2885 { + yynn2934 = 0 + for _, b := range yyq2934 { if b { - yynn2885++ + yynn2934++ } } - r.EncodeMapStart(yynn2885) - yynn2885 = 0 + r.EncodeMapStart(yynn2934) + yynn2934 = 0 } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[0] { - yym2887 := z.EncBinary() - _ = yym2887 + if yyq2934[0] { + yym2936 := z.EncBinary() + _ = yym2936 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -36083,23 +36587,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2885[0] { + if yyq2934[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2888 := z.EncBinary() - _ = yym2888 + yym2937 := z.EncBinary() + _ = yym2937 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[1] { - yym2890 := z.EncBinary() - _ = yym2890 + if yyq2934[1] { + yym2939 := z.EncBinary() + _ = yym2939 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -36108,57 +36612,57 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2885[1] { + if yyq2934[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2891 := z.EncBinary() - _ = yym2891 + yym2940 := z.EncBinary() + _ = yym2940 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[2] { - yy2893 := &x.ObjectMeta - yy2893.CodecEncodeSelf(e) + if yyq2934[2] { + yy2942 := &x.ObjectMeta + yy2942.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq2885[2] { + if yyq2934[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2894 := &x.ObjectMeta - yy2894.CodecEncodeSelf(e) + yy2943 := &x.ObjectMeta + yy2943.CodecEncodeSelf(e) } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[3] { - yy2896 := &x.InvolvedObject - yy2896.CodecEncodeSelf(e) + if yyq2934[3] { + yy2945 := &x.InvolvedObject + yy2945.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq2885[3] { + if yyq2934[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("involvedObject")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2897 := &x.InvolvedObject - yy2897.CodecEncodeSelf(e) + yy2946 := &x.InvolvedObject + yy2946.CodecEncodeSelf(e) } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[4] { - yym2899 := z.EncBinary() - _ = yym2899 + if yyq2934[4] { + yym2948 := z.EncBinary() + _ = yym2948 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) @@ -36167,23 +36671,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2885[4] { + if yyq2934[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reason")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2900 := z.EncBinary() - _ = yym2900 + yym2949 := z.EncBinary() + _ = yym2949 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[5] { - yym2902 := z.EncBinary() - _ = yym2902 + if yyq2934[5] { + yym2951 := z.EncBinary() + _ = yym2951 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -36192,114 +36696,114 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2885[5] { + if yyq2934[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2903 := z.EncBinary() - _ = yym2903 + yym2952 := z.EncBinary() + _ = yym2952 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[6] { - yy2905 := &x.Source - yy2905.CodecEncodeSelf(e) + if yyq2934[6] { + yy2954 := &x.Source + yy2954.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq2885[6] { + if yyq2934[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("source")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2906 := &x.Source - yy2906.CodecEncodeSelf(e) + yy2955 := &x.Source + yy2955.CodecEncodeSelf(e) } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[7] { - yy2908 := &x.FirstTimestamp - yym2909 := z.EncBinary() - _ = yym2909 + if yyq2934[7] { + yy2957 := &x.FirstTimestamp + yym2958 := z.EncBinary() + _ = yym2958 if false { - } else if z.HasExtensions() && z.EncExt(yy2908) { - } else if yym2909 { - z.EncBinaryMarshal(yy2908) - } else if !yym2909 && z.IsJSONHandle() { - z.EncJSONMarshal(yy2908) + } else if z.HasExtensions() && z.EncExt(yy2957) { + } else if yym2958 { + z.EncBinaryMarshal(yy2957) + } else if !yym2958 && z.IsJSONHandle() { + z.EncJSONMarshal(yy2957) } else { - z.EncFallback(yy2908) + z.EncFallback(yy2957) } } else { r.EncodeNil() } } else { - if yyq2885[7] { + if yyq2934[7] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("firstTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2910 := &x.FirstTimestamp - yym2911 := z.EncBinary() - _ = yym2911 + yy2959 := &x.FirstTimestamp + yym2960 := z.EncBinary() + _ = yym2960 if false { - } else if z.HasExtensions() && z.EncExt(yy2910) { - } else if yym2911 { - z.EncBinaryMarshal(yy2910) - } else if !yym2911 && z.IsJSONHandle() { - z.EncJSONMarshal(yy2910) + } else if z.HasExtensions() && z.EncExt(yy2959) { + } else if yym2960 { + z.EncBinaryMarshal(yy2959) + } else if !yym2960 && z.IsJSONHandle() { + z.EncJSONMarshal(yy2959) } else { - z.EncFallback(yy2910) + z.EncFallback(yy2959) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[8] { - yy2913 := &x.LastTimestamp - yym2914 := z.EncBinary() - _ = yym2914 + if yyq2934[8] { + yy2962 := &x.LastTimestamp + yym2963 := z.EncBinary() + _ = yym2963 if false { - } else if z.HasExtensions() && z.EncExt(yy2913) { - } else if yym2914 { - z.EncBinaryMarshal(yy2913) - } else if !yym2914 && z.IsJSONHandle() { - z.EncJSONMarshal(yy2913) + } else if z.HasExtensions() && z.EncExt(yy2962) { + } else if yym2963 { + z.EncBinaryMarshal(yy2962) + } else if !yym2963 && z.IsJSONHandle() { + z.EncJSONMarshal(yy2962) } else { - z.EncFallback(yy2913) + z.EncFallback(yy2962) } } else { r.EncodeNil() } } else { - if yyq2885[8] { + if yyq2934[8] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lastTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2915 := &x.LastTimestamp - yym2916 := z.EncBinary() - _ = yym2916 + yy2964 := &x.LastTimestamp + yym2965 := z.EncBinary() + _ = yym2965 if false { - } else if z.HasExtensions() && z.EncExt(yy2915) { - } else if yym2916 { - z.EncBinaryMarshal(yy2915) - } else if !yym2916 && z.IsJSONHandle() { - z.EncJSONMarshal(yy2915) + } else if z.HasExtensions() && z.EncExt(yy2964) { + } else if yym2965 { + z.EncBinaryMarshal(yy2964) + } else if !yym2965 && z.IsJSONHandle() { + z.EncJSONMarshal(yy2964) } else { - z.EncFallback(yy2915) + z.EncFallback(yy2964) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[9] { - yym2918 := z.EncBinary() - _ = yym2918 + if yyq2934[9] { + yym2967 := z.EncBinary() + _ = yym2967 if false { } else { r.EncodeInt(int64(x.Count)) @@ -36308,23 +36812,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq2885[9] { + if yyq2934[9] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("count")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2919 := z.EncBinary() - _ = yym2919 + yym2968 := z.EncBinary() + _ = yym2968 if false { } else { r.EncodeInt(int64(x.Count)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2885[10] { - yym2921 := z.EncBinary() - _ = yym2921 + if yyq2934[10] { + yym2970 := z.EncBinary() + _ = yym2970 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -36333,19 +36837,19 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2885[10] { + if yyq2934[10] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2922 := z.EncBinary() - _ = yym2922 + yym2971 := z.EncBinary() + _ = yym2971 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr2885 || yy2arr2885 { + if yyr2934 || yy2arr2934 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -36358,25 +36862,25 @@ func (x *Event) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2923 := z.DecBinary() - _ = yym2923 + yym2972 := z.DecBinary() + _ = yym2972 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2924 := r.ContainerType() - if yyct2924 == codecSelferValueTypeMap1234 { - yyl2924 := r.ReadMapStart() - if yyl2924 == 0 { + yyct2973 := r.ContainerType() + if yyct2973 == codecSelferValueTypeMap1234 { + yyl2973 := r.ReadMapStart() + if yyl2973 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2924, d) + x.codecDecodeSelfFromMap(yyl2973, d) } - } else if yyct2924 == codecSelferValueTypeArray1234 { - yyl2924 := r.ReadArrayStart() - if yyl2924 == 0 { + } else if yyct2973 == codecSelferValueTypeArray1234 { + yyl2973 := r.ReadArrayStart() + if yyl2973 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2924, d) + x.codecDecodeSelfFromArray(yyl2973, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -36388,12 +36892,12 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2925Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2925Slc - var yyhl2925 bool = l >= 0 - for yyj2925 := 0; ; yyj2925++ { - if yyhl2925 { - if yyj2925 >= l { + var yys2974Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys2974Slc + var yyhl2974 bool = l >= 0 + for yyj2974 := 0; ; yyj2974++ { + if yyhl2974 { + if yyj2974 >= l { break } } else { @@ -36402,10 +36906,10 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2925Slc = r.DecodeBytes(yys2925Slc, true, true) - yys2925 := string(yys2925Slc) + yys2974Slc = r.DecodeBytes(yys2974Slc, true, true) + yys2974 := string(yys2974Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2925 { + switch yys2974 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -36422,15 +36926,15 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv2928 := &x.ObjectMeta - yyv2928.CodecDecodeSelf(d) + yyv2977 := &x.ObjectMeta + yyv2977.CodecDecodeSelf(d) } case "involvedObject": if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv2929 := &x.InvolvedObject - yyv2929.CodecDecodeSelf(d) + yyv2978 := &x.InvolvedObject + yyv2978.CodecDecodeSelf(d) } case "reason": if r.TryDecodeAsNil() { @@ -36448,41 +36952,41 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv2932 := &x.Source - yyv2932.CodecDecodeSelf(d) + yyv2981 := &x.Source + yyv2981.CodecDecodeSelf(d) } case "firstTimestamp": if r.TryDecodeAsNil() { x.FirstTimestamp = pkg2_unversioned.Time{} } else { - yyv2933 := &x.FirstTimestamp - yym2934 := z.DecBinary() - _ = yym2934 + yyv2982 := &x.FirstTimestamp + yym2983 := z.DecBinary() + _ = yym2983 if false { - } else if z.HasExtensions() && z.DecExt(yyv2933) { - } else if yym2934 { - z.DecBinaryUnmarshal(yyv2933) - } else if !yym2934 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv2933) + } else if z.HasExtensions() && z.DecExt(yyv2982) { + } else if yym2983 { + z.DecBinaryUnmarshal(yyv2982) + } else if !yym2983 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv2982) } else { - z.DecFallback(yyv2933, false) + z.DecFallback(yyv2982, false) } } case "lastTimestamp": if r.TryDecodeAsNil() { x.LastTimestamp = pkg2_unversioned.Time{} } else { - yyv2935 := &x.LastTimestamp - yym2936 := z.DecBinary() - _ = yym2936 + yyv2984 := &x.LastTimestamp + yym2985 := z.DecBinary() + _ = yym2985 if false { - } else if z.HasExtensions() && z.DecExt(yyv2935) { - } else if yym2936 { - z.DecBinaryUnmarshal(yyv2935) - } else if !yym2936 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv2935) + } else if z.HasExtensions() && z.DecExt(yyv2984) { + } else if yym2985 { + z.DecBinaryUnmarshal(yyv2984) + } else if !yym2985 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv2984) } else { - z.DecFallback(yyv2935, false) + z.DecFallback(yyv2984, false) } } case "count": @@ -36498,9 +37002,9 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys2925) - } // end switch yys2925 - } // end for yyj2925 + z.DecStructFieldNotFound(-1, yys2974) + } // end switch yys2974 + } // end for yyj2974 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -36508,16 +37012,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2939 int - var yyb2939 bool - var yyhl2939 bool = l >= 0 - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + var yyj2988 int + var yyb2988 bool + var yyhl2988 bool = l >= 0 + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36527,13 +37031,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36543,13 +37047,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36557,16 +37061,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv2942 := &x.ObjectMeta - yyv2942.CodecDecodeSelf(d) + yyv2991 := &x.ObjectMeta + yyv2991.CodecDecodeSelf(d) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36574,16 +37078,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv2943 := &x.InvolvedObject - yyv2943.CodecDecodeSelf(d) + yyv2992 := &x.InvolvedObject + yyv2992.CodecDecodeSelf(d) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36593,13 +37097,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Reason = string(r.DecodeString()) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36609,13 +37113,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Message = string(r.DecodeString()) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36623,16 +37127,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv2946 := &x.Source - yyv2946.CodecDecodeSelf(d) + yyv2995 := &x.Source + yyv2995.CodecDecodeSelf(d) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36640,26 +37144,26 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.FirstTimestamp = pkg2_unversioned.Time{} } else { - yyv2947 := &x.FirstTimestamp - yym2948 := z.DecBinary() - _ = yym2948 + yyv2996 := &x.FirstTimestamp + yym2997 := z.DecBinary() + _ = yym2997 if false { - } else if z.HasExtensions() && z.DecExt(yyv2947) { - } else if yym2948 { - z.DecBinaryUnmarshal(yyv2947) - } else if !yym2948 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv2947) + } else if z.HasExtensions() && z.DecExt(yyv2996) { + } else if yym2997 { + z.DecBinaryUnmarshal(yyv2996) + } else if !yym2997 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv2996) } else { - z.DecFallback(yyv2947, false) + z.DecFallback(yyv2996, false) } } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36667,26 +37171,26 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.LastTimestamp = pkg2_unversioned.Time{} } else { - yyv2949 := &x.LastTimestamp - yym2950 := z.DecBinary() - _ = yym2950 + yyv2998 := &x.LastTimestamp + yym2999 := z.DecBinary() + _ = yym2999 if false { - } else if z.HasExtensions() && z.DecExt(yyv2949) { - } else if yym2950 { - z.DecBinaryUnmarshal(yyv2949) - } else if !yym2950 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv2949) + } else if z.HasExtensions() && z.DecExt(yyv2998) { + } else if yym2999 { + z.DecBinaryUnmarshal(yyv2998) + } else if !yym2999 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv2998) } else { - z.DecFallback(yyv2949, false) + z.DecFallback(yyv2998, false) } } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36696,13 +37200,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Count = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36713,17 +37217,17 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } for { - yyj2939++ - if yyhl2939 { - yyb2939 = yyj2939 > l + yyj2988++ + if yyhl2988 { + yyb2988 = yyj2988 > l } else { - yyb2939 = r.CheckBreak() + yyb2988 = r.CheckBreak() } - if yyb2939 { + if yyb2988 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2939-1, "") + z.DecStructFieldNotFound(yyj2988-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -36735,37 +37239,37 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2953 := z.EncBinary() - _ = yym2953 + yym3002 := z.EncBinary() + _ = yym3002 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2954 := !z.EncBinary() - yy2arr2954 := z.EncBasicHandle().StructToArray - var yyq2954 [4]bool - _, _, _ = yysep2954, yyq2954, yy2arr2954 - const yyr2954 bool = false - yyq2954[0] = x.Kind != "" - yyq2954[1] = x.APIVersion != "" - yyq2954[2] = true - var yynn2954 int - if yyr2954 || yy2arr2954 { + yysep3003 := !z.EncBinary() + yy2arr3003 := z.EncBasicHandle().StructToArray + var yyq3003 [4]bool + _, _, _ = yysep3003, yyq3003, yy2arr3003 + const yyr3003 bool = false + yyq3003[0] = x.Kind != "" + yyq3003[1] = x.APIVersion != "" + yyq3003[2] = true + var yynn3003 int + if yyr3003 || yy2arr3003 { r.EncodeArrayStart(4) } else { - yynn2954 = 1 - for _, b := range yyq2954 { + yynn3003 = 1 + for _, b := range yyq3003 { if b { - yynn2954++ + yynn3003++ } } - r.EncodeMapStart(yynn2954) - yynn2954 = 0 + r.EncodeMapStart(yynn3003) + yynn3003 = 0 } - if yyr2954 || yy2arr2954 { + if yyr3003 || yy2arr3003 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2954[0] { - yym2956 := z.EncBinary() - _ = yym2956 + if yyq3003[0] { + yym3005 := z.EncBinary() + _ = yym3005 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -36774,23 +37278,23 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2954[0] { + if yyq3003[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2957 := z.EncBinary() - _ = yym2957 + yym3006 := z.EncBinary() + _ = yym3006 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2954 || yy2arr2954 { + if yyr3003 || yy2arr3003 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2954[1] { - yym2959 := z.EncBinary() - _ = yym2959 + if yyq3003[1] { + yym3008 := z.EncBinary() + _ = yym3008 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -36799,54 +37303,54 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2954[1] { + if yyq3003[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2960 := z.EncBinary() - _ = yym2960 + yym3009 := z.EncBinary() + _ = yym3009 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2954 || yy2arr2954 { + if yyr3003 || yy2arr3003 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2954[2] { - yy2962 := &x.ListMeta - yym2963 := z.EncBinary() - _ = yym2963 + if yyq3003[2] { + yy3011 := &x.ListMeta + yym3012 := z.EncBinary() + _ = yym3012 if false { - } else if z.HasExtensions() && z.EncExt(yy2962) { + } else if z.HasExtensions() && z.EncExt(yy3011) { } else { - z.EncFallback(yy2962) + z.EncFallback(yy3011) } } else { r.EncodeNil() } } else { - if yyq2954[2] { + if yyq3003[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2964 := &x.ListMeta - yym2965 := z.EncBinary() - _ = yym2965 + yy3013 := &x.ListMeta + yym3014 := z.EncBinary() + _ = yym3014 if false { - } else if z.HasExtensions() && z.EncExt(yy2964) { + } else if z.HasExtensions() && z.EncExt(yy3013) { } else { - z.EncFallback(yy2964) + z.EncFallback(yy3013) } } } - if yyr2954 || yy2arr2954 { + if yyr3003 || yy2arr3003 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym2967 := z.EncBinary() - _ = yym2967 + yym3016 := z.EncBinary() + _ = yym3016 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) @@ -36859,15 +37363,15 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym2968 := z.EncBinary() - _ = yym2968 + yym3017 := z.EncBinary() + _ = yym3017 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) } } } - if yyr2954 || yy2arr2954 { + if yyr3003 || yy2arr3003 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -36880,25 +37384,25 @@ func (x *EventList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym2969 := z.DecBinary() - _ = yym2969 + yym3018 := z.DecBinary() + _ = yym3018 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct2970 := r.ContainerType() - if yyct2970 == codecSelferValueTypeMap1234 { - yyl2970 := r.ReadMapStart() - if yyl2970 == 0 { + yyct3019 := r.ContainerType() + if yyct3019 == codecSelferValueTypeMap1234 { + yyl3019 := r.ReadMapStart() + if yyl3019 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl2970, d) + x.codecDecodeSelfFromMap(yyl3019, d) } - } else if yyct2970 == codecSelferValueTypeArray1234 { - yyl2970 := r.ReadArrayStart() - if yyl2970 == 0 { + } else if yyct3019 == codecSelferValueTypeArray1234 { + yyl3019 := r.ReadArrayStart() + if yyl3019 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl2970, d) + x.codecDecodeSelfFromArray(yyl3019, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -36910,12 +37414,12 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys2971Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys2971Slc - var yyhl2971 bool = l >= 0 - for yyj2971 := 0; ; yyj2971++ { - if yyhl2971 { - if yyj2971 >= l { + var yys3020Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3020Slc + var yyhl3020 bool = l >= 0 + for yyj3020 := 0; ; yyj3020++ { + if yyhl3020 { + if yyj3020 >= l { break } } else { @@ -36924,10 +37428,10 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys2971Slc = r.DecodeBytes(yys2971Slc, true, true) - yys2971 := string(yys2971Slc) + yys3020Slc = r.DecodeBytes(yys3020Slc, true, true) + yys3020 := string(yys3020Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys2971 { + switch yys3020 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -36944,31 +37448,31 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv2974 := &x.ListMeta - yym2975 := z.DecBinary() - _ = yym2975 + yyv3023 := &x.ListMeta + yym3024 := z.DecBinary() + _ = yym3024 if false { - } else if z.HasExtensions() && z.DecExt(yyv2974) { + } else if z.HasExtensions() && z.DecExt(yyv3023) { } else { - z.DecFallback(yyv2974, false) + z.DecFallback(yyv3023, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv2976 := &x.Items - yym2977 := z.DecBinary() - _ = yym2977 + yyv3025 := &x.Items + yym3026 := z.DecBinary() + _ = yym3026 if false { } else { - h.decSliceEvent((*[]Event)(yyv2976), d) + h.decSliceEvent((*[]Event)(yyv3025), d) } } default: - z.DecStructFieldNotFound(-1, yys2971) - } // end switch yys2971 - } // end for yyj2971 + z.DecStructFieldNotFound(-1, yys3020) + } // end switch yys3020 + } // end for yyj3020 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -36976,16 +37480,16 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj2978 int - var yyb2978 bool - var yyhl2978 bool = l >= 0 - yyj2978++ - if yyhl2978 { - yyb2978 = yyj2978 > l + var yyj3027 int + var yyb3027 bool + var yyhl3027 bool = l >= 0 + yyj3027++ + if yyhl3027 { + yyb3027 = yyj3027 > l } else { - yyb2978 = r.CheckBreak() + yyb3027 = r.CheckBreak() } - if yyb2978 { + if yyb3027 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -36995,13 +37499,13 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj2978++ - if yyhl2978 { - yyb2978 = yyj2978 > l + yyj3027++ + if yyhl3027 { + yyb3027 = yyj3027 > l } else { - yyb2978 = r.CheckBreak() + yyb3027 = r.CheckBreak() } - if yyb2978 { + if yyb3027 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37011,13 +37515,13 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj2978++ - if yyhl2978 { - yyb2978 = yyj2978 > l + yyj3027++ + if yyhl3027 { + yyb3027 = yyj3027 > l } else { - yyb2978 = r.CheckBreak() + yyb3027 = r.CheckBreak() } - if yyb2978 { + if yyb3027 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37025,22 +37529,22 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv2981 := &x.ListMeta - yym2982 := z.DecBinary() - _ = yym2982 + yyv3030 := &x.ListMeta + yym3031 := z.DecBinary() + _ = yym3031 if false { - } else if z.HasExtensions() && z.DecExt(yyv2981) { + } else if z.HasExtensions() && z.DecExt(yyv3030) { } else { - z.DecFallback(yyv2981, false) + z.DecFallback(yyv3030, false) } } - yyj2978++ - if yyhl2978 { - yyb2978 = yyj2978 > l + yyj3027++ + if yyhl3027 { + yyb3027 = yyj3027 > l } else { - yyb2978 = r.CheckBreak() + yyb3027 = r.CheckBreak() } - if yyb2978 { + if yyb3027 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37048,26 +37552,26 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv2983 := &x.Items - yym2984 := z.DecBinary() - _ = yym2984 + yyv3032 := &x.Items + yym3033 := z.DecBinary() + _ = yym3033 if false { } else { - h.decSliceEvent((*[]Event)(yyv2983), d) + h.decSliceEvent((*[]Event)(yyv3032), d) } } for { - yyj2978++ - if yyhl2978 { - yyb2978 = yyj2978 > l + yyj3027++ + if yyhl3027 { + yyb3027 = yyj3027 > l } else { - yyb2978 = r.CheckBreak() + yyb3027 = r.CheckBreak() } - if yyb2978 { + if yyb3027 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj2978-1, "") + z.DecStructFieldNotFound(yyj3027-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -37079,37 +37583,37 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym2985 := z.EncBinary() - _ = yym2985 + yym3034 := z.EncBinary() + _ = yym3034 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep2986 := !z.EncBinary() - yy2arr2986 := z.EncBasicHandle().StructToArray - var yyq2986 [4]bool - _, _, _ = yysep2986, yyq2986, yy2arr2986 - const yyr2986 bool = false - yyq2986[0] = x.Kind != "" - yyq2986[1] = x.APIVersion != "" - yyq2986[2] = true - var yynn2986 int - if yyr2986 || yy2arr2986 { + yysep3035 := !z.EncBinary() + yy2arr3035 := z.EncBasicHandle().StructToArray + var yyq3035 [4]bool + _, _, _ = yysep3035, yyq3035, yy2arr3035 + const yyr3035 bool = false + yyq3035[0] = x.Kind != "" + yyq3035[1] = x.APIVersion != "" + yyq3035[2] = true + var yynn3035 int + if yyr3035 || yy2arr3035 { r.EncodeArrayStart(4) } else { - yynn2986 = 1 - for _, b := range yyq2986 { + yynn3035 = 1 + for _, b := range yyq3035 { if b { - yynn2986++ + yynn3035++ } } - r.EncodeMapStart(yynn2986) - yynn2986 = 0 + r.EncodeMapStart(yynn3035) + yynn3035 = 0 } - if yyr2986 || yy2arr2986 { + if yyr3035 || yy2arr3035 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2986[0] { - yym2988 := z.EncBinary() - _ = yym2988 + if yyq3035[0] { + yym3037 := z.EncBinary() + _ = yym3037 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -37118,23 +37622,23 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2986[0] { + if yyq3035[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2989 := z.EncBinary() - _ = yym2989 + yym3038 := z.EncBinary() + _ = yym3038 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr2986 || yy2arr2986 { + if yyr3035 || yy2arr3035 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2986[1] { - yym2991 := z.EncBinary() - _ = yym2991 + if yyq3035[1] { + yym3040 := z.EncBinary() + _ = yym3040 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -37143,57 +37647,57 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq2986[1] { + if yyq3035[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym2992 := z.EncBinary() - _ = yym2992 + yym3041 := z.EncBinary() + _ = yym3041 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr2986 || yy2arr2986 { + if yyr3035 || yy2arr3035 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq2986[2] { - yy2994 := &x.ListMeta - yym2995 := z.EncBinary() - _ = yym2995 + if yyq3035[2] { + yy3043 := &x.ListMeta + yym3044 := z.EncBinary() + _ = yym3044 if false { - } else if z.HasExtensions() && z.EncExt(yy2994) { + } else if z.HasExtensions() && z.EncExt(yy3043) { } else { - z.EncFallback(yy2994) + z.EncFallback(yy3043) } } else { r.EncodeNil() } } else { - if yyq2986[2] { + if yyq3035[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy2996 := &x.ListMeta - yym2997 := z.EncBinary() - _ = yym2997 + yy3045 := &x.ListMeta + yym3046 := z.EncBinary() + _ = yym3046 if false { - } else if z.HasExtensions() && z.EncExt(yy2996) { + } else if z.HasExtensions() && z.EncExt(yy3045) { } else { - z.EncFallback(yy2996) + z.EncFallback(yy3045) } } } - if yyr2986 || yy2arr2986 { + if yyr3035 || yy2arr3035 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym2999 := z.EncBinary() - _ = yym2999 + yym3048 := z.EncBinary() + _ = yym3048 if false { } else { - h.encSliceruntime_Object(([]pkg6_runtime.Object)(x.Items), e) + h.encSliceruntime_Object(([]pkg8_runtime.Object)(x.Items), e) } } } else { @@ -37203,15 +37707,15 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3000 := z.EncBinary() - _ = yym3000 + yym3049 := z.EncBinary() + _ = yym3049 if false { } else { - h.encSliceruntime_Object(([]pkg6_runtime.Object)(x.Items), e) + h.encSliceruntime_Object(([]pkg8_runtime.Object)(x.Items), e) } } } - if yyr2986 || yy2arr2986 { + if yyr3035 || yy2arr3035 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -37224,25 +37728,25 @@ func (x *List) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3001 := z.DecBinary() - _ = yym3001 + yym3050 := z.DecBinary() + _ = yym3050 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3002 := r.ContainerType() - if yyct3002 == codecSelferValueTypeMap1234 { - yyl3002 := r.ReadMapStart() - if yyl3002 == 0 { + yyct3051 := r.ContainerType() + if yyct3051 == codecSelferValueTypeMap1234 { + yyl3051 := r.ReadMapStart() + if yyl3051 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3002, d) + x.codecDecodeSelfFromMap(yyl3051, d) } - } else if yyct3002 == codecSelferValueTypeArray1234 { - yyl3002 := r.ReadArrayStart() - if yyl3002 == 0 { + } else if yyct3051 == codecSelferValueTypeArray1234 { + yyl3051 := r.ReadArrayStart() + if yyl3051 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3002, d) + x.codecDecodeSelfFromArray(yyl3051, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -37254,12 +37758,12 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3003Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3003Slc - var yyhl3003 bool = l >= 0 - for yyj3003 := 0; ; yyj3003++ { - if yyhl3003 { - if yyj3003 >= l { + var yys3052Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3052Slc + var yyhl3052 bool = l >= 0 + for yyj3052 := 0; ; yyj3052++ { + if yyhl3052 { + if yyj3052 >= l { break } } else { @@ -37268,10 +37772,10 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3003Slc = r.DecodeBytes(yys3003Slc, true, true) - yys3003 := string(yys3003Slc) + yys3052Slc = r.DecodeBytes(yys3052Slc, true, true) + yys3052 := string(yys3052Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3003 { + switch yys3052 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -37288,31 +37792,31 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3006 := &x.ListMeta - yym3007 := z.DecBinary() - _ = yym3007 + yyv3055 := &x.ListMeta + yym3056 := z.DecBinary() + _ = yym3056 if false { - } else if z.HasExtensions() && z.DecExt(yyv3006) { + } else if z.HasExtensions() && z.DecExt(yyv3055) { } else { - z.DecFallback(yyv3006, false) + z.DecFallback(yyv3055, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3008 := &x.Items - yym3009 := z.DecBinary() - _ = yym3009 + yyv3057 := &x.Items + yym3058 := z.DecBinary() + _ = yym3058 if false { } else { - h.decSliceruntime_Object((*[]pkg6_runtime.Object)(yyv3008), d) + h.decSliceruntime_Object((*[]pkg8_runtime.Object)(yyv3057), d) } } default: - z.DecStructFieldNotFound(-1, yys3003) - } // end switch yys3003 - } // end for yyj3003 + z.DecStructFieldNotFound(-1, yys3052) + } // end switch yys3052 + } // end for yyj3052 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -37320,16 +37824,16 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3010 int - var yyb3010 bool - var yyhl3010 bool = l >= 0 - yyj3010++ - if yyhl3010 { - yyb3010 = yyj3010 > l + var yyj3059 int + var yyb3059 bool + var yyhl3059 bool = l >= 0 + yyj3059++ + if yyhl3059 { + yyb3059 = yyj3059 > l } else { - yyb3010 = r.CheckBreak() + yyb3059 = r.CheckBreak() } - if yyb3010 { + if yyb3059 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37339,13 +37843,13 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3010++ - if yyhl3010 { - yyb3010 = yyj3010 > l + yyj3059++ + if yyhl3059 { + yyb3059 = yyj3059 > l } else { - yyb3010 = r.CheckBreak() + yyb3059 = r.CheckBreak() } - if yyb3010 { + if yyb3059 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37355,13 +37859,13 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3010++ - if yyhl3010 { - yyb3010 = yyj3010 > l + yyj3059++ + if yyhl3059 { + yyb3059 = yyj3059 > l } else { - yyb3010 = r.CheckBreak() + yyb3059 = r.CheckBreak() } - if yyb3010 { + if yyb3059 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37369,22 +37873,22 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3013 := &x.ListMeta - yym3014 := z.DecBinary() - _ = yym3014 + yyv3062 := &x.ListMeta + yym3063 := z.DecBinary() + _ = yym3063 if false { - } else if z.HasExtensions() && z.DecExt(yyv3013) { + } else if z.HasExtensions() && z.DecExt(yyv3062) { } else { - z.DecFallback(yyv3013, false) + z.DecFallback(yyv3062, false) } } - yyj3010++ - if yyhl3010 { - yyb3010 = yyj3010 > l + yyj3059++ + if yyhl3059 { + yyb3059 = yyj3059 > l } else { - yyb3010 = r.CheckBreak() + yyb3059 = r.CheckBreak() } - if yyb3010 { + if yyb3059 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37392,26 +37896,26 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3015 := &x.Items - yym3016 := z.DecBinary() - _ = yym3016 + yyv3064 := &x.Items + yym3065 := z.DecBinary() + _ = yym3065 if false { } else { - h.decSliceruntime_Object((*[]pkg6_runtime.Object)(yyv3015), d) + h.decSliceruntime_Object((*[]pkg8_runtime.Object)(yyv3064), d) } } for { - yyj3010++ - if yyhl3010 { - yyb3010 = yyj3010 > l + yyj3059++ + if yyhl3059 { + yyb3059 = yyj3059 > l } else { - yyb3010 = r.CheckBreak() + yyb3059 = r.CheckBreak() } - if yyb3010 { + if yyb3059 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3010-1, "") + z.DecStructFieldNotFound(yyj3059-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -37420,8 +37924,8 @@ func (x LimitType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym3017 := z.EncBinary() - _ = yym3017 + yym3066 := z.EncBinary() + _ = yym3066 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -37433,8 +37937,8 @@ func (x *LimitType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3018 := z.DecBinary() - _ = yym3018 + yym3067 := z.DecBinary() + _ = yym3067 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -37449,53 +37953,53 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3019 := z.EncBinary() - _ = yym3019 + yym3068 := z.EncBinary() + _ = yym3068 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3020 := !z.EncBinary() - yy2arr3020 := z.EncBasicHandle().StructToArray - var yyq3020 [6]bool - _, _, _ = yysep3020, yyq3020, yy2arr3020 - const yyr3020 bool = false - yyq3020[0] = x.Type != "" - yyq3020[1] = len(x.Max) != 0 - yyq3020[2] = len(x.Min) != 0 - yyq3020[3] = len(x.Default) != 0 - yyq3020[4] = len(x.DefaultRequest) != 0 - yyq3020[5] = len(x.MaxLimitRequestRatio) != 0 - var yynn3020 int - if yyr3020 || yy2arr3020 { + yysep3069 := !z.EncBinary() + yy2arr3069 := z.EncBasicHandle().StructToArray + var yyq3069 [6]bool + _, _, _ = yysep3069, yyq3069, yy2arr3069 + const yyr3069 bool = false + yyq3069[0] = x.Type != "" + yyq3069[1] = len(x.Max) != 0 + yyq3069[2] = len(x.Min) != 0 + yyq3069[3] = len(x.Default) != 0 + yyq3069[4] = len(x.DefaultRequest) != 0 + yyq3069[5] = len(x.MaxLimitRequestRatio) != 0 + var yynn3069 int + if yyr3069 || yy2arr3069 { r.EncodeArrayStart(6) } else { - yynn3020 = 0 - for _, b := range yyq3020 { + yynn3069 = 0 + for _, b := range yyq3069 { if b { - yynn3020++ + yynn3069++ } } - r.EncodeMapStart(yynn3020) - yynn3020 = 0 + r.EncodeMapStart(yynn3069) + yynn3069 = 0 } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[0] { + if yyq3069[0] { x.Type.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3020[0] { + if yyq3069[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[1] { + if yyq3069[1] { if x.Max == nil { r.EncodeNil() } else { @@ -37505,7 +38009,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3020[1] { + if yyq3069[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("max")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -37516,9 +38020,9 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[2] { + if yyq3069[2] { if x.Min == nil { r.EncodeNil() } else { @@ -37528,7 +38032,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3020[2] { + if yyq3069[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("min")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -37539,9 +38043,9 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[3] { + if yyq3069[3] { if x.Default == nil { r.EncodeNil() } else { @@ -37551,7 +38055,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3020[3] { + if yyq3069[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("default")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -37562,9 +38066,9 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[4] { + if yyq3069[4] { if x.DefaultRequest == nil { r.EncodeNil() } else { @@ -37574,7 +38078,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3020[4] { + if yyq3069[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("defaultRequest")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -37585,9 +38089,9 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3020[5] { + if yyq3069[5] { if x.MaxLimitRequestRatio == nil { r.EncodeNil() } else { @@ -37597,7 +38101,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3020[5] { + if yyq3069[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxLimitRequestRatio")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -37608,7 +38112,7 @@ func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3020 || yy2arr3020 { + if yyr3069 || yy2arr3069 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -37621,25 +38125,25 @@ func (x *LimitRangeItem) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3027 := z.DecBinary() - _ = yym3027 + yym3076 := z.DecBinary() + _ = yym3076 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3028 := r.ContainerType() - if yyct3028 == codecSelferValueTypeMap1234 { - yyl3028 := r.ReadMapStart() - if yyl3028 == 0 { + yyct3077 := r.ContainerType() + if yyct3077 == codecSelferValueTypeMap1234 { + yyl3077 := r.ReadMapStart() + if yyl3077 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3028, d) + x.codecDecodeSelfFromMap(yyl3077, d) } - } else if yyct3028 == codecSelferValueTypeArray1234 { - yyl3028 := r.ReadArrayStart() - if yyl3028 == 0 { + } else if yyct3077 == codecSelferValueTypeArray1234 { + yyl3077 := r.ReadArrayStart() + if yyl3077 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3028, d) + x.codecDecodeSelfFromArray(yyl3077, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -37651,12 +38155,12 @@ func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3029Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3029Slc - var yyhl3029 bool = l >= 0 - for yyj3029 := 0; ; yyj3029++ { - if yyhl3029 { - if yyj3029 >= l { + var yys3078Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3078Slc + var yyhl3078 bool = l >= 0 + for yyj3078 := 0; ; yyj3078++ { + if yyhl3078 { + if yyj3078 >= l { break } } else { @@ -37665,10 +38169,10 @@ func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3029Slc = r.DecodeBytes(yys3029Slc, true, true) - yys3029 := string(yys3029Slc) + yys3078Slc = r.DecodeBytes(yys3078Slc, true, true) + yys3078 := string(yys3078Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3029 { + switch yys3078 { case "type": if r.TryDecodeAsNil() { x.Type = "" @@ -37679,41 +38183,41 @@ func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Max = nil } else { - yyv3031 := &x.Max - yyv3031.CodecDecodeSelf(d) + yyv3080 := &x.Max + yyv3080.CodecDecodeSelf(d) } case "min": if r.TryDecodeAsNil() { x.Min = nil } else { - yyv3032 := &x.Min - yyv3032.CodecDecodeSelf(d) + yyv3081 := &x.Min + yyv3081.CodecDecodeSelf(d) } case "default": if r.TryDecodeAsNil() { x.Default = nil } else { - yyv3033 := &x.Default - yyv3033.CodecDecodeSelf(d) + yyv3082 := &x.Default + yyv3082.CodecDecodeSelf(d) } case "defaultRequest": if r.TryDecodeAsNil() { x.DefaultRequest = nil } else { - yyv3034 := &x.DefaultRequest - yyv3034.CodecDecodeSelf(d) + yyv3083 := &x.DefaultRequest + yyv3083.CodecDecodeSelf(d) } case "maxLimitRequestRatio": if r.TryDecodeAsNil() { x.MaxLimitRequestRatio = nil } else { - yyv3035 := &x.MaxLimitRequestRatio - yyv3035.CodecDecodeSelf(d) + yyv3084 := &x.MaxLimitRequestRatio + yyv3084.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3029) - } // end switch yys3029 - } // end for yyj3029 + z.DecStructFieldNotFound(-1, yys3078) + } // end switch yys3078 + } // end for yyj3078 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -37721,16 +38225,16 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3036 int - var yyb3036 bool - var yyhl3036 bool = l >= 0 - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + var yyj3085 int + var yyb3085 bool + var yyhl3085 bool = l >= 0 + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37740,13 +38244,13 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Type = LimitType(r.DecodeString()) } - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37754,16 +38258,16 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Max = nil } else { - yyv3038 := &x.Max - yyv3038.CodecDecodeSelf(d) + yyv3087 := &x.Max + yyv3087.CodecDecodeSelf(d) } - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37771,16 +38275,16 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Min = nil } else { - yyv3039 := &x.Min - yyv3039.CodecDecodeSelf(d) + yyv3088 := &x.Min + yyv3088.CodecDecodeSelf(d) } - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37788,16 +38292,16 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Default = nil } else { - yyv3040 := &x.Default - yyv3040.CodecDecodeSelf(d) + yyv3089 := &x.Default + yyv3089.CodecDecodeSelf(d) } - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37805,16 +38309,16 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.DefaultRequest = nil } else { - yyv3041 := &x.DefaultRequest - yyv3041.CodecDecodeSelf(d) + yyv3090 := &x.DefaultRequest + yyv3090.CodecDecodeSelf(d) } - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37822,21 +38326,21 @@ func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.MaxLimitRequestRatio = nil } else { - yyv3042 := &x.MaxLimitRequestRatio - yyv3042.CodecDecodeSelf(d) + yyv3091 := &x.MaxLimitRequestRatio + yyv3091.CodecDecodeSelf(d) } for { - yyj3036++ - if yyhl3036 { - yyb3036 = yyj3036 > l + yyj3085++ + if yyhl3085 { + yyb3085 = yyj3085 > l } else { - yyb3036 = r.CheckBreak() + yyb3085 = r.CheckBreak() } - if yyb3036 { + if yyb3085 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3036-1, "") + z.DecStructFieldNotFound(yyj3085-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -37848,36 +38352,36 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3043 := z.EncBinary() - _ = yym3043 + yym3092 := z.EncBinary() + _ = yym3092 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3044 := !z.EncBinary() - yy2arr3044 := z.EncBasicHandle().StructToArray - var yyq3044 [1]bool - _, _, _ = yysep3044, yyq3044, yy2arr3044 - const yyr3044 bool = false - var yynn3044 int - if yyr3044 || yy2arr3044 { + yysep3093 := !z.EncBinary() + yy2arr3093 := z.EncBasicHandle().StructToArray + var yyq3093 [1]bool + _, _, _ = yysep3093, yyq3093, yy2arr3093 + const yyr3093 bool = false + var yynn3093 int + if yyr3093 || yy2arr3093 { r.EncodeArrayStart(1) } else { - yynn3044 = 1 - for _, b := range yyq3044 { + yynn3093 = 1 + for _, b := range yyq3093 { if b { - yynn3044++ + yynn3093++ } } - r.EncodeMapStart(yynn3044) - yynn3044 = 0 + r.EncodeMapStart(yynn3093) + yynn3093 = 0 } - if yyr3044 || yy2arr3044 { + if yyr3093 || yy2arr3093 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Limits == nil { r.EncodeNil() } else { - yym3046 := z.EncBinary() - _ = yym3046 + yym3095 := z.EncBinary() + _ = yym3095 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) @@ -37890,15 +38394,15 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Limits == nil { r.EncodeNil() } else { - yym3047 := z.EncBinary() - _ = yym3047 + yym3096 := z.EncBinary() + _ = yym3096 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) } } } - if yyr3044 || yy2arr3044 { + if yyr3093 || yy2arr3093 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -37911,25 +38415,25 @@ func (x *LimitRangeSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3048 := z.DecBinary() - _ = yym3048 + yym3097 := z.DecBinary() + _ = yym3097 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3049 := r.ContainerType() - if yyct3049 == codecSelferValueTypeMap1234 { - yyl3049 := r.ReadMapStart() - if yyl3049 == 0 { + yyct3098 := r.ContainerType() + if yyct3098 == codecSelferValueTypeMap1234 { + yyl3098 := r.ReadMapStart() + if yyl3098 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3049, d) + x.codecDecodeSelfFromMap(yyl3098, d) } - } else if yyct3049 == codecSelferValueTypeArray1234 { - yyl3049 := r.ReadArrayStart() - if yyl3049 == 0 { + } else if yyct3098 == codecSelferValueTypeArray1234 { + yyl3098 := r.ReadArrayStart() + if yyl3098 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3049, d) + x.codecDecodeSelfFromArray(yyl3098, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -37941,12 +38445,12 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3050Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3050Slc - var yyhl3050 bool = l >= 0 - for yyj3050 := 0; ; yyj3050++ { - if yyhl3050 { - if yyj3050 >= l { + var yys3099Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3099Slc + var yyhl3099 bool = l >= 0 + for yyj3099 := 0; ; yyj3099++ { + if yyhl3099 { + if yyj3099 >= l { break } } else { @@ -37955,26 +38459,26 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3050Slc = r.DecodeBytes(yys3050Slc, true, true) - yys3050 := string(yys3050Slc) + yys3099Slc = r.DecodeBytes(yys3099Slc, true, true) + yys3099 := string(yys3099Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3050 { + switch yys3099 { case "limits": if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv3051 := &x.Limits - yym3052 := z.DecBinary() - _ = yym3052 + yyv3100 := &x.Limits + yym3101 := z.DecBinary() + _ = yym3101 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv3051), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv3100), d) } } default: - z.DecStructFieldNotFound(-1, yys3050) - } // end switch yys3050 - } // end for yyj3050 + z.DecStructFieldNotFound(-1, yys3099) + } // end switch yys3099 + } // end for yyj3099 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -37982,16 +38486,16 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3053 int - var yyb3053 bool - var yyhl3053 bool = l >= 0 - yyj3053++ - if yyhl3053 { - yyb3053 = yyj3053 > l + var yyj3102 int + var yyb3102 bool + var yyhl3102 bool = l >= 0 + yyj3102++ + if yyhl3102 { + yyb3102 = yyj3102 > l } else { - yyb3053 = r.CheckBreak() + yyb3102 = r.CheckBreak() } - if yyb3053 { + if yyb3102 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -37999,26 +38503,26 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv3054 := &x.Limits - yym3055 := z.DecBinary() - _ = yym3055 + yyv3103 := &x.Limits + yym3104 := z.DecBinary() + _ = yym3104 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv3054), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv3103), d) } } for { - yyj3053++ - if yyhl3053 { - yyb3053 = yyj3053 > l + yyj3102++ + if yyhl3102 { + yyb3102 = yyj3102 > l } else { - yyb3053 = r.CheckBreak() + yyb3102 = r.CheckBreak() } - if yyb3053 { + if yyb3102 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3053-1, "") + z.DecStructFieldNotFound(yyj3102-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -38030,38 +38534,38 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3056 := z.EncBinary() - _ = yym3056 + yym3105 := z.EncBinary() + _ = yym3105 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3057 := !z.EncBinary() - yy2arr3057 := z.EncBasicHandle().StructToArray - var yyq3057 [4]bool - _, _, _ = yysep3057, yyq3057, yy2arr3057 - const yyr3057 bool = false - yyq3057[0] = x.Kind != "" - yyq3057[1] = x.APIVersion != "" - yyq3057[2] = true - yyq3057[3] = true - var yynn3057 int - if yyr3057 || yy2arr3057 { + yysep3106 := !z.EncBinary() + yy2arr3106 := z.EncBasicHandle().StructToArray + var yyq3106 [4]bool + _, _, _ = yysep3106, yyq3106, yy2arr3106 + const yyr3106 bool = false + yyq3106[0] = x.Kind != "" + yyq3106[1] = x.APIVersion != "" + yyq3106[2] = true + yyq3106[3] = true + var yynn3106 int + if yyr3106 || yy2arr3106 { r.EncodeArrayStart(4) } else { - yynn3057 = 0 - for _, b := range yyq3057 { + yynn3106 = 0 + for _, b := range yyq3106 { if b { - yynn3057++ + yynn3106++ } } - r.EncodeMapStart(yynn3057) - yynn3057 = 0 + r.EncodeMapStart(yynn3106) + yynn3106 = 0 } - if yyr3057 || yy2arr3057 { + if yyr3106 || yy2arr3106 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3057[0] { - yym3059 := z.EncBinary() - _ = yym3059 + if yyq3106[0] { + yym3108 := z.EncBinary() + _ = yym3108 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -38070,23 +38574,23 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3057[0] { + if yyq3106[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3060 := z.EncBinary() - _ = yym3060 + yym3109 := z.EncBinary() + _ = yym3109 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3057 || yy2arr3057 { + if yyr3106 || yy2arr3106 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3057[1] { - yym3062 := z.EncBinary() - _ = yym3062 + if yyq3106[1] { + yym3111 := z.EncBinary() + _ = yym3111 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -38095,53 +38599,53 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3057[1] { + if yyq3106[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3063 := z.EncBinary() - _ = yym3063 + yym3112 := z.EncBinary() + _ = yym3112 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3057 || yy2arr3057 { + if yyr3106 || yy2arr3106 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3057[2] { - yy3065 := &x.ObjectMeta - yy3065.CodecEncodeSelf(e) + if yyq3106[2] { + yy3114 := &x.ObjectMeta + yy3114.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3057[2] { + if yyq3106[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3066 := &x.ObjectMeta - yy3066.CodecEncodeSelf(e) + yy3115 := &x.ObjectMeta + yy3115.CodecEncodeSelf(e) } } - if yyr3057 || yy2arr3057 { + if yyr3106 || yy2arr3106 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3057[3] { - yy3068 := &x.Spec - yy3068.CodecEncodeSelf(e) + if yyq3106[3] { + yy3117 := &x.Spec + yy3117.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3057[3] { + if yyq3106[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3069 := &x.Spec - yy3069.CodecEncodeSelf(e) + yy3118 := &x.Spec + yy3118.CodecEncodeSelf(e) } } - if yyr3057 || yy2arr3057 { + if yyr3106 || yy2arr3106 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -38154,25 +38658,25 @@ func (x *LimitRange) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3070 := z.DecBinary() - _ = yym3070 + yym3119 := z.DecBinary() + _ = yym3119 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3071 := r.ContainerType() - if yyct3071 == codecSelferValueTypeMap1234 { - yyl3071 := r.ReadMapStart() - if yyl3071 == 0 { + yyct3120 := r.ContainerType() + if yyct3120 == codecSelferValueTypeMap1234 { + yyl3120 := r.ReadMapStart() + if yyl3120 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3071, d) + x.codecDecodeSelfFromMap(yyl3120, d) } - } else if yyct3071 == codecSelferValueTypeArray1234 { - yyl3071 := r.ReadArrayStart() - if yyl3071 == 0 { + } else if yyct3120 == codecSelferValueTypeArray1234 { + yyl3120 := r.ReadArrayStart() + if yyl3120 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3071, d) + x.codecDecodeSelfFromArray(yyl3120, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -38184,12 +38688,12 @@ func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3072Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3072Slc - var yyhl3072 bool = l >= 0 - for yyj3072 := 0; ; yyj3072++ { - if yyhl3072 { - if yyj3072 >= l { + var yys3121Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3121Slc + var yyhl3121 bool = l >= 0 + for yyj3121 := 0; ; yyj3121++ { + if yyhl3121 { + if yyj3121 >= l { break } } else { @@ -38198,10 +38702,10 @@ func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3072Slc = r.DecodeBytes(yys3072Slc, true, true) - yys3072 := string(yys3072Slc) + yys3121Slc = r.DecodeBytes(yys3121Slc, true, true) + yys3121 := string(yys3121Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3072 { + switch yys3121 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -38218,20 +38722,20 @@ func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3075 := &x.ObjectMeta - yyv3075.CodecDecodeSelf(d) + yyv3124 := &x.ObjectMeta + yyv3124.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = LimitRangeSpec{} } else { - yyv3076 := &x.Spec - yyv3076.CodecDecodeSelf(d) + yyv3125 := &x.Spec + yyv3125.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3072) - } // end switch yys3072 - } // end for yyj3072 + z.DecStructFieldNotFound(-1, yys3121) + } // end switch yys3121 + } // end for yyj3121 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -38239,16 +38743,16 @@ func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3077 int - var yyb3077 bool - var yyhl3077 bool = l >= 0 - yyj3077++ - if yyhl3077 { - yyb3077 = yyj3077 > l + var yyj3126 int + var yyb3126 bool + var yyhl3126 bool = l >= 0 + yyj3126++ + if yyhl3126 { + yyb3126 = yyj3126 > l } else { - yyb3077 = r.CheckBreak() + yyb3126 = r.CheckBreak() } - if yyb3077 { + if yyb3126 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38258,13 +38762,13 @@ func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3077++ - if yyhl3077 { - yyb3077 = yyj3077 > l + yyj3126++ + if yyhl3126 { + yyb3126 = yyj3126 > l } else { - yyb3077 = r.CheckBreak() + yyb3126 = r.CheckBreak() } - if yyb3077 { + if yyb3126 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38274,13 +38778,13 @@ func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3077++ - if yyhl3077 { - yyb3077 = yyj3077 > l + yyj3126++ + if yyhl3126 { + yyb3126 = yyj3126 > l } else { - yyb3077 = r.CheckBreak() + yyb3126 = r.CheckBreak() } - if yyb3077 { + if yyb3126 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38288,16 +38792,16 @@ func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3080 := &x.ObjectMeta - yyv3080.CodecDecodeSelf(d) + yyv3129 := &x.ObjectMeta + yyv3129.CodecDecodeSelf(d) } - yyj3077++ - if yyhl3077 { - yyb3077 = yyj3077 > l + yyj3126++ + if yyhl3126 { + yyb3126 = yyj3126 > l } else { - yyb3077 = r.CheckBreak() + yyb3126 = r.CheckBreak() } - if yyb3077 { + if yyb3126 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38305,21 +38809,21 @@ func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = LimitRangeSpec{} } else { - yyv3081 := &x.Spec - yyv3081.CodecDecodeSelf(d) + yyv3130 := &x.Spec + yyv3130.CodecDecodeSelf(d) } for { - yyj3077++ - if yyhl3077 { - yyb3077 = yyj3077 > l + yyj3126++ + if yyhl3126 { + yyb3126 = yyj3126 > l } else { - yyb3077 = r.CheckBreak() + yyb3126 = r.CheckBreak() } - if yyb3077 { + if yyb3126 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3077-1, "") + z.DecStructFieldNotFound(yyj3126-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -38331,37 +38835,37 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3082 := z.EncBinary() - _ = yym3082 + yym3131 := z.EncBinary() + _ = yym3131 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3083 := !z.EncBinary() - yy2arr3083 := z.EncBasicHandle().StructToArray - var yyq3083 [4]bool - _, _, _ = yysep3083, yyq3083, yy2arr3083 - const yyr3083 bool = false - yyq3083[0] = x.Kind != "" - yyq3083[1] = x.APIVersion != "" - yyq3083[2] = true - var yynn3083 int - if yyr3083 || yy2arr3083 { + yysep3132 := !z.EncBinary() + yy2arr3132 := z.EncBasicHandle().StructToArray + var yyq3132 [4]bool + _, _, _ = yysep3132, yyq3132, yy2arr3132 + const yyr3132 bool = false + yyq3132[0] = x.Kind != "" + yyq3132[1] = x.APIVersion != "" + yyq3132[2] = true + var yynn3132 int + if yyr3132 || yy2arr3132 { r.EncodeArrayStart(4) } else { - yynn3083 = 1 - for _, b := range yyq3083 { + yynn3132 = 1 + for _, b := range yyq3132 { if b { - yynn3083++ + yynn3132++ } } - r.EncodeMapStart(yynn3083) - yynn3083 = 0 + r.EncodeMapStart(yynn3132) + yynn3132 = 0 } - if yyr3083 || yy2arr3083 { + if yyr3132 || yy2arr3132 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3083[0] { - yym3085 := z.EncBinary() - _ = yym3085 + if yyq3132[0] { + yym3134 := z.EncBinary() + _ = yym3134 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -38370,23 +38874,23 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3083[0] { + if yyq3132[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3086 := z.EncBinary() - _ = yym3086 + yym3135 := z.EncBinary() + _ = yym3135 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3083 || yy2arr3083 { + if yyr3132 || yy2arr3132 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3083[1] { - yym3088 := z.EncBinary() - _ = yym3088 + if yyq3132[1] { + yym3137 := z.EncBinary() + _ = yym3137 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -38395,54 +38899,54 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3083[1] { + if yyq3132[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3089 := z.EncBinary() - _ = yym3089 + yym3138 := z.EncBinary() + _ = yym3138 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3083 || yy2arr3083 { + if yyr3132 || yy2arr3132 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3083[2] { - yy3091 := &x.ListMeta - yym3092 := z.EncBinary() - _ = yym3092 + if yyq3132[2] { + yy3140 := &x.ListMeta + yym3141 := z.EncBinary() + _ = yym3141 if false { - } else if z.HasExtensions() && z.EncExt(yy3091) { + } else if z.HasExtensions() && z.EncExt(yy3140) { } else { - z.EncFallback(yy3091) + z.EncFallback(yy3140) } } else { r.EncodeNil() } } else { - if yyq3083[2] { + if yyq3132[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3093 := &x.ListMeta - yym3094 := z.EncBinary() - _ = yym3094 + yy3142 := &x.ListMeta + yym3143 := z.EncBinary() + _ = yym3143 if false { - } else if z.HasExtensions() && z.EncExt(yy3093) { + } else if z.HasExtensions() && z.EncExt(yy3142) { } else { - z.EncFallback(yy3093) + z.EncFallback(yy3142) } } } - if yyr3083 || yy2arr3083 { + if yyr3132 || yy2arr3132 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym3096 := z.EncBinary() - _ = yym3096 + yym3145 := z.EncBinary() + _ = yym3145 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) @@ -38455,15 +38959,15 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3097 := z.EncBinary() - _ = yym3097 + yym3146 := z.EncBinary() + _ = yym3146 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) } } } - if yyr3083 || yy2arr3083 { + if yyr3132 || yy2arr3132 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -38476,25 +38980,25 @@ func (x *LimitRangeList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3098 := z.DecBinary() - _ = yym3098 + yym3147 := z.DecBinary() + _ = yym3147 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3099 := r.ContainerType() - if yyct3099 == codecSelferValueTypeMap1234 { - yyl3099 := r.ReadMapStart() - if yyl3099 == 0 { + yyct3148 := r.ContainerType() + if yyct3148 == codecSelferValueTypeMap1234 { + yyl3148 := r.ReadMapStart() + if yyl3148 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3099, d) + x.codecDecodeSelfFromMap(yyl3148, d) } - } else if yyct3099 == codecSelferValueTypeArray1234 { - yyl3099 := r.ReadArrayStart() - if yyl3099 == 0 { + } else if yyct3148 == codecSelferValueTypeArray1234 { + yyl3148 := r.ReadArrayStart() + if yyl3148 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3099, d) + x.codecDecodeSelfFromArray(yyl3148, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -38506,12 +39010,12 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3100Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3100Slc - var yyhl3100 bool = l >= 0 - for yyj3100 := 0; ; yyj3100++ { - if yyhl3100 { - if yyj3100 >= l { + var yys3149Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3149Slc + var yyhl3149 bool = l >= 0 + for yyj3149 := 0; ; yyj3149++ { + if yyhl3149 { + if yyj3149 >= l { break } } else { @@ -38520,10 +39024,10 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3100Slc = r.DecodeBytes(yys3100Slc, true, true) - yys3100 := string(yys3100Slc) + yys3149Slc = r.DecodeBytes(yys3149Slc, true, true) + yys3149 := string(yys3149Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3100 { + switch yys3149 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -38540,31 +39044,31 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3103 := &x.ListMeta - yym3104 := z.DecBinary() - _ = yym3104 + yyv3152 := &x.ListMeta + yym3153 := z.DecBinary() + _ = yym3153 if false { - } else if z.HasExtensions() && z.DecExt(yyv3103) { + } else if z.HasExtensions() && z.DecExt(yyv3152) { } else { - z.DecFallback(yyv3103, false) + z.DecFallback(yyv3152, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3105 := &x.Items - yym3106 := z.DecBinary() - _ = yym3106 + yyv3154 := &x.Items + yym3155 := z.DecBinary() + _ = yym3155 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv3105), d) + h.decSliceLimitRange((*[]LimitRange)(yyv3154), d) } } default: - z.DecStructFieldNotFound(-1, yys3100) - } // end switch yys3100 - } // end for yyj3100 + z.DecStructFieldNotFound(-1, yys3149) + } // end switch yys3149 + } // end for yyj3149 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -38572,16 +39076,16 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3107 int - var yyb3107 bool - var yyhl3107 bool = l >= 0 - yyj3107++ - if yyhl3107 { - yyb3107 = yyj3107 > l + var yyj3156 int + var yyb3156 bool + var yyhl3156 bool = l >= 0 + yyj3156++ + if yyhl3156 { + yyb3156 = yyj3156 > l } else { - yyb3107 = r.CheckBreak() + yyb3156 = r.CheckBreak() } - if yyb3107 { + if yyb3156 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38591,13 +39095,13 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3107++ - if yyhl3107 { - yyb3107 = yyj3107 > l + yyj3156++ + if yyhl3156 { + yyb3156 = yyj3156 > l } else { - yyb3107 = r.CheckBreak() + yyb3156 = r.CheckBreak() } - if yyb3107 { + if yyb3156 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38607,13 +39111,13 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3107++ - if yyhl3107 { - yyb3107 = yyj3107 > l + yyj3156++ + if yyhl3156 { + yyb3156 = yyj3156 > l } else { - yyb3107 = r.CheckBreak() + yyb3156 = r.CheckBreak() } - if yyb3107 { + if yyb3156 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38621,22 +39125,22 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3110 := &x.ListMeta - yym3111 := z.DecBinary() - _ = yym3111 + yyv3159 := &x.ListMeta + yym3160 := z.DecBinary() + _ = yym3160 if false { - } else if z.HasExtensions() && z.DecExt(yyv3110) { + } else if z.HasExtensions() && z.DecExt(yyv3159) { } else { - z.DecFallback(yyv3110, false) + z.DecFallback(yyv3159, false) } } - yyj3107++ - if yyhl3107 { - yyb3107 = yyj3107 > l + yyj3156++ + if yyhl3156 { + yyb3156 = yyj3156 > l } else { - yyb3107 = r.CheckBreak() + yyb3156 = r.CheckBreak() } - if yyb3107 { + if yyb3156 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38644,26 +39148,26 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3112 := &x.Items - yym3113 := z.DecBinary() - _ = yym3113 + yyv3161 := &x.Items + yym3162 := z.DecBinary() + _ = yym3162 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv3112), d) + h.decSliceLimitRange((*[]LimitRange)(yyv3161), d) } } for { - yyj3107++ - if yyhl3107 { - yyb3107 = yyj3107 > l + yyj3156++ + if yyhl3156 { + yyb3156 = yyj3156 > l } else { - yyb3107 = r.CheckBreak() + yyb3156 = r.CheckBreak() } - if yyb3107 { + if yyb3156 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3107-1, "") + z.DecStructFieldNotFound(yyj3156-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -38675,33 +39179,33 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3114 := z.EncBinary() - _ = yym3114 + yym3163 := z.EncBinary() + _ = yym3163 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3115 := !z.EncBinary() - yy2arr3115 := z.EncBasicHandle().StructToArray - var yyq3115 [1]bool - _, _, _ = yysep3115, yyq3115, yy2arr3115 - const yyr3115 bool = false - yyq3115[0] = len(x.Hard) != 0 - var yynn3115 int - if yyr3115 || yy2arr3115 { + yysep3164 := !z.EncBinary() + yy2arr3164 := z.EncBasicHandle().StructToArray + var yyq3164 [1]bool + _, _, _ = yysep3164, yyq3164, yy2arr3164 + const yyr3164 bool = false + yyq3164[0] = len(x.Hard) != 0 + var yynn3164 int + if yyr3164 || yy2arr3164 { r.EncodeArrayStart(1) } else { - yynn3115 = 0 - for _, b := range yyq3115 { + yynn3164 = 0 + for _, b := range yyq3164 { if b { - yynn3115++ + yynn3164++ } } - r.EncodeMapStart(yynn3115) - yynn3115 = 0 + r.EncodeMapStart(yynn3164) + yynn3164 = 0 } - if yyr3115 || yy2arr3115 { + if yyr3164 || yy2arr3164 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3115[0] { + if yyq3164[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -38711,7 +39215,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3115[0] { + if yyq3164[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -38722,7 +39226,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3115 || yy2arr3115 { + if yyr3164 || yy2arr3164 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -38735,25 +39239,25 @@ func (x *ResourceQuotaSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3117 := z.DecBinary() - _ = yym3117 + yym3166 := z.DecBinary() + _ = yym3166 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3118 := r.ContainerType() - if yyct3118 == codecSelferValueTypeMap1234 { - yyl3118 := r.ReadMapStart() - if yyl3118 == 0 { + yyct3167 := r.ContainerType() + if yyct3167 == codecSelferValueTypeMap1234 { + yyl3167 := r.ReadMapStart() + if yyl3167 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3118, d) + x.codecDecodeSelfFromMap(yyl3167, d) } - } else if yyct3118 == codecSelferValueTypeArray1234 { - yyl3118 := r.ReadArrayStart() - if yyl3118 == 0 { + } else if yyct3167 == codecSelferValueTypeArray1234 { + yyl3167 := r.ReadArrayStart() + if yyl3167 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3118, d) + x.codecDecodeSelfFromArray(yyl3167, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -38765,12 +39269,12 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3119Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3119Slc - var yyhl3119 bool = l >= 0 - for yyj3119 := 0; ; yyj3119++ { - if yyhl3119 { - if yyj3119 >= l { + var yys3168Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3168Slc + var yyhl3168 bool = l >= 0 + for yyj3168 := 0; ; yyj3168++ { + if yyhl3168 { + if yyj3168 >= l { break } } else { @@ -38779,21 +39283,21 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3119Slc = r.DecodeBytes(yys3119Slc, true, true) - yys3119 := string(yys3119Slc) + yys3168Slc = r.DecodeBytes(yys3168Slc, true, true) + yys3168 := string(yys3168Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3119 { + switch yys3168 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv3120 := &x.Hard - yyv3120.CodecDecodeSelf(d) + yyv3169 := &x.Hard + yyv3169.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3119) - } // end switch yys3119 - } // end for yyj3119 + z.DecStructFieldNotFound(-1, yys3168) + } // end switch yys3168 + } // end for yyj3168 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -38801,16 +39305,16 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3121 int - var yyb3121 bool - var yyhl3121 bool = l >= 0 - yyj3121++ - if yyhl3121 { - yyb3121 = yyj3121 > l + var yyj3170 int + var yyb3170 bool + var yyhl3170 bool = l >= 0 + yyj3170++ + if yyhl3170 { + yyb3170 = yyj3170 > l } else { - yyb3121 = r.CheckBreak() + yyb3170 = r.CheckBreak() } - if yyb3121 { + if yyb3170 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -38818,21 +39322,21 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv3122 := &x.Hard - yyv3122.CodecDecodeSelf(d) + yyv3171 := &x.Hard + yyv3171.CodecDecodeSelf(d) } for { - yyj3121++ - if yyhl3121 { - yyb3121 = yyj3121 > l + yyj3170++ + if yyhl3170 { + yyb3170 = yyj3170 > l } else { - yyb3121 = r.CheckBreak() + yyb3170 = r.CheckBreak() } - if yyb3121 { + if yyb3170 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3121-1, "") + z.DecStructFieldNotFound(yyj3170-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -38844,34 +39348,34 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3123 := z.EncBinary() - _ = yym3123 + yym3172 := z.EncBinary() + _ = yym3172 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3124 := !z.EncBinary() - yy2arr3124 := z.EncBasicHandle().StructToArray - var yyq3124 [2]bool - _, _, _ = yysep3124, yyq3124, yy2arr3124 - const yyr3124 bool = false - yyq3124[0] = len(x.Hard) != 0 - yyq3124[1] = len(x.Used) != 0 - var yynn3124 int - if yyr3124 || yy2arr3124 { + yysep3173 := !z.EncBinary() + yy2arr3173 := z.EncBasicHandle().StructToArray + var yyq3173 [2]bool + _, _, _ = yysep3173, yyq3173, yy2arr3173 + const yyr3173 bool = false + yyq3173[0] = len(x.Hard) != 0 + yyq3173[1] = len(x.Used) != 0 + var yynn3173 int + if yyr3173 || yy2arr3173 { r.EncodeArrayStart(2) } else { - yynn3124 = 0 - for _, b := range yyq3124 { + yynn3173 = 0 + for _, b := range yyq3173 { if b { - yynn3124++ + yynn3173++ } } - r.EncodeMapStart(yynn3124) - yynn3124 = 0 + r.EncodeMapStart(yynn3173) + yynn3173 = 0 } - if yyr3124 || yy2arr3124 { + if yyr3173 || yy2arr3173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3124[0] { + if yyq3173[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -38881,7 +39385,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3124[0] { + if yyq3173[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -38892,9 +39396,9 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3124 || yy2arr3124 { + if yyr3173 || yy2arr3173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3124[1] { + if yyq3173[1] { if x.Used == nil { r.EncodeNil() } else { @@ -38904,7 +39408,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3124[1] { + if yyq3173[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("used")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -38915,7 +39419,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3124 || yy2arr3124 { + if yyr3173 || yy2arr3173 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -38928,25 +39432,25 @@ func (x *ResourceQuotaStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3127 := z.DecBinary() - _ = yym3127 + yym3176 := z.DecBinary() + _ = yym3176 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3128 := r.ContainerType() - if yyct3128 == codecSelferValueTypeMap1234 { - yyl3128 := r.ReadMapStart() - if yyl3128 == 0 { + yyct3177 := r.ContainerType() + if yyct3177 == codecSelferValueTypeMap1234 { + yyl3177 := r.ReadMapStart() + if yyl3177 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3128, d) + x.codecDecodeSelfFromMap(yyl3177, d) } - } else if yyct3128 == codecSelferValueTypeArray1234 { - yyl3128 := r.ReadArrayStart() - if yyl3128 == 0 { + } else if yyct3177 == codecSelferValueTypeArray1234 { + yyl3177 := r.ReadArrayStart() + if yyl3177 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3128, d) + x.codecDecodeSelfFromArray(yyl3177, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -38958,12 +39462,12 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3129Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3129Slc - var yyhl3129 bool = l >= 0 - for yyj3129 := 0; ; yyj3129++ { - if yyhl3129 { - if yyj3129 >= l { + var yys3178Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3178Slc + var yyhl3178 bool = l >= 0 + for yyj3178 := 0; ; yyj3178++ { + if yyhl3178 { + if yyj3178 >= l { break } } else { @@ -38972,28 +39476,28 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3129Slc = r.DecodeBytes(yys3129Slc, true, true) - yys3129 := string(yys3129Slc) + yys3178Slc = r.DecodeBytes(yys3178Slc, true, true) + yys3178 := string(yys3178Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3129 { + switch yys3178 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv3130 := &x.Hard - yyv3130.CodecDecodeSelf(d) + yyv3179 := &x.Hard + yyv3179.CodecDecodeSelf(d) } case "used": if r.TryDecodeAsNil() { x.Used = nil } else { - yyv3131 := &x.Used - yyv3131.CodecDecodeSelf(d) + yyv3180 := &x.Used + yyv3180.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3129) - } // end switch yys3129 - } // end for yyj3129 + z.DecStructFieldNotFound(-1, yys3178) + } // end switch yys3178 + } // end for yyj3178 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -39001,16 +39505,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3132 int - var yyb3132 bool - var yyhl3132 bool = l >= 0 - yyj3132++ - if yyhl3132 { - yyb3132 = yyj3132 > l + var yyj3181 int + var yyb3181 bool + var yyhl3181 bool = l >= 0 + yyj3181++ + if yyhl3181 { + yyb3181 = yyj3181 > l } else { - yyb3132 = r.CheckBreak() + yyb3181 = r.CheckBreak() } - if yyb3132 { + if yyb3181 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39018,16 +39522,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv3133 := &x.Hard - yyv3133.CodecDecodeSelf(d) + yyv3182 := &x.Hard + yyv3182.CodecDecodeSelf(d) } - yyj3132++ - if yyhl3132 { - yyb3132 = yyj3132 > l + yyj3181++ + if yyhl3181 { + yyb3181 = yyj3181 > l } else { - yyb3132 = r.CheckBreak() + yyb3181 = r.CheckBreak() } - if yyb3132 { + if yyb3181 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39035,21 +39539,21 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Used = nil } else { - yyv3134 := &x.Used - yyv3134.CodecDecodeSelf(d) + yyv3183 := &x.Used + yyv3183.CodecDecodeSelf(d) } for { - yyj3132++ - if yyhl3132 { - yyb3132 = yyj3132 > l + yyj3181++ + if yyhl3181 { + yyb3181 = yyj3181 > l } else { - yyb3132 = r.CheckBreak() + yyb3181 = r.CheckBreak() } - if yyb3132 { + if yyb3181 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3132-1, "") + z.DecStructFieldNotFound(yyj3181-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -39061,39 +39565,39 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3135 := z.EncBinary() - _ = yym3135 + yym3184 := z.EncBinary() + _ = yym3184 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3136 := !z.EncBinary() - yy2arr3136 := z.EncBasicHandle().StructToArray - var yyq3136 [5]bool - _, _, _ = yysep3136, yyq3136, yy2arr3136 - const yyr3136 bool = false - yyq3136[0] = x.Kind != "" - yyq3136[1] = x.APIVersion != "" - yyq3136[2] = true - yyq3136[3] = true - yyq3136[4] = true - var yynn3136 int - if yyr3136 || yy2arr3136 { + yysep3185 := !z.EncBinary() + yy2arr3185 := z.EncBasicHandle().StructToArray + var yyq3185 [5]bool + _, _, _ = yysep3185, yyq3185, yy2arr3185 + const yyr3185 bool = false + yyq3185[0] = x.Kind != "" + yyq3185[1] = x.APIVersion != "" + yyq3185[2] = true + yyq3185[3] = true + yyq3185[4] = true + var yynn3185 int + if yyr3185 || yy2arr3185 { r.EncodeArrayStart(5) } else { - yynn3136 = 0 - for _, b := range yyq3136 { + yynn3185 = 0 + for _, b := range yyq3185 { if b { - yynn3136++ + yynn3185++ } } - r.EncodeMapStart(yynn3136) - yynn3136 = 0 + r.EncodeMapStart(yynn3185) + yynn3185 = 0 } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3136[0] { - yym3138 := z.EncBinary() - _ = yym3138 + if yyq3185[0] { + yym3187 := z.EncBinary() + _ = yym3187 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -39102,23 +39606,23 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3136[0] { + if yyq3185[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3139 := z.EncBinary() - _ = yym3139 + yym3188 := z.EncBinary() + _ = yym3188 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3136[1] { - yym3141 := z.EncBinary() - _ = yym3141 + if yyq3185[1] { + yym3190 := z.EncBinary() + _ = yym3190 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -39127,70 +39631,70 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3136[1] { + if yyq3185[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3142 := z.EncBinary() - _ = yym3142 + yym3191 := z.EncBinary() + _ = yym3191 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3136[2] { - yy3144 := &x.ObjectMeta - yy3144.CodecEncodeSelf(e) + if yyq3185[2] { + yy3193 := &x.ObjectMeta + yy3193.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3136[2] { + if yyq3185[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3145 := &x.ObjectMeta - yy3145.CodecEncodeSelf(e) + yy3194 := &x.ObjectMeta + yy3194.CodecEncodeSelf(e) } } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3136[3] { - yy3147 := &x.Spec - yy3147.CodecEncodeSelf(e) + if yyq3185[3] { + yy3196 := &x.Spec + yy3196.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3136[3] { + if yyq3185[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3148 := &x.Spec - yy3148.CodecEncodeSelf(e) + yy3197 := &x.Spec + yy3197.CodecEncodeSelf(e) } } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3136[4] { - yy3150 := &x.Status - yy3150.CodecEncodeSelf(e) + if yyq3185[4] { + yy3199 := &x.Status + yy3199.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3136[4] { + if yyq3185[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("status")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3151 := &x.Status - yy3151.CodecEncodeSelf(e) + yy3200 := &x.Status + yy3200.CodecEncodeSelf(e) } } - if yyr3136 || yy2arr3136 { + if yyr3185 || yy2arr3185 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -39203,25 +39707,25 @@ func (x *ResourceQuota) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3152 := z.DecBinary() - _ = yym3152 + yym3201 := z.DecBinary() + _ = yym3201 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3153 := r.ContainerType() - if yyct3153 == codecSelferValueTypeMap1234 { - yyl3153 := r.ReadMapStart() - if yyl3153 == 0 { + yyct3202 := r.ContainerType() + if yyct3202 == codecSelferValueTypeMap1234 { + yyl3202 := r.ReadMapStart() + if yyl3202 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3153, d) + x.codecDecodeSelfFromMap(yyl3202, d) } - } else if yyct3153 == codecSelferValueTypeArray1234 { - yyl3153 := r.ReadArrayStart() - if yyl3153 == 0 { + } else if yyct3202 == codecSelferValueTypeArray1234 { + yyl3202 := r.ReadArrayStart() + if yyl3202 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3153, d) + x.codecDecodeSelfFromArray(yyl3202, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -39233,12 +39737,12 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3154Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3154Slc - var yyhl3154 bool = l >= 0 - for yyj3154 := 0; ; yyj3154++ { - if yyhl3154 { - if yyj3154 >= l { + var yys3203Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3203Slc + var yyhl3203 bool = l >= 0 + for yyj3203 := 0; ; yyj3203++ { + if yyhl3203 { + if yyj3203 >= l { break } } else { @@ -39247,10 +39751,10 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3154Slc = r.DecodeBytes(yys3154Slc, true, true) - yys3154 := string(yys3154Slc) + yys3203Slc = r.DecodeBytes(yys3203Slc, true, true) + yys3203 := string(yys3203Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3154 { + switch yys3203 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -39267,27 +39771,27 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3157 := &x.ObjectMeta - yyv3157.CodecDecodeSelf(d) + yyv3206 := &x.ObjectMeta + yyv3206.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv3158 := &x.Spec - yyv3158.CodecDecodeSelf(d) + yyv3207 := &x.Spec + yyv3207.CodecDecodeSelf(d) } case "status": if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv3159 := &x.Status - yyv3159.CodecDecodeSelf(d) + yyv3208 := &x.Status + yyv3208.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3154) - } // end switch yys3154 - } // end for yyj3154 + z.DecStructFieldNotFound(-1, yys3203) + } // end switch yys3203 + } // end for yyj3203 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -39295,16 +39799,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3160 int - var yyb3160 bool - var yyhl3160 bool = l >= 0 - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + var yyj3209 int + var yyb3209 bool + var yyhl3209 bool = l >= 0 + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39314,13 +39818,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39330,13 +39834,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39344,16 +39848,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3163 := &x.ObjectMeta - yyv3163.CodecDecodeSelf(d) + yyv3212 := &x.ObjectMeta + yyv3212.CodecDecodeSelf(d) } - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39361,16 +39865,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv3164 := &x.Spec - yyv3164.CodecDecodeSelf(d) + yyv3213 := &x.Spec + yyv3213.CodecDecodeSelf(d) } - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39378,21 +39882,21 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv3165 := &x.Status - yyv3165.CodecDecodeSelf(d) + yyv3214 := &x.Status + yyv3214.CodecDecodeSelf(d) } for { - yyj3160++ - if yyhl3160 { - yyb3160 = yyj3160 > l + yyj3209++ + if yyhl3209 { + yyb3209 = yyj3209 > l } else { - yyb3160 = r.CheckBreak() + yyb3209 = r.CheckBreak() } - if yyb3160 { + if yyb3209 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3160-1, "") + z.DecStructFieldNotFound(yyj3209-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -39404,37 +39908,37 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3166 := z.EncBinary() - _ = yym3166 + yym3215 := z.EncBinary() + _ = yym3215 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3167 := !z.EncBinary() - yy2arr3167 := z.EncBasicHandle().StructToArray - var yyq3167 [4]bool - _, _, _ = yysep3167, yyq3167, yy2arr3167 - const yyr3167 bool = false - yyq3167[0] = x.Kind != "" - yyq3167[1] = x.APIVersion != "" - yyq3167[2] = true - var yynn3167 int - if yyr3167 || yy2arr3167 { + yysep3216 := !z.EncBinary() + yy2arr3216 := z.EncBasicHandle().StructToArray + var yyq3216 [4]bool + _, _, _ = yysep3216, yyq3216, yy2arr3216 + const yyr3216 bool = false + yyq3216[0] = x.Kind != "" + yyq3216[1] = x.APIVersion != "" + yyq3216[2] = true + var yynn3216 int + if yyr3216 || yy2arr3216 { r.EncodeArrayStart(4) } else { - yynn3167 = 1 - for _, b := range yyq3167 { + yynn3216 = 1 + for _, b := range yyq3216 { if b { - yynn3167++ + yynn3216++ } } - r.EncodeMapStart(yynn3167) - yynn3167 = 0 + r.EncodeMapStart(yynn3216) + yynn3216 = 0 } - if yyr3167 || yy2arr3167 { + if yyr3216 || yy2arr3216 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3167[0] { - yym3169 := z.EncBinary() - _ = yym3169 + if yyq3216[0] { + yym3218 := z.EncBinary() + _ = yym3218 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -39443,23 +39947,23 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3167[0] { + if yyq3216[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3170 := z.EncBinary() - _ = yym3170 + yym3219 := z.EncBinary() + _ = yym3219 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3167 || yy2arr3167 { + if yyr3216 || yy2arr3216 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3167[1] { - yym3172 := z.EncBinary() - _ = yym3172 + if yyq3216[1] { + yym3221 := z.EncBinary() + _ = yym3221 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -39468,54 +39972,54 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3167[1] { + if yyq3216[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3173 := z.EncBinary() - _ = yym3173 + yym3222 := z.EncBinary() + _ = yym3222 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3167 || yy2arr3167 { + if yyr3216 || yy2arr3216 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3167[2] { - yy3175 := &x.ListMeta - yym3176 := z.EncBinary() - _ = yym3176 + if yyq3216[2] { + yy3224 := &x.ListMeta + yym3225 := z.EncBinary() + _ = yym3225 if false { - } else if z.HasExtensions() && z.EncExt(yy3175) { + } else if z.HasExtensions() && z.EncExt(yy3224) { } else { - z.EncFallback(yy3175) + z.EncFallback(yy3224) } } else { r.EncodeNil() } } else { - if yyq3167[2] { + if yyq3216[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3177 := &x.ListMeta - yym3178 := z.EncBinary() - _ = yym3178 + yy3226 := &x.ListMeta + yym3227 := z.EncBinary() + _ = yym3227 if false { - } else if z.HasExtensions() && z.EncExt(yy3177) { + } else if z.HasExtensions() && z.EncExt(yy3226) { } else { - z.EncFallback(yy3177) + z.EncFallback(yy3226) } } } - if yyr3167 || yy2arr3167 { + if yyr3216 || yy2arr3216 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym3180 := z.EncBinary() - _ = yym3180 + yym3229 := z.EncBinary() + _ = yym3229 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) @@ -39528,15 +40032,15 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3181 := z.EncBinary() - _ = yym3181 + yym3230 := z.EncBinary() + _ = yym3230 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) } } } - if yyr3167 || yy2arr3167 { + if yyr3216 || yy2arr3216 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -39549,25 +40053,25 @@ func (x *ResourceQuotaList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3182 := z.DecBinary() - _ = yym3182 + yym3231 := z.DecBinary() + _ = yym3231 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3183 := r.ContainerType() - if yyct3183 == codecSelferValueTypeMap1234 { - yyl3183 := r.ReadMapStart() - if yyl3183 == 0 { + yyct3232 := r.ContainerType() + if yyct3232 == codecSelferValueTypeMap1234 { + yyl3232 := r.ReadMapStart() + if yyl3232 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3183, d) + x.codecDecodeSelfFromMap(yyl3232, d) } - } else if yyct3183 == codecSelferValueTypeArray1234 { - yyl3183 := r.ReadArrayStart() - if yyl3183 == 0 { + } else if yyct3232 == codecSelferValueTypeArray1234 { + yyl3232 := r.ReadArrayStart() + if yyl3232 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3183, d) + x.codecDecodeSelfFromArray(yyl3232, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -39579,12 +40083,12 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3184Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3184Slc - var yyhl3184 bool = l >= 0 - for yyj3184 := 0; ; yyj3184++ { - if yyhl3184 { - if yyj3184 >= l { + var yys3233Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3233Slc + var yyhl3233 bool = l >= 0 + for yyj3233 := 0; ; yyj3233++ { + if yyhl3233 { + if yyj3233 >= l { break } } else { @@ -39593,10 +40097,10 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3184Slc = r.DecodeBytes(yys3184Slc, true, true) - yys3184 := string(yys3184Slc) + yys3233Slc = r.DecodeBytes(yys3233Slc, true, true) + yys3233 := string(yys3233Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3184 { + switch yys3233 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -39613,31 +40117,31 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3187 := &x.ListMeta - yym3188 := z.DecBinary() - _ = yym3188 + yyv3236 := &x.ListMeta + yym3237 := z.DecBinary() + _ = yym3237 if false { - } else if z.HasExtensions() && z.DecExt(yyv3187) { + } else if z.HasExtensions() && z.DecExt(yyv3236) { } else { - z.DecFallback(yyv3187, false) + z.DecFallback(yyv3236, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3189 := &x.Items - yym3190 := z.DecBinary() - _ = yym3190 + yyv3238 := &x.Items + yym3239 := z.DecBinary() + _ = yym3239 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv3189), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv3238), d) } } default: - z.DecStructFieldNotFound(-1, yys3184) - } // end switch yys3184 - } // end for yyj3184 + z.DecStructFieldNotFound(-1, yys3233) + } // end switch yys3233 + } // end for yyj3233 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -39645,16 +40149,16 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3191 int - var yyb3191 bool - var yyhl3191 bool = l >= 0 - yyj3191++ - if yyhl3191 { - yyb3191 = yyj3191 > l + var yyj3240 int + var yyb3240 bool + var yyhl3240 bool = l >= 0 + yyj3240++ + if yyhl3240 { + yyb3240 = yyj3240 > l } else { - yyb3191 = r.CheckBreak() + yyb3240 = r.CheckBreak() } - if yyb3191 { + if yyb3240 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39664,13 +40168,13 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.Kind = string(r.DecodeString()) } - yyj3191++ - if yyhl3191 { - yyb3191 = yyj3191 > l + yyj3240++ + if yyhl3240 { + yyb3240 = yyj3240 > l } else { - yyb3191 = r.CheckBreak() + yyb3240 = r.CheckBreak() } - if yyb3191 { + if yyb3240 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39680,13 +40184,13 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.APIVersion = string(r.DecodeString()) } - yyj3191++ - if yyhl3191 { - yyb3191 = yyj3191 > l + yyj3240++ + if yyhl3240 { + yyb3240 = yyj3240 > l } else { - yyb3191 = r.CheckBreak() + yyb3240 = r.CheckBreak() } - if yyb3191 { + if yyb3240 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39694,22 +40198,22 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3194 := &x.ListMeta - yym3195 := z.DecBinary() - _ = yym3195 + yyv3243 := &x.ListMeta + yym3244 := z.DecBinary() + _ = yym3244 if false { - } else if z.HasExtensions() && z.DecExt(yyv3194) { + } else if z.HasExtensions() && z.DecExt(yyv3243) { } else { - z.DecFallback(yyv3194, false) + z.DecFallback(yyv3243, false) } } - yyj3191++ - if yyhl3191 { - yyb3191 = yyj3191 > l + yyj3240++ + if yyhl3240 { + yyb3240 = yyj3240 > l } else { - yyb3191 = r.CheckBreak() + yyb3240 = r.CheckBreak() } - if yyb3191 { + if yyb3240 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -39717,26 +40221,26 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3196 := &x.Items - yym3197 := z.DecBinary() - _ = yym3197 + yyv3245 := &x.Items + yym3246 := z.DecBinary() + _ = yym3246 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv3196), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv3245), d) } } for { - yyj3191++ - if yyhl3191 { - yyb3191 = yyj3191 > l + yyj3240++ + if yyhl3240 { + yyb3240 = yyj3240 > l } else { - yyb3191 = r.CheckBreak() + yyb3240 = r.CheckBreak() } - if yyb3191 { + if yyb3240 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3191-1, "") + z.DecStructFieldNotFound(yyj3240-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -39748,39 +40252,39 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3198 := z.EncBinary() - _ = yym3198 + yym3247 := z.EncBinary() + _ = yym3247 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3199 := !z.EncBinary() - yy2arr3199 := z.EncBasicHandle().StructToArray - var yyq3199 [5]bool - _, _, _ = yysep3199, yyq3199, yy2arr3199 - const yyr3199 bool = false - yyq3199[0] = x.Kind != "" - yyq3199[1] = x.APIVersion != "" - yyq3199[2] = true - yyq3199[3] = len(x.Data) != 0 - yyq3199[4] = x.Type != "" - var yynn3199 int - if yyr3199 || yy2arr3199 { + yysep3248 := !z.EncBinary() + yy2arr3248 := z.EncBasicHandle().StructToArray + var yyq3248 [5]bool + _, _, _ = yysep3248, yyq3248, yy2arr3248 + const yyr3248 bool = false + yyq3248[0] = x.Kind != "" + yyq3248[1] = x.APIVersion != "" + yyq3248[2] = true + yyq3248[3] = len(x.Data) != 0 + yyq3248[4] = x.Type != "" + var yynn3248 int + if yyr3248 || yy2arr3248 { r.EncodeArrayStart(5) } else { - yynn3199 = 0 - for _, b := range yyq3199 { + yynn3248 = 0 + for _, b := range yyq3248 { if b { - yynn3199++ + yynn3248++ } } - r.EncodeMapStart(yynn3199) - yynn3199 = 0 + r.EncodeMapStart(yynn3248) + yynn3248 = 0 } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3199[0] { - yym3201 := z.EncBinary() - _ = yym3201 + if yyq3248[0] { + yym3250 := z.EncBinary() + _ = yym3250 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -39789,23 +40293,23 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3199[0] { + if yyq3248[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3202 := z.EncBinary() - _ = yym3202 + yym3251 := z.EncBinary() + _ = yym3251 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3199[1] { - yym3204 := z.EncBinary() - _ = yym3204 + if yyq3248[1] { + yym3253 := z.EncBinary() + _ = yym3253 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -39814,43 +40318,43 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3199[1] { + if yyq3248[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3205 := z.EncBinary() - _ = yym3205 + yym3254 := z.EncBinary() + _ = yym3254 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3199[2] { - yy3207 := &x.ObjectMeta - yy3207.CodecEncodeSelf(e) + if yyq3248[2] { + yy3256 := &x.ObjectMeta + yy3256.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3199[2] { + if yyq3248[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3208 := &x.ObjectMeta - yy3208.CodecEncodeSelf(e) + yy3257 := &x.ObjectMeta + yy3257.CodecEncodeSelf(e) } } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3199[3] { + if yyq3248[3] { if x.Data == nil { r.EncodeNil() } else { - yym3210 := z.EncBinary() - _ = yym3210 + yym3259 := z.EncBinary() + _ = yym3259 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -39860,15 +40364,15 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3199[3] { + if yyq3248[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() } else { - yym3211 := z.EncBinary() - _ = yym3211 + yym3260 := z.EncBinary() + _ = yym3260 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -39876,22 +40380,22 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3199[4] { + if yyq3248[4] { x.Type.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3199[4] { + if yyq3248[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } } - if yyr3199 || yy2arr3199 { + if yyr3248 || yy2arr3248 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -39904,25 +40408,25 @@ func (x *Secret) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3213 := z.DecBinary() - _ = yym3213 + yym3262 := z.DecBinary() + _ = yym3262 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3214 := r.ContainerType() - if yyct3214 == codecSelferValueTypeMap1234 { - yyl3214 := r.ReadMapStart() - if yyl3214 == 0 { + yyct3263 := r.ContainerType() + if yyct3263 == codecSelferValueTypeMap1234 { + yyl3263 := r.ReadMapStart() + if yyl3263 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3214, d) + x.codecDecodeSelfFromMap(yyl3263, d) } - } else if yyct3214 == codecSelferValueTypeArray1234 { - yyl3214 := r.ReadArrayStart() - if yyl3214 == 0 { + } else if yyct3263 == codecSelferValueTypeArray1234 { + yyl3263 := r.ReadArrayStart() + if yyl3263 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3214, d) + x.codecDecodeSelfFromArray(yyl3263, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -39934,12 +40438,12 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3215Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3215Slc - var yyhl3215 bool = l >= 0 - for yyj3215 := 0; ; yyj3215++ { - if yyhl3215 { - if yyj3215 >= l { + var yys3264Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3264Slc + var yyhl3264 bool = l >= 0 + for yyj3264 := 0; ; yyj3264++ { + if yyhl3264 { + if yyj3264 >= l { break } } else { @@ -39948,10 +40452,10 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3215Slc = r.DecodeBytes(yys3215Slc, true, true) - yys3215 := string(yys3215Slc) + yys3264Slc = r.DecodeBytes(yys3264Slc, true, true) + yys3264 := string(yys3264Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3215 { + switch yys3264 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -39968,19 +40472,19 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3218 := &x.ObjectMeta - yyv3218.CodecDecodeSelf(d) + yyv3267 := &x.ObjectMeta + yyv3267.CodecDecodeSelf(d) } case "data": if r.TryDecodeAsNil() { x.Data = nil } else { - yyv3219 := &x.Data - yym3220 := z.DecBinary() - _ = yym3220 + yyv3268 := &x.Data + yym3269 := z.DecBinary() + _ = yym3269 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv3219), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv3268), d) } } case "type": @@ -39990,9 +40494,9 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3215) - } // end switch yys3215 - } // end for yyj3215 + z.DecStructFieldNotFound(-1, yys3264) + } // end switch yys3264 + } // end for yyj3264 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -40000,16 +40504,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3222 int - var yyb3222 bool - var yyhl3222 bool = l >= 0 - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + var yyj3271 int + var yyb3271 bool + var yyhl3271 bool = l >= 0 + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40019,13 +40523,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40035,13 +40539,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40049,16 +40553,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3225 := &x.ObjectMeta - yyv3225.CodecDecodeSelf(d) + yyv3274 := &x.ObjectMeta + yyv3274.CodecDecodeSelf(d) } - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40066,21 +40570,21 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv3226 := &x.Data - yym3227 := z.DecBinary() - _ = yym3227 + yyv3275 := &x.Data + yym3276 := z.DecBinary() + _ = yym3276 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv3226), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv3275), d) } } - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40091,17 +40595,17 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } for { - yyj3222++ - if yyhl3222 { - yyb3222 = yyj3222 > l + yyj3271++ + if yyhl3271 { + yyb3271 = yyj3271 > l } else { - yyb3222 = r.CheckBreak() + yyb3271 = r.CheckBreak() } - if yyb3222 { + if yyb3271 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3222-1, "") + z.DecStructFieldNotFound(yyj3271-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -40110,8 +40614,8 @@ func (x SecretType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym3229 := z.EncBinary() - _ = yym3229 + yym3278 := z.EncBinary() + _ = yym3278 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -40123,8 +40627,8 @@ func (x *SecretType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3230 := z.DecBinary() - _ = yym3230 + yym3279 := z.DecBinary() + _ = yym3279 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -40139,37 +40643,37 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3231 := z.EncBinary() - _ = yym3231 + yym3280 := z.EncBinary() + _ = yym3280 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3232 := !z.EncBinary() - yy2arr3232 := z.EncBasicHandle().StructToArray - var yyq3232 [4]bool - _, _, _ = yysep3232, yyq3232, yy2arr3232 - const yyr3232 bool = false - yyq3232[0] = x.Kind != "" - yyq3232[1] = x.APIVersion != "" - yyq3232[2] = true - var yynn3232 int - if yyr3232 || yy2arr3232 { + yysep3281 := !z.EncBinary() + yy2arr3281 := z.EncBasicHandle().StructToArray + var yyq3281 [4]bool + _, _, _ = yysep3281, yyq3281, yy2arr3281 + const yyr3281 bool = false + yyq3281[0] = x.Kind != "" + yyq3281[1] = x.APIVersion != "" + yyq3281[2] = true + var yynn3281 int + if yyr3281 || yy2arr3281 { r.EncodeArrayStart(4) } else { - yynn3232 = 1 - for _, b := range yyq3232 { + yynn3281 = 1 + for _, b := range yyq3281 { if b { - yynn3232++ + yynn3281++ } } - r.EncodeMapStart(yynn3232) - yynn3232 = 0 + r.EncodeMapStart(yynn3281) + yynn3281 = 0 } - if yyr3232 || yy2arr3232 { + if yyr3281 || yy2arr3281 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3232[0] { - yym3234 := z.EncBinary() - _ = yym3234 + if yyq3281[0] { + yym3283 := z.EncBinary() + _ = yym3283 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -40178,23 +40682,23 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3232[0] { + if yyq3281[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3235 := z.EncBinary() - _ = yym3235 + yym3284 := z.EncBinary() + _ = yym3284 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3232 || yy2arr3232 { + if yyr3281 || yy2arr3281 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3232[1] { - yym3237 := z.EncBinary() - _ = yym3237 + if yyq3281[1] { + yym3286 := z.EncBinary() + _ = yym3286 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -40203,54 +40707,54 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3232[1] { + if yyq3281[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3238 := z.EncBinary() - _ = yym3238 + yym3287 := z.EncBinary() + _ = yym3287 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3232 || yy2arr3232 { + if yyr3281 || yy2arr3281 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3232[2] { - yy3240 := &x.ListMeta - yym3241 := z.EncBinary() - _ = yym3241 + if yyq3281[2] { + yy3289 := &x.ListMeta + yym3290 := z.EncBinary() + _ = yym3290 if false { - } else if z.HasExtensions() && z.EncExt(yy3240) { + } else if z.HasExtensions() && z.EncExt(yy3289) { } else { - z.EncFallback(yy3240) + z.EncFallback(yy3289) } } else { r.EncodeNil() } } else { - if yyq3232[2] { + if yyq3281[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3242 := &x.ListMeta - yym3243 := z.EncBinary() - _ = yym3243 + yy3291 := &x.ListMeta + yym3292 := z.EncBinary() + _ = yym3292 if false { - } else if z.HasExtensions() && z.EncExt(yy3242) { + } else if z.HasExtensions() && z.EncExt(yy3291) { } else { - z.EncFallback(yy3242) + z.EncFallback(yy3291) } } } - if yyr3232 || yy2arr3232 { + if yyr3281 || yy2arr3281 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym3245 := z.EncBinary() - _ = yym3245 + yym3294 := z.EncBinary() + _ = yym3294 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) @@ -40263,15 +40767,15 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3246 := z.EncBinary() - _ = yym3246 + yym3295 := z.EncBinary() + _ = yym3295 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) } } } - if yyr3232 || yy2arr3232 { + if yyr3281 || yy2arr3281 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -40284,25 +40788,25 @@ func (x *SecretList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3247 := z.DecBinary() - _ = yym3247 + yym3296 := z.DecBinary() + _ = yym3296 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3248 := r.ContainerType() - if yyct3248 == codecSelferValueTypeMap1234 { - yyl3248 := r.ReadMapStart() - if yyl3248 == 0 { + yyct3297 := r.ContainerType() + if yyct3297 == codecSelferValueTypeMap1234 { + yyl3297 := r.ReadMapStart() + if yyl3297 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3248, d) + x.codecDecodeSelfFromMap(yyl3297, d) } - } else if yyct3248 == codecSelferValueTypeArray1234 { - yyl3248 := r.ReadArrayStart() - if yyl3248 == 0 { + } else if yyct3297 == codecSelferValueTypeArray1234 { + yyl3297 := r.ReadArrayStart() + if yyl3297 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3248, d) + x.codecDecodeSelfFromArray(yyl3297, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -40314,12 +40818,12 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3249Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3249Slc - var yyhl3249 bool = l >= 0 - for yyj3249 := 0; ; yyj3249++ { - if yyhl3249 { - if yyj3249 >= l { + var yys3298Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3298Slc + var yyhl3298 bool = l >= 0 + for yyj3298 := 0; ; yyj3298++ { + if yyhl3298 { + if yyj3298 >= l { break } } else { @@ -40328,10 +40832,10 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3249Slc = r.DecodeBytes(yys3249Slc, true, true) - yys3249 := string(yys3249Slc) + yys3298Slc = r.DecodeBytes(yys3298Slc, true, true) + yys3298 := string(yys3298Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3249 { + switch yys3298 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -40348,31 +40852,31 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3252 := &x.ListMeta - yym3253 := z.DecBinary() - _ = yym3253 + yyv3301 := &x.ListMeta + yym3302 := z.DecBinary() + _ = yym3302 if false { - } else if z.HasExtensions() && z.DecExt(yyv3252) { + } else if z.HasExtensions() && z.DecExt(yyv3301) { } else { - z.DecFallback(yyv3252, false) + z.DecFallback(yyv3301, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3254 := &x.Items - yym3255 := z.DecBinary() - _ = yym3255 + yyv3303 := &x.Items + yym3304 := z.DecBinary() + _ = yym3304 if false { } else { - h.decSliceSecret((*[]Secret)(yyv3254), d) + h.decSliceSecret((*[]Secret)(yyv3303), d) } } default: - z.DecStructFieldNotFound(-1, yys3249) - } // end switch yys3249 - } // end for yyj3249 + z.DecStructFieldNotFound(-1, yys3298) + } // end switch yys3298 + } // end for yyj3298 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -40380,16 +40884,16 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3256 int - var yyb3256 bool - var yyhl3256 bool = l >= 0 - yyj3256++ - if yyhl3256 { - yyb3256 = yyj3256 > l + var yyj3305 int + var yyb3305 bool + var yyhl3305 bool = l >= 0 + yyj3305++ + if yyhl3305 { + yyb3305 = yyj3305 > l } else { - yyb3256 = r.CheckBreak() + yyb3305 = r.CheckBreak() } - if yyb3256 { + if yyb3305 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40399,13 +40903,13 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3256++ - if yyhl3256 { - yyb3256 = yyj3256 > l + yyj3305++ + if yyhl3305 { + yyb3305 = yyj3305 > l } else { - yyb3256 = r.CheckBreak() + yyb3305 = r.CheckBreak() } - if yyb3256 { + if yyb3305 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40415,13 +40919,13 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3256++ - if yyhl3256 { - yyb3256 = yyj3256 > l + yyj3305++ + if yyhl3305 { + yyb3305 = yyj3305 > l } else { - yyb3256 = r.CheckBreak() + yyb3305 = r.CheckBreak() } - if yyb3256 { + if yyb3305 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40429,22 +40933,22 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3259 := &x.ListMeta - yym3260 := z.DecBinary() - _ = yym3260 + yyv3308 := &x.ListMeta + yym3309 := z.DecBinary() + _ = yym3309 if false { - } else if z.HasExtensions() && z.DecExt(yyv3259) { + } else if z.HasExtensions() && z.DecExt(yyv3308) { } else { - z.DecFallback(yyv3259, false) + z.DecFallback(yyv3308, false) } } - yyj3256++ - if yyhl3256 { - yyb3256 = yyj3256 > l + yyj3305++ + if yyhl3305 { + yyb3305 = yyj3305 > l } else { - yyb3256 = r.CheckBreak() + yyb3305 = r.CheckBreak() } - if yyb3256 { + if yyb3305 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40452,26 +40956,26 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3261 := &x.Items - yym3262 := z.DecBinary() - _ = yym3262 + yyv3310 := &x.Items + yym3311 := z.DecBinary() + _ = yym3311 if false { } else { - h.decSliceSecret((*[]Secret)(yyv3261), d) + h.decSliceSecret((*[]Secret)(yyv3310), d) } } for { - yyj3256++ - if yyhl3256 { - yyb3256 = yyj3256 > l + yyj3305++ + if yyhl3305 { + yyb3305 = yyj3305 > l } else { - yyb3256 = r.CheckBreak() + yyb3305 = r.CheckBreak() } - if yyb3256 { + if yyb3305 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3256-1, "") + z.DecStructFieldNotFound(yyj3305-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -40480,8 +40984,8 @@ func (x PatchType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym3263 := z.EncBinary() - _ = yym3263 + yym3312 := z.EncBinary() + _ = yym3312 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -40493,8 +40997,8 @@ func (x *PatchType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3264 := z.DecBinary() - _ = yym3264 + yym3313 := z.DecBinary() + _ = yym3313 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -40506,8 +41010,8 @@ func (x ComponentConditionType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym3265 := z.EncBinary() - _ = yym3265 + yym3314 := z.EncBinary() + _ = yym3314 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -40519,8 +41023,8 @@ func (x *ComponentConditionType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3266 := z.DecBinary() - _ = yym3266 + yym3315 := z.DecBinary() + _ = yym3315 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -40535,32 +41039,32 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3267 := z.EncBinary() - _ = yym3267 + yym3316 := z.EncBinary() + _ = yym3316 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3268 := !z.EncBinary() - yy2arr3268 := z.EncBasicHandle().StructToArray - var yyq3268 [4]bool - _, _, _ = yysep3268, yyq3268, yy2arr3268 - const yyr3268 bool = false - yyq3268[2] = x.Message != "" - yyq3268[3] = x.Error != "" - var yynn3268 int - if yyr3268 || yy2arr3268 { + yysep3317 := !z.EncBinary() + yy2arr3317 := z.EncBasicHandle().StructToArray + var yyq3317 [4]bool + _, _, _ = yysep3317, yyq3317, yy2arr3317 + const yyr3317 bool = false + yyq3317[2] = x.Message != "" + yyq3317[3] = x.Error != "" + var yynn3317 int + if yyr3317 || yy2arr3317 { r.EncodeArrayStart(4) } else { - yynn3268 = 2 - for _, b := range yyq3268 { + yynn3317 = 2 + for _, b := range yyq3317 { if b { - yynn3268++ + yynn3317++ } } - r.EncodeMapStart(yynn3268) - yynn3268 = 0 + r.EncodeMapStart(yynn3317) + yynn3317 = 0 } - if yyr3268 || yy2arr3268 { + if yyr3317 || yy2arr3317 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Type.CodecEncodeSelf(e) } else { @@ -40569,7 +41073,7 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } - if yyr3268 || yy2arr3268 { + if yyr3317 || yy2arr3317 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Status.CodecEncodeSelf(e) } else { @@ -40578,11 +41082,11 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Status.CodecEncodeSelf(e) } - if yyr3268 || yy2arr3268 { + if yyr3317 || yy2arr3317 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3268[2] { - yym3272 := z.EncBinary() - _ = yym3272 + if yyq3317[2] { + yym3321 := z.EncBinary() + _ = yym3321 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -40591,23 +41095,23 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3268[2] { + if yyq3317[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3273 := z.EncBinary() - _ = yym3273 + yym3322 := z.EncBinary() + _ = yym3322 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr3268 || yy2arr3268 { + if yyr3317 || yy2arr3317 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3268[3] { - yym3275 := z.EncBinary() - _ = yym3275 + if yyq3317[3] { + yym3324 := z.EncBinary() + _ = yym3324 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Error)) @@ -40616,19 +41120,19 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3268[3] { + if yyq3317[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("error")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3276 := z.EncBinary() - _ = yym3276 + yym3325 := z.EncBinary() + _ = yym3325 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Error)) } } } - if yyr3268 || yy2arr3268 { + if yyr3317 || yy2arr3317 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -40641,25 +41145,25 @@ func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3277 := z.DecBinary() - _ = yym3277 + yym3326 := z.DecBinary() + _ = yym3326 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3278 := r.ContainerType() - if yyct3278 == codecSelferValueTypeMap1234 { - yyl3278 := r.ReadMapStart() - if yyl3278 == 0 { + yyct3327 := r.ContainerType() + if yyct3327 == codecSelferValueTypeMap1234 { + yyl3327 := r.ReadMapStart() + if yyl3327 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3278, d) + x.codecDecodeSelfFromMap(yyl3327, d) } - } else if yyct3278 == codecSelferValueTypeArray1234 { - yyl3278 := r.ReadArrayStart() - if yyl3278 == 0 { + } else if yyct3327 == codecSelferValueTypeArray1234 { + yyl3327 := r.ReadArrayStart() + if yyl3327 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3278, d) + x.codecDecodeSelfFromArray(yyl3327, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -40671,12 +41175,12 @@ func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3279Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3279Slc - var yyhl3279 bool = l >= 0 - for yyj3279 := 0; ; yyj3279++ { - if yyhl3279 { - if yyj3279 >= l { + var yys3328Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3328Slc + var yyhl3328 bool = l >= 0 + for yyj3328 := 0; ; yyj3328++ { + if yyhl3328 { + if yyj3328 >= l { break } } else { @@ -40685,10 +41189,10 @@ func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3279Slc = r.DecodeBytes(yys3279Slc, true, true) - yys3279 := string(yys3279Slc) + yys3328Slc = r.DecodeBytes(yys3328Slc, true, true) + yys3328 := string(yys3328Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3279 { + switch yys3328 { case "type": if r.TryDecodeAsNil() { x.Type = "" @@ -40714,9 +41218,9 @@ func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) x.Error = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3279) - } // end switch yys3279 - } // end for yyj3279 + z.DecStructFieldNotFound(-1, yys3328) + } // end switch yys3328 + } // end for yyj3328 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -40724,16 +41228,16 @@ func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3284 int - var yyb3284 bool - var yyhl3284 bool = l >= 0 - yyj3284++ - if yyhl3284 { - yyb3284 = yyj3284 > l + var yyj3333 int + var yyb3333 bool + var yyhl3333 bool = l >= 0 + yyj3333++ + if yyhl3333 { + yyb3333 = yyj3333 > l } else { - yyb3284 = r.CheckBreak() + yyb3333 = r.CheckBreak() } - if yyb3284 { + if yyb3333 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40743,13 +41247,13 @@ func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decode } else { x.Type = ComponentConditionType(r.DecodeString()) } - yyj3284++ - if yyhl3284 { - yyb3284 = yyj3284 > l + yyj3333++ + if yyhl3333 { + yyb3333 = yyj3333 > l } else { - yyb3284 = r.CheckBreak() + yyb3333 = r.CheckBreak() } - if yyb3284 { + if yyb3333 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40759,13 +41263,13 @@ func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decode } else { x.Status = ConditionStatus(r.DecodeString()) } - yyj3284++ - if yyhl3284 { - yyb3284 = yyj3284 > l + yyj3333++ + if yyhl3333 { + yyb3333 = yyj3333 > l } else { - yyb3284 = r.CheckBreak() + yyb3333 = r.CheckBreak() } - if yyb3284 { + if yyb3333 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40775,13 +41279,13 @@ func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decode } else { x.Message = string(r.DecodeString()) } - yyj3284++ - if yyhl3284 { - yyb3284 = yyj3284 > l + yyj3333++ + if yyhl3333 { + yyb3333 = yyj3333 > l } else { - yyb3284 = r.CheckBreak() + yyb3333 = r.CheckBreak() } - if yyb3284 { + if yyb3333 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -40792,17 +41296,17 @@ func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decode x.Error = string(r.DecodeString()) } for { - yyj3284++ - if yyhl3284 { - yyb3284 = yyj3284 > l + yyj3333++ + if yyhl3333 { + yyb3333 = yyj3333 > l } else { - yyb3284 = r.CheckBreak() + yyb3333 = r.CheckBreak() } - if yyb3284 { + if yyb3333 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3284-1, "") + z.DecStructFieldNotFound(yyj3333-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -40814,38 +41318,38 @@ func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3289 := z.EncBinary() - _ = yym3289 + yym3338 := z.EncBinary() + _ = yym3338 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3290 := !z.EncBinary() - yy2arr3290 := z.EncBasicHandle().StructToArray - var yyq3290 [4]bool - _, _, _ = yysep3290, yyq3290, yy2arr3290 - const yyr3290 bool = false - yyq3290[0] = x.Kind != "" - yyq3290[1] = x.APIVersion != "" - yyq3290[2] = true - yyq3290[3] = len(x.Conditions) != 0 - var yynn3290 int - if yyr3290 || yy2arr3290 { + yysep3339 := !z.EncBinary() + yy2arr3339 := z.EncBasicHandle().StructToArray + var yyq3339 [4]bool + _, _, _ = yysep3339, yyq3339, yy2arr3339 + const yyr3339 bool = false + yyq3339[0] = x.Kind != "" + yyq3339[1] = x.APIVersion != "" + yyq3339[2] = true + yyq3339[3] = len(x.Conditions) != 0 + var yynn3339 int + if yyr3339 || yy2arr3339 { r.EncodeArrayStart(4) } else { - yynn3290 = 0 - for _, b := range yyq3290 { + yynn3339 = 0 + for _, b := range yyq3339 { if b { - yynn3290++ + yynn3339++ } } - r.EncodeMapStart(yynn3290) - yynn3290 = 0 + r.EncodeMapStart(yynn3339) + yynn3339 = 0 } - if yyr3290 || yy2arr3290 { + if yyr3339 || yy2arr3339 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3290[0] { - yym3292 := z.EncBinary() - _ = yym3292 + if yyq3339[0] { + yym3341 := z.EncBinary() + _ = yym3341 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -40854,23 +41358,23 @@ func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3290[0] { + if yyq3339[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3293 := z.EncBinary() - _ = yym3293 + yym3342 := z.EncBinary() + _ = yym3342 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3290 || yy2arr3290 { + if yyr3339 || yy2arr3339 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3290[1] { - yym3295 := z.EncBinary() - _ = yym3295 + if yyq3339[1] { + yym3344 := z.EncBinary() + _ = yym3344 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -40879,43 +41383,43 @@ func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3290[1] { + if yyq3339[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3296 := z.EncBinary() - _ = yym3296 + yym3345 := z.EncBinary() + _ = yym3345 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3290 || yy2arr3290 { + if yyr3339 || yy2arr3339 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3290[2] { - yy3298 := &x.ObjectMeta - yy3298.CodecEncodeSelf(e) + if yyq3339[2] { + yy3347 := &x.ObjectMeta + yy3347.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3290[2] { + if yyq3339[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3299 := &x.ObjectMeta - yy3299.CodecEncodeSelf(e) + yy3348 := &x.ObjectMeta + yy3348.CodecEncodeSelf(e) } } - if yyr3290 || yy2arr3290 { + if yyr3339 || yy2arr3339 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3290[3] { + if yyq3339[3] { if x.Conditions == nil { r.EncodeNil() } else { - yym3301 := z.EncBinary() - _ = yym3301 + yym3350 := z.EncBinary() + _ = yym3350 if false { } else { h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) @@ -40925,15 +41429,15 @@ func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3290[3] { + if yyq3339[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conditions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Conditions == nil { r.EncodeNil() } else { - yym3302 := z.EncBinary() - _ = yym3302 + yym3351 := z.EncBinary() + _ = yym3351 if false { } else { h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) @@ -40941,7 +41445,7 @@ func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3290 || yy2arr3290 { + if yyr3339 || yy2arr3339 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -40954,25 +41458,25 @@ func (x *ComponentStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3303 := z.DecBinary() - _ = yym3303 + yym3352 := z.DecBinary() + _ = yym3352 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3304 := r.ContainerType() - if yyct3304 == codecSelferValueTypeMap1234 { - yyl3304 := r.ReadMapStart() - if yyl3304 == 0 { + yyct3353 := r.ContainerType() + if yyct3353 == codecSelferValueTypeMap1234 { + yyl3353 := r.ReadMapStart() + if yyl3353 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3304, d) + x.codecDecodeSelfFromMap(yyl3353, d) } - } else if yyct3304 == codecSelferValueTypeArray1234 { - yyl3304 := r.ReadArrayStart() - if yyl3304 == 0 { + } else if yyct3353 == codecSelferValueTypeArray1234 { + yyl3353 := r.ReadArrayStart() + if yyl3353 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3304, d) + x.codecDecodeSelfFromArray(yyl3353, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -40984,12 +41488,12 @@ func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3305Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3305Slc - var yyhl3305 bool = l >= 0 - for yyj3305 := 0; ; yyj3305++ { - if yyhl3305 { - if yyj3305 >= l { + var yys3354Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3354Slc + var yyhl3354 bool = l >= 0 + for yyj3354 := 0; ; yyj3354++ { + if yyhl3354 { + if yyj3354 >= l { break } } else { @@ -40998,10 +41502,10 @@ func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3305Slc = r.DecodeBytes(yys3305Slc, true, true) - yys3305 := string(yys3305Slc) + yys3354Slc = r.DecodeBytes(yys3354Slc, true, true) + yys3354 := string(yys3354Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3305 { + switch yys3354 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -41018,25 +41522,25 @@ func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3308 := &x.ObjectMeta - yyv3308.CodecDecodeSelf(d) + yyv3357 := &x.ObjectMeta + yyv3357.CodecDecodeSelf(d) } case "conditions": if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv3309 := &x.Conditions - yym3310 := z.DecBinary() - _ = yym3310 + yyv3358 := &x.Conditions + yym3359 := z.DecBinary() + _ = yym3359 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv3309), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv3358), d) } } default: - z.DecStructFieldNotFound(-1, yys3305) - } // end switch yys3305 - } // end for yyj3305 + z.DecStructFieldNotFound(-1, yys3354) + } // end switch yys3354 + } // end for yyj3354 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -41044,16 +41548,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3311 int - var yyb3311 bool - var yyhl3311 bool = l >= 0 - yyj3311++ - if yyhl3311 { - yyb3311 = yyj3311 > l + var yyj3360 int + var yyb3360 bool + var yyhl3360 bool = l >= 0 + yyj3360++ + if yyhl3360 { + yyb3360 = yyj3360 > l } else { - yyb3311 = r.CheckBreak() + yyb3360 = r.CheckBreak() } - if yyb3311 { + if yyb3360 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41063,13 +41567,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3311++ - if yyhl3311 { - yyb3311 = yyj3311 > l + yyj3360++ + if yyhl3360 { + yyb3360 = yyj3360 > l } else { - yyb3311 = r.CheckBreak() + yyb3360 = r.CheckBreak() } - if yyb3311 { + if yyb3360 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41079,13 +41583,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3311++ - if yyhl3311 { - yyb3311 = yyj3311 > l + yyj3360++ + if yyhl3360 { + yyb3360 = yyj3360 > l } else { - yyb3311 = r.CheckBreak() + yyb3360 = r.CheckBreak() } - if yyb3311 { + if yyb3360 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41093,16 +41597,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3314 := &x.ObjectMeta - yyv3314.CodecDecodeSelf(d) + yyv3363 := &x.ObjectMeta + yyv3363.CodecDecodeSelf(d) } - yyj3311++ - if yyhl3311 { - yyb3311 = yyj3311 > l + yyj3360++ + if yyhl3360 { + yyb3360 = yyj3360 > l } else { - yyb3311 = r.CheckBreak() + yyb3360 = r.CheckBreak() } - if yyb3311 { + if yyb3360 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41110,26 +41614,26 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv3315 := &x.Conditions - yym3316 := z.DecBinary() - _ = yym3316 + yyv3364 := &x.Conditions + yym3365 := z.DecBinary() + _ = yym3365 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv3315), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv3364), d) } } for { - yyj3311++ - if yyhl3311 { - yyb3311 = yyj3311 > l + yyj3360++ + if yyhl3360 { + yyb3360 = yyj3360 > l } else { - yyb3311 = r.CheckBreak() + yyb3360 = r.CheckBreak() } - if yyb3311 { + if yyb3360 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3311-1, "") + z.DecStructFieldNotFound(yyj3360-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -41141,37 +41645,37 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3317 := z.EncBinary() - _ = yym3317 + yym3366 := z.EncBinary() + _ = yym3366 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3318 := !z.EncBinary() - yy2arr3318 := z.EncBasicHandle().StructToArray - var yyq3318 [4]bool - _, _, _ = yysep3318, yyq3318, yy2arr3318 - const yyr3318 bool = false - yyq3318[0] = x.Kind != "" - yyq3318[1] = x.APIVersion != "" - yyq3318[2] = true - var yynn3318 int - if yyr3318 || yy2arr3318 { + yysep3367 := !z.EncBinary() + yy2arr3367 := z.EncBasicHandle().StructToArray + var yyq3367 [4]bool + _, _, _ = yysep3367, yyq3367, yy2arr3367 + const yyr3367 bool = false + yyq3367[0] = x.Kind != "" + yyq3367[1] = x.APIVersion != "" + yyq3367[2] = true + var yynn3367 int + if yyr3367 || yy2arr3367 { r.EncodeArrayStart(4) } else { - yynn3318 = 1 - for _, b := range yyq3318 { + yynn3367 = 1 + for _, b := range yyq3367 { if b { - yynn3318++ + yynn3367++ } } - r.EncodeMapStart(yynn3318) - yynn3318 = 0 + r.EncodeMapStart(yynn3367) + yynn3367 = 0 } - if yyr3318 || yy2arr3318 { + if yyr3367 || yy2arr3367 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3318[0] { - yym3320 := z.EncBinary() - _ = yym3320 + if yyq3367[0] { + yym3369 := z.EncBinary() + _ = yym3369 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -41180,23 +41684,23 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3318[0] { + if yyq3367[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3321 := z.EncBinary() - _ = yym3321 + yym3370 := z.EncBinary() + _ = yym3370 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3318 || yy2arr3318 { + if yyr3367 || yy2arr3367 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3318[1] { - yym3323 := z.EncBinary() - _ = yym3323 + if yyq3367[1] { + yym3372 := z.EncBinary() + _ = yym3372 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -41205,54 +41709,54 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3318[1] { + if yyq3367[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3324 := z.EncBinary() - _ = yym3324 + yym3373 := z.EncBinary() + _ = yym3373 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3318 || yy2arr3318 { + if yyr3367 || yy2arr3367 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3318[2] { - yy3326 := &x.ListMeta - yym3327 := z.EncBinary() - _ = yym3327 + if yyq3367[2] { + yy3375 := &x.ListMeta + yym3376 := z.EncBinary() + _ = yym3376 if false { - } else if z.HasExtensions() && z.EncExt(yy3326) { + } else if z.HasExtensions() && z.EncExt(yy3375) { } else { - z.EncFallback(yy3326) + z.EncFallback(yy3375) } } else { r.EncodeNil() } } else { - if yyq3318[2] { + if yyq3367[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3328 := &x.ListMeta - yym3329 := z.EncBinary() - _ = yym3329 + yy3377 := &x.ListMeta + yym3378 := z.EncBinary() + _ = yym3378 if false { - } else if z.HasExtensions() && z.EncExt(yy3328) { + } else if z.HasExtensions() && z.EncExt(yy3377) { } else { - z.EncFallback(yy3328) + z.EncFallback(yy3377) } } } - if yyr3318 || yy2arr3318 { + if yyr3367 || yy2arr3367 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym3331 := z.EncBinary() - _ = yym3331 + yym3380 := z.EncBinary() + _ = yym3380 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) @@ -41265,15 +41769,15 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3332 := z.EncBinary() - _ = yym3332 + yym3381 := z.EncBinary() + _ = yym3381 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) } } } - if yyr3318 || yy2arr3318 { + if yyr3367 || yy2arr3367 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -41286,25 +41790,25 @@ func (x *ComponentStatusList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3333 := z.DecBinary() - _ = yym3333 + yym3382 := z.DecBinary() + _ = yym3382 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3334 := r.ContainerType() - if yyct3334 == codecSelferValueTypeMap1234 { - yyl3334 := r.ReadMapStart() - if yyl3334 == 0 { + yyct3383 := r.ContainerType() + if yyct3383 == codecSelferValueTypeMap1234 { + yyl3383 := r.ReadMapStart() + if yyl3383 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3334, d) + x.codecDecodeSelfFromMap(yyl3383, d) } - } else if yyct3334 == codecSelferValueTypeArray1234 { - yyl3334 := r.ReadArrayStart() - if yyl3334 == 0 { + } else if yyct3383 == codecSelferValueTypeArray1234 { + yyl3383 := r.ReadArrayStart() + if yyl3383 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3334, d) + x.codecDecodeSelfFromArray(yyl3383, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -41316,12 +41820,12 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3335Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3335Slc - var yyhl3335 bool = l >= 0 - for yyj3335 := 0; ; yyj3335++ { - if yyhl3335 { - if yyj3335 >= l { + var yys3384Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3384Slc + var yyhl3384 bool = l >= 0 + for yyj3384 := 0; ; yyj3384++ { + if yyhl3384 { + if yyj3384 >= l { break } } else { @@ -41330,10 +41834,10 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3335Slc = r.DecodeBytes(yys3335Slc, true, true) - yys3335 := string(yys3335Slc) + yys3384Slc = r.DecodeBytes(yys3384Slc, true, true) + yys3384 := string(yys3384Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3335 { + switch yys3384 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -41350,31 +41854,31 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3338 := &x.ListMeta - yym3339 := z.DecBinary() - _ = yym3339 + yyv3387 := &x.ListMeta + yym3388 := z.DecBinary() + _ = yym3388 if false { - } else if z.HasExtensions() && z.DecExt(yyv3338) { + } else if z.HasExtensions() && z.DecExt(yyv3387) { } else { - z.DecFallback(yyv3338, false) + z.DecFallback(yyv3387, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3340 := &x.Items - yym3341 := z.DecBinary() - _ = yym3341 + yyv3389 := &x.Items + yym3390 := z.DecBinary() + _ = yym3390 if false { } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv3340), d) + h.decSliceComponentStatus((*[]ComponentStatus)(yyv3389), d) } } default: - z.DecStructFieldNotFound(-1, yys3335) - } // end switch yys3335 - } // end for yyj3335 + z.DecStructFieldNotFound(-1, yys3384) + } // end switch yys3384 + } // end for yyj3384 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -41382,16 +41886,16 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3342 int - var yyb3342 bool - var yyhl3342 bool = l >= 0 - yyj3342++ - if yyhl3342 { - yyb3342 = yyj3342 > l + var yyj3391 int + var yyb3391 bool + var yyhl3391 bool = l >= 0 + yyj3391++ + if yyhl3391 { + yyb3391 = yyj3391 > l } else { - yyb3342 = r.CheckBreak() + yyb3391 = r.CheckBreak() } - if yyb3342 { + if yyb3391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41401,13 +41905,13 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj3342++ - if yyhl3342 { - yyb3342 = yyj3342 > l + yyj3391++ + if yyhl3391 { + yyb3391 = yyj3391 > l } else { - yyb3342 = r.CheckBreak() + yyb3391 = r.CheckBreak() } - if yyb3342 { + if yyb3391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41417,13 +41921,13 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj3342++ - if yyhl3342 { - yyb3342 = yyj3342 > l + yyj3391++ + if yyhl3391 { + yyb3391 = yyj3391 > l } else { - yyb3342 = r.CheckBreak() + yyb3391 = r.CheckBreak() } - if yyb3342 { + if yyb3391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41431,22 +41935,22 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.ListMeta = pkg2_unversioned.ListMeta{} } else { - yyv3345 := &x.ListMeta - yym3346 := z.DecBinary() - _ = yym3346 + yyv3394 := &x.ListMeta + yym3395 := z.DecBinary() + _ = yym3395 if false { - } else if z.HasExtensions() && z.DecExt(yyv3345) { + } else if z.HasExtensions() && z.DecExt(yyv3394) { } else { - z.DecFallback(yyv3345, false) + z.DecFallback(yyv3394, false) } } - yyj3342++ - if yyhl3342 { - yyb3342 = yyj3342 > l + yyj3391++ + if yyhl3391 { + yyb3391 = yyj3391 > l } else { - yyb3342 = r.CheckBreak() + yyb3391 = r.CheckBreak() } - if yyb3342 { + if yyb3391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41454,26 +41958,26 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3347 := &x.Items - yym3348 := z.DecBinary() - _ = yym3348 + yyv3396 := &x.Items + yym3397 := z.DecBinary() + _ = yym3397 if false { } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv3347), d) + h.decSliceComponentStatus((*[]ComponentStatus)(yyv3396), d) } } for { - yyj3342++ - if yyhl3342 { - yyb3342 = yyj3342 > l + yyj3391++ + if yyhl3391 { + yyb3391 = yyj3391 > l } else { - yyb3342 = r.CheckBreak() + yyb3391 = r.CheckBreak() } - if yyb3342 { + if yyb3391 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3342-1, "") + z.DecStructFieldNotFound(yyj3391-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -41485,37 +41989,37 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3349 := z.EncBinary() - _ = yym3349 + yym3398 := z.EncBinary() + _ = yym3398 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3350 := !z.EncBinary() - yy2arr3350 := z.EncBasicHandle().StructToArray - var yyq3350 [5]bool - _, _, _ = yysep3350, yyq3350, yy2arr3350 - const yyr3350 bool = false - yyq3350[0] = x.Capabilities != nil - yyq3350[1] = x.Privileged != nil - yyq3350[2] = x.SELinuxOptions != nil - yyq3350[3] = x.RunAsUser != nil - yyq3350[4] = x.RunAsNonRoot != nil - var yynn3350 int - if yyr3350 || yy2arr3350 { + yysep3399 := !z.EncBinary() + yy2arr3399 := z.EncBasicHandle().StructToArray + var yyq3399 [5]bool + _, _, _ = yysep3399, yyq3399, yy2arr3399 + const yyr3399 bool = false + yyq3399[0] = x.Capabilities != nil + yyq3399[1] = x.Privileged != nil + yyq3399[2] = x.SELinuxOptions != nil + yyq3399[3] = x.RunAsUser != nil + yyq3399[4] = x.RunAsNonRoot != nil + var yynn3399 int + if yyr3399 || yy2arr3399 { r.EncodeArrayStart(5) } else { - yynn3350 = 0 - for _, b := range yyq3350 { + yynn3399 = 0 + for _, b := range yyq3399 { if b { - yynn3350++ + yynn3399++ } } - r.EncodeMapStart(yynn3350) - yynn3350 = 0 + r.EncodeMapStart(yynn3399) + yynn3399 = 0 } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3350[0] { + if yyq3399[0] { if x.Capabilities == nil { r.EncodeNil() } else { @@ -41525,7 +42029,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3350[0] { + if yyq3399[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("capabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -41536,44 +42040,44 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3350[1] { + if yyq3399[1] { if x.Privileged == nil { r.EncodeNil() } else { - yy3353 := *x.Privileged - yym3354 := z.EncBinary() - _ = yym3354 + yy3402 := *x.Privileged + yym3403 := z.EncBinary() + _ = yym3403 if false { } else { - r.EncodeBool(bool(yy3353)) + r.EncodeBool(bool(yy3402)) } } } else { r.EncodeNil() } } else { - if yyq3350[1] { + if yyq3399[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("privileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Privileged == nil { r.EncodeNil() } else { - yy3355 := *x.Privileged - yym3356 := z.EncBinary() - _ = yym3356 + yy3404 := *x.Privileged + yym3405 := z.EncBinary() + _ = yym3405 if false { } else { - r.EncodeBool(bool(yy3355)) + r.EncodeBool(bool(yy3404)) } } } } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3350[2] { + if yyq3399[2] { if x.SELinuxOptions == nil { r.EncodeNil() } else { @@ -41583,7 +42087,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3350[2] { + if yyq3399[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seLinuxOptions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -41594,77 +42098,77 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3350[3] { + if yyq3399[3] { if x.RunAsUser == nil { r.EncodeNil() } else { - yy3359 := *x.RunAsUser - yym3360 := z.EncBinary() - _ = yym3360 + yy3408 := *x.RunAsUser + yym3409 := z.EncBinary() + _ = yym3409 if false { } else { - r.EncodeInt(int64(yy3359)) + r.EncodeInt(int64(yy3408)) } } } else { r.EncodeNil() } } else { - if yyq3350[3] { + if yyq3399[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsUser")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsUser == nil { r.EncodeNil() } else { - yy3361 := *x.RunAsUser - yym3362 := z.EncBinary() - _ = yym3362 + yy3410 := *x.RunAsUser + yym3411 := z.EncBinary() + _ = yym3411 if false { } else { - r.EncodeInt(int64(yy3361)) + r.EncodeInt(int64(yy3410)) } } } } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3350[4] { + if yyq3399[4] { if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy3364 := *x.RunAsNonRoot - yym3365 := z.EncBinary() - _ = yym3365 + yy3413 := *x.RunAsNonRoot + yym3414 := z.EncBinary() + _ = yym3414 if false { } else { - r.EncodeBool(bool(yy3364)) + r.EncodeBool(bool(yy3413)) } } } else { r.EncodeNil() } } else { - if yyq3350[4] { + if yyq3399[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsNonRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy3366 := *x.RunAsNonRoot - yym3367 := z.EncBinary() - _ = yym3367 + yy3415 := *x.RunAsNonRoot + yym3416 := z.EncBinary() + _ = yym3416 if false { } else { - r.EncodeBool(bool(yy3366)) + r.EncodeBool(bool(yy3415)) } } } } - if yyr3350 || yy2arr3350 { + if yyr3399 || yy2arr3399 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -41677,25 +42181,25 @@ func (x *SecurityContext) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3368 := z.DecBinary() - _ = yym3368 + yym3417 := z.DecBinary() + _ = yym3417 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3369 := r.ContainerType() - if yyct3369 == codecSelferValueTypeMap1234 { - yyl3369 := r.ReadMapStart() - if yyl3369 == 0 { + yyct3418 := r.ContainerType() + if yyct3418 == codecSelferValueTypeMap1234 { + yyl3418 := r.ReadMapStart() + if yyl3418 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3369, d) + x.codecDecodeSelfFromMap(yyl3418, d) } - } else if yyct3369 == codecSelferValueTypeArray1234 { - yyl3369 := r.ReadArrayStart() - if yyl3369 == 0 { + } else if yyct3418 == codecSelferValueTypeArray1234 { + yyl3418 := r.ReadArrayStart() + if yyl3418 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3369, d) + x.codecDecodeSelfFromArray(yyl3418, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -41707,12 +42211,12 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3370Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3370Slc - var yyhl3370 bool = l >= 0 - for yyj3370 := 0; ; yyj3370++ { - if yyhl3370 { - if yyj3370 >= l { + var yys3419Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3419Slc + var yyhl3419 bool = l >= 0 + for yyj3419 := 0; ; yyj3419++ { + if yyhl3419 { + if yyj3419 >= l { break } } else { @@ -41721,10 +42225,10 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3370Slc = r.DecodeBytes(yys3370Slc, true, true) - yys3370 := string(yys3370Slc) + yys3419Slc = r.DecodeBytes(yys3419Slc, true, true) + yys3419 := string(yys3419Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3370 { + switch yys3419 { case "capabilities": if r.TryDecodeAsNil() { if x.Capabilities != nil { @@ -41745,8 +42249,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Privileged == nil { x.Privileged = new(bool) } - yym3373 := z.DecBinary() - _ = yym3373 + yym3422 := z.DecBinary() + _ = yym3422 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() @@ -41772,8 +42276,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym3376 := z.DecBinary() - _ = yym3376 + yym3425 := z.DecBinary() + _ = yym3425 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) @@ -41788,17 +42292,17 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym3378 := z.DecBinary() - _ = yym3378 + yym3427 := z.DecBinary() + _ = yym3427 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() } } default: - z.DecStructFieldNotFound(-1, yys3370) - } // end switch yys3370 - } // end for yyj3370 + z.DecStructFieldNotFound(-1, yys3419) + } // end switch yys3419 + } // end for yyj3419 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -41806,16 +42310,16 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3379 int - var yyb3379 bool - var yyhl3379 bool = l >= 0 - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + var yyj3428 int + var yyb3428 bool + var yyhl3428 bool = l >= 0 + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41830,13 +42334,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.Capabilities.CodecDecodeSelf(d) } - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41849,20 +42353,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.Privileged == nil { x.Privileged = new(bool) } - yym3382 := z.DecBinary() - _ = yym3382 + yym3431 := z.DecBinary() + _ = yym3431 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() } } - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41877,13 +42381,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.SELinuxOptions.CodecDecodeSelf(d) } - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41896,20 +42400,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym3385 := z.DecBinary() - _ = yym3385 + yym3434 := z.DecBinary() + _ = yym3434 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) } } - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -41922,25 +42426,25 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym3387 := z.DecBinary() - _ = yym3387 + yym3436 := z.DecBinary() + _ = yym3436 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() } } for { - yyj3379++ - if yyhl3379 { - yyb3379 = yyj3379 > l + yyj3428++ + if yyhl3428 { + yyb3428 = yyj3428 > l } else { - yyb3379 = r.CheckBreak() + yyb3428 = r.CheckBreak() } - if yyb3379 { + if yyb3428 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3379-1, "") + z.DecStructFieldNotFound(yyj3428-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -41952,38 +42456,38 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3388 := z.EncBinary() - _ = yym3388 + yym3437 := z.EncBinary() + _ = yym3437 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3389 := !z.EncBinary() - yy2arr3389 := z.EncBasicHandle().StructToArray - var yyq3389 [4]bool - _, _, _ = yysep3389, yyq3389, yy2arr3389 - const yyr3389 bool = false - yyq3389[0] = x.User != "" - yyq3389[1] = x.Role != "" - yyq3389[2] = x.Type != "" - yyq3389[3] = x.Level != "" - var yynn3389 int - if yyr3389 || yy2arr3389 { + yysep3438 := !z.EncBinary() + yy2arr3438 := z.EncBasicHandle().StructToArray + var yyq3438 [4]bool + _, _, _ = yysep3438, yyq3438, yy2arr3438 + const yyr3438 bool = false + yyq3438[0] = x.User != "" + yyq3438[1] = x.Role != "" + yyq3438[2] = x.Type != "" + yyq3438[3] = x.Level != "" + var yynn3438 int + if yyr3438 || yy2arr3438 { r.EncodeArrayStart(4) } else { - yynn3389 = 0 - for _, b := range yyq3389 { + yynn3438 = 0 + for _, b := range yyq3438 { if b { - yynn3389++ + yynn3438++ } } - r.EncodeMapStart(yynn3389) - yynn3389 = 0 + r.EncodeMapStart(yynn3438) + yynn3438 = 0 } - if yyr3389 || yy2arr3389 { + if yyr3438 || yy2arr3438 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3389[0] { - yym3391 := z.EncBinary() - _ = yym3391 + if yyq3438[0] { + yym3440 := z.EncBinary() + _ = yym3440 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) @@ -41992,23 +42496,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3389[0] { + if yyq3438[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("user")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3392 := z.EncBinary() - _ = yym3392 + yym3441 := z.EncBinary() + _ = yym3441 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) } } } - if yyr3389 || yy2arr3389 { + if yyr3438 || yy2arr3438 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3389[1] { - yym3394 := z.EncBinary() - _ = yym3394 + if yyq3438[1] { + yym3443 := z.EncBinary() + _ = yym3443 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) @@ -42017,23 +42521,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3389[1] { + if yyq3438[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("role")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3395 := z.EncBinary() - _ = yym3395 + yym3444 := z.EncBinary() + _ = yym3444 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) } } } - if yyr3389 || yy2arr3389 { + if yyr3438 || yy2arr3438 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3389[2] { - yym3397 := z.EncBinary() - _ = yym3397 + if yyq3438[2] { + yym3446 := z.EncBinary() + _ = yym3446 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -42042,23 +42546,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3389[2] { + if yyq3438[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3398 := z.EncBinary() - _ = yym3398 + yym3447 := z.EncBinary() + _ = yym3447 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr3389 || yy2arr3389 { + if yyr3438 || yy2arr3438 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3389[3] { - yym3400 := z.EncBinary() - _ = yym3400 + if yyq3438[3] { + yym3449 := z.EncBinary() + _ = yym3449 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) @@ -42067,19 +42571,19 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3389[3] { + if yyq3438[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("level")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3401 := z.EncBinary() - _ = yym3401 + yym3450 := z.EncBinary() + _ = yym3450 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) } } } - if yyr3389 || yy2arr3389 { + if yyr3438 || yy2arr3438 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -42092,25 +42596,25 @@ func (x *SELinuxOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3402 := z.DecBinary() - _ = yym3402 + yym3451 := z.DecBinary() + _ = yym3451 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3403 := r.ContainerType() - if yyct3403 == codecSelferValueTypeMap1234 { - yyl3403 := r.ReadMapStart() - if yyl3403 == 0 { + yyct3452 := r.ContainerType() + if yyct3452 == codecSelferValueTypeMap1234 { + yyl3452 := r.ReadMapStart() + if yyl3452 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3403, d) + x.codecDecodeSelfFromMap(yyl3452, d) } - } else if yyct3403 == codecSelferValueTypeArray1234 { - yyl3403 := r.ReadArrayStart() - if yyl3403 == 0 { + } else if yyct3452 == codecSelferValueTypeArray1234 { + yyl3452 := r.ReadArrayStart() + if yyl3452 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3403, d) + x.codecDecodeSelfFromArray(yyl3452, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -42122,12 +42626,12 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3404Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3404Slc - var yyhl3404 bool = l >= 0 - for yyj3404 := 0; ; yyj3404++ { - if yyhl3404 { - if yyj3404 >= l { + var yys3453Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3453Slc + var yyhl3453 bool = l >= 0 + for yyj3453 := 0; ; yyj3453++ { + if yyhl3453 { + if yyj3453 >= l { break } } else { @@ -42136,10 +42640,10 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3404Slc = r.DecodeBytes(yys3404Slc, true, true) - yys3404 := string(yys3404Slc) + yys3453Slc = r.DecodeBytes(yys3453Slc, true, true) + yys3453 := string(yys3453Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3404 { + switch yys3453 { case "user": if r.TryDecodeAsNil() { x.User = "" @@ -42165,9 +42669,9 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3404) - } // end switch yys3404 - } // end for yyj3404 + z.DecStructFieldNotFound(-1, yys3453) + } // end switch yys3453 + } // end for yyj3453 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -42175,16 +42679,16 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3409 int - var yyb3409 bool - var yyhl3409 bool = l >= 0 - yyj3409++ - if yyhl3409 { - yyb3409 = yyj3409 > l + var yyj3458 int + var yyb3458 bool + var yyhl3458 bool = l >= 0 + yyj3458++ + if yyhl3458 { + yyb3458 = yyj3458 > l } else { - yyb3409 = r.CheckBreak() + yyb3458 = r.CheckBreak() } - if yyb3409 { + if yyb3458 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42194,13 +42698,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.User = string(r.DecodeString()) } - yyj3409++ - if yyhl3409 { - yyb3409 = yyj3409 > l + yyj3458++ + if yyhl3458 { + yyb3458 = yyj3458 > l } else { - yyb3409 = r.CheckBreak() + yyb3458 = r.CheckBreak() } - if yyb3409 { + if yyb3458 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42210,13 +42714,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Role = string(r.DecodeString()) } - yyj3409++ - if yyhl3409 { - yyb3409 = yyj3409 > l + yyj3458++ + if yyhl3458 { + yyb3458 = yyj3458 > l } else { - yyb3409 = r.CheckBreak() + yyb3458 = r.CheckBreak() } - if yyb3409 { + if yyb3458 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42226,13 +42730,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Type = string(r.DecodeString()) } - yyj3409++ - if yyhl3409 { - yyb3409 = yyj3409 > l + yyj3458++ + if yyhl3458 { + yyb3458 = yyj3458 > l } else { - yyb3409 = r.CheckBreak() + yyb3458 = r.CheckBreak() } - if yyb3409 { + if yyb3458 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42243,17 +42747,17 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } for { - yyj3409++ - if yyhl3409 { - yyb3409 = yyj3409 > l + yyj3458++ + if yyhl3458 { + yyb3458 = yyj3458 > l } else { - yyb3409 = r.CheckBreak() + yyb3458 = r.CheckBreak() } - if yyb3409 { + if yyb3458 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3409-1, "") + z.DecStructFieldNotFound(yyj3458-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42265,37 +42769,37 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3414 := z.EncBinary() - _ = yym3414 + yym3463 := z.EncBinary() + _ = yym3463 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3415 := !z.EncBinary() - yy2arr3415 := z.EncBasicHandle().StructToArray - var yyq3415 [5]bool - _, _, _ = yysep3415, yyq3415, yy2arr3415 - const yyr3415 bool = false - yyq3415[0] = x.Kind != "" - yyq3415[1] = x.APIVersion != "" - yyq3415[2] = true - var yynn3415 int - if yyr3415 || yy2arr3415 { + yysep3464 := !z.EncBinary() + yy2arr3464 := z.EncBasicHandle().StructToArray + var yyq3464 [5]bool + _, _, _ = yysep3464, yyq3464, yy2arr3464 + const yyr3464 bool = false + yyq3464[0] = x.Kind != "" + yyq3464[1] = x.APIVersion != "" + yyq3464[2] = true + var yynn3464 int + if yyr3464 || yy2arr3464 { r.EncodeArrayStart(5) } else { - yynn3415 = 2 - for _, b := range yyq3415 { + yynn3464 = 2 + for _, b := range yyq3464 { if b { - yynn3415++ + yynn3464++ } } - r.EncodeMapStart(yynn3415) - yynn3415 = 0 + r.EncodeMapStart(yynn3464) + yynn3464 = 0 } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3415[0] { - yym3417 := z.EncBinary() - _ = yym3417 + if yyq3464[0] { + yym3466 := z.EncBinary() + _ = yym3466 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -42304,23 +42808,23 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3415[0] { + if yyq3464[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3418 := z.EncBinary() - _ = yym3418 + yym3467 := z.EncBinary() + _ = yym3467 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3415[1] { - yym3420 := z.EncBinary() - _ = yym3420 + if yyq3464[1] { + yym3469 := z.EncBinary() + _ = yym3469 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -42329,39 +42833,39 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3415[1] { + if yyq3464[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3421 := z.EncBinary() - _ = yym3421 + yym3470 := z.EncBinary() + _ = yym3470 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3415[2] { - yy3423 := &x.ObjectMeta - yy3423.CodecEncodeSelf(e) + if yyq3464[2] { + yy3472 := &x.ObjectMeta + yy3472.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3415[2] { + if yyq3464[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3424 := &x.ObjectMeta - yy3424.CodecEncodeSelf(e) + yy3473 := &x.ObjectMeta + yy3473.CodecEncodeSelf(e) } } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3426 := z.EncBinary() - _ = yym3426 + yym3475 := z.EncBinary() + _ = yym3475 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) @@ -42370,20 +42874,20 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("range")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3427 := z.EncBinary() - _ = yym3427 + yym3476 := z.EncBinary() + _ = yym3476 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) } } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Data == nil { r.EncodeNil() } else { - yym3429 := z.EncBinary() - _ = yym3429 + yym3478 := z.EncBinary() + _ = yym3478 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) @@ -42396,15 +42900,15 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x.Data == nil { r.EncodeNil() } else { - yym3430 := z.EncBinary() - _ = yym3430 + yym3479 := z.EncBinary() + _ = yym3479 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) } } } - if yyr3415 || yy2arr3415 { + if yyr3464 || yy2arr3464 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -42417,25 +42921,25 @@ func (x *RangeAllocation) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3431 := z.DecBinary() - _ = yym3431 + yym3480 := z.DecBinary() + _ = yym3480 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3432 := r.ContainerType() - if yyct3432 == codecSelferValueTypeMap1234 { - yyl3432 := r.ReadMapStart() - if yyl3432 == 0 { + yyct3481 := r.ContainerType() + if yyct3481 == codecSelferValueTypeMap1234 { + yyl3481 := r.ReadMapStart() + if yyl3481 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3432, d) + x.codecDecodeSelfFromMap(yyl3481, d) } - } else if yyct3432 == codecSelferValueTypeArray1234 { - yyl3432 := r.ReadArrayStart() - if yyl3432 == 0 { + } else if yyct3481 == codecSelferValueTypeArray1234 { + yyl3481 := r.ReadArrayStart() + if yyl3481 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3432, d) + x.codecDecodeSelfFromArray(yyl3481, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -42447,12 +42951,12 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3433Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3433Slc - var yyhl3433 bool = l >= 0 - for yyj3433 := 0; ; yyj3433++ { - if yyhl3433 { - if yyj3433 >= l { + var yys3482Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3482Slc + var yyhl3482 bool = l >= 0 + for yyj3482 := 0; ; yyj3482++ { + if yyhl3482 { + if yyj3482 >= l { break } } else { @@ -42461,10 +42965,10 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3433Slc = r.DecodeBytes(yys3433Slc, true, true) - yys3433 := string(yys3433Slc) + yys3482Slc = r.DecodeBytes(yys3482Slc, true, true) + yys3482 := string(yys3482Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3433 { + switch yys3482 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -42481,8 +42985,8 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3436 := &x.ObjectMeta - yyv3436.CodecDecodeSelf(d) + yyv3485 := &x.ObjectMeta + yyv3485.CodecDecodeSelf(d) } case "range": if r.TryDecodeAsNil() { @@ -42494,18 +42998,18 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv3438 := &x.Data - yym3439 := z.DecBinary() - _ = yym3439 + yyv3487 := &x.Data + yym3488 := z.DecBinary() + _ = yym3488 if false { } else { - *yyv3438 = r.DecodeBytes(*(*[]byte)(yyv3438), false, false) + *yyv3487 = r.DecodeBytes(*(*[]byte)(yyv3487), false, false) } } default: - z.DecStructFieldNotFound(-1, yys3433) - } // end switch yys3433 - } // end for yyj3433 + z.DecStructFieldNotFound(-1, yys3482) + } // end switch yys3482 + } // end for yyj3482 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -42513,16 +43017,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3440 int - var yyb3440 bool - var yyhl3440 bool = l >= 0 - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + var yyj3489 int + var yyb3489 bool + var yyhl3489 bool = l >= 0 + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42532,13 +43036,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42548,13 +43052,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42562,16 +43066,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3443 := &x.ObjectMeta - yyv3443.CodecDecodeSelf(d) + yyv3492 := &x.ObjectMeta + yyv3492.CodecDecodeSelf(d) } - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42581,13 +43085,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Range = string(r.DecodeString()) } - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -42595,26 +43099,26 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Data = nil } else { - yyv3445 := &x.Data - yym3446 := z.DecBinary() - _ = yym3446 + yyv3494 := &x.Data + yym3495 := z.DecBinary() + _ = yym3495 if false { } else { - *yyv3445 = r.DecodeBytes(*(*[]byte)(yyv3445), false, false) + *yyv3494 = r.DecodeBytes(*(*[]byte)(yyv3494), false, false) } } for { - yyj3440++ - if yyhl3440 { - yyb3440 = yyj3440 > l + yyj3489++ + if yyhl3489 { + yyb3489 = yyj3489 > l } else { - yyb3440 = r.CheckBreak() + yyb3489 = r.CheckBreak() } - if yyb3440 { + if yyb3489 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3440-1, "") + z.DecStructFieldNotFound(yyj3489-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42624,9 +43128,9 @@ func (x codecSelfer1234) encSlicePersistentVolumeAccessMode(v []PersistentVolume z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3447 := range v { + for _, yyv3496 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv3447.CodecEncodeSelf(e) + yyv3496.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42636,75 +43140,75 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3448 := *v - yyh3448, yyl3448 := z.DecSliceHelperStart() - var yyc3448 bool - if yyl3448 == 0 { - if yyv3448 == nil { - yyv3448 = []PersistentVolumeAccessMode{} - yyc3448 = true - } else if len(yyv3448) != 0 { - yyv3448 = yyv3448[:0] - yyc3448 = true + yyv3497 := *v + yyh3497, yyl3497 := z.DecSliceHelperStart() + var yyc3497 bool + if yyl3497 == 0 { + if yyv3497 == nil { + yyv3497 = []PersistentVolumeAccessMode{} + yyc3497 = true + } else if len(yyv3497) != 0 { + yyv3497 = yyv3497[:0] + yyc3497 = true } - } else if yyl3448 > 0 { - var yyrr3448, yyrl3448 int - var yyrt3448 bool - if yyl3448 > cap(yyv3448) { + } else if yyl3497 > 0 { + var yyrr3497, yyrl3497 int + var yyrt3497 bool + if yyl3497 > cap(yyv3497) { - yyrl3448, yyrt3448 = z.DecInferLen(yyl3448, z.DecBasicHandle().MaxInitLen, 16) - if yyrt3448 { - if yyrl3448 <= cap(yyv3448) { - yyv3448 = yyv3448[:yyrl3448] + yyrl3497, yyrt3497 = z.DecInferLen(yyl3497, z.DecBasicHandle().MaxInitLen, 16) + if yyrt3497 { + if yyrl3497 <= cap(yyv3497) { + yyv3497 = yyv3497[:yyrl3497] } else { - yyv3448 = make([]PersistentVolumeAccessMode, yyrl3448) + yyv3497 = make([]PersistentVolumeAccessMode, yyrl3497) } } else { - yyv3448 = make([]PersistentVolumeAccessMode, yyrl3448) + yyv3497 = make([]PersistentVolumeAccessMode, yyrl3497) } - yyc3448 = true - yyrr3448 = len(yyv3448) - } else if yyl3448 != len(yyv3448) { - yyv3448 = yyv3448[:yyl3448] - yyc3448 = true + yyc3497 = true + yyrr3497 = len(yyv3497) + } else if yyl3497 != len(yyv3497) { + yyv3497 = yyv3497[:yyl3497] + yyc3497 = true } - yyj3448 := 0 - for ; yyj3448 < yyrr3448; yyj3448++ { - yyh3448.ElemContainerState(yyj3448) + yyj3497 := 0 + for ; yyj3497 < yyrr3497; yyj3497++ { + yyh3497.ElemContainerState(yyj3497) if r.TryDecodeAsNil() { - yyv3448[yyj3448] = "" + yyv3497[yyj3497] = "" } else { - yyv3448[yyj3448] = PersistentVolumeAccessMode(r.DecodeString()) + yyv3497[yyj3497] = PersistentVolumeAccessMode(r.DecodeString()) } } - if yyrt3448 { - for ; yyj3448 < yyl3448; yyj3448++ { - yyv3448 = append(yyv3448, "") - yyh3448.ElemContainerState(yyj3448) + if yyrt3497 { + for ; yyj3497 < yyl3497; yyj3497++ { + yyv3497 = append(yyv3497, "") + yyh3497.ElemContainerState(yyj3497) if r.TryDecodeAsNil() { - yyv3448[yyj3448] = "" + yyv3497[yyj3497] = "" } else { - yyv3448[yyj3448] = PersistentVolumeAccessMode(r.DecodeString()) + yyv3497[yyj3497] = PersistentVolumeAccessMode(r.DecodeString()) } } } } else { - yyj3448 := 0 - for ; !r.CheckBreak(); yyj3448++ { + yyj3497 := 0 + for ; !r.CheckBreak(); yyj3497++ { - if yyj3448 >= len(yyv3448) { - yyv3448 = append(yyv3448, "") // var yyz3448 PersistentVolumeAccessMode - yyc3448 = true + if yyj3497 >= len(yyv3497) { + yyv3497 = append(yyv3497, "") // var yyz3497 PersistentVolumeAccessMode + yyc3497 = true } - yyh3448.ElemContainerState(yyj3448) - if yyj3448 < len(yyv3448) { + yyh3497.ElemContainerState(yyj3497) + if yyj3497 < len(yyv3497) { if r.TryDecodeAsNil() { - yyv3448[yyj3448] = "" + yyv3497[yyj3497] = "" } else { - yyv3448[yyj3448] = PersistentVolumeAccessMode(r.DecodeString()) + yyv3497[yyj3497] = PersistentVolumeAccessMode(r.DecodeString()) } } else { @@ -42712,17 +43216,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum } } - if yyj3448 < len(yyv3448) { - yyv3448 = yyv3448[:yyj3448] - yyc3448 = true - } else if yyj3448 == 0 && yyv3448 == nil { - yyv3448 = []PersistentVolumeAccessMode{} - yyc3448 = true + if yyj3497 < len(yyv3497) { + yyv3497 = yyv3497[:yyj3497] + yyc3497 = true + } else if yyj3497 == 0 && yyv3497 == nil { + yyv3497 = []PersistentVolumeAccessMode{} + yyc3497 = true } } - yyh3448.End() - if yyc3448 { - *v = yyv3448 + yyh3497.End() + if yyc3497 { + *v = yyv3497 } } @@ -42731,10 +43235,10 @@ func (x codecSelfer1234) encSlicePersistentVolume(v []PersistentVolume, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3452 := range v { + for _, yyv3501 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3453 := &yyv3452 - yy3453.CodecEncodeSelf(e) + yy3502 := &yyv3501 + yy3502.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42744,83 +43248,83 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3454 := *v - yyh3454, yyl3454 := z.DecSliceHelperStart() - var yyc3454 bool - if yyl3454 == 0 { - if yyv3454 == nil { - yyv3454 = []PersistentVolume{} - yyc3454 = true - } else if len(yyv3454) != 0 { - yyv3454 = yyv3454[:0] - yyc3454 = true + yyv3503 := *v + yyh3503, yyl3503 := z.DecSliceHelperStart() + var yyc3503 bool + if yyl3503 == 0 { + if yyv3503 == nil { + yyv3503 = []PersistentVolume{} + yyc3503 = true + } else if len(yyv3503) != 0 { + yyv3503 = yyv3503[:0] + yyc3503 = true } - } else if yyl3454 > 0 { - var yyrr3454, yyrl3454 int - var yyrt3454 bool - if yyl3454 > cap(yyv3454) { + } else if yyl3503 > 0 { + var yyrr3503, yyrl3503 int + var yyrt3503 bool + if yyl3503 > cap(yyv3503) { - yyrg3454 := len(yyv3454) > 0 - yyv23454 := yyv3454 - yyrl3454, yyrt3454 = z.DecInferLen(yyl3454, z.DecBasicHandle().MaxInitLen, 384) - if yyrt3454 { - if yyrl3454 <= cap(yyv3454) { - yyv3454 = yyv3454[:yyrl3454] + yyrg3503 := len(yyv3503) > 0 + yyv23503 := yyv3503 + yyrl3503, yyrt3503 = z.DecInferLen(yyl3503, z.DecBasicHandle().MaxInitLen, 384) + if yyrt3503 { + if yyrl3503 <= cap(yyv3503) { + yyv3503 = yyv3503[:yyrl3503] } else { - yyv3454 = make([]PersistentVolume, yyrl3454) + yyv3503 = make([]PersistentVolume, yyrl3503) } } else { - yyv3454 = make([]PersistentVolume, yyrl3454) + yyv3503 = make([]PersistentVolume, yyrl3503) } - yyc3454 = true - yyrr3454 = len(yyv3454) - if yyrg3454 { - copy(yyv3454, yyv23454) + yyc3503 = true + yyrr3503 = len(yyv3503) + if yyrg3503 { + copy(yyv3503, yyv23503) } - } else if yyl3454 != len(yyv3454) { - yyv3454 = yyv3454[:yyl3454] - yyc3454 = true + } else if yyl3503 != len(yyv3503) { + yyv3503 = yyv3503[:yyl3503] + yyc3503 = true } - yyj3454 := 0 - for ; yyj3454 < yyrr3454; yyj3454++ { - yyh3454.ElemContainerState(yyj3454) + yyj3503 := 0 + for ; yyj3503 < yyrr3503; yyj3503++ { + yyh3503.ElemContainerState(yyj3503) if r.TryDecodeAsNil() { - yyv3454[yyj3454] = PersistentVolume{} + yyv3503[yyj3503] = PersistentVolume{} } else { - yyv3455 := &yyv3454[yyj3454] - yyv3455.CodecDecodeSelf(d) + yyv3504 := &yyv3503[yyj3503] + yyv3504.CodecDecodeSelf(d) } } - if yyrt3454 { - for ; yyj3454 < yyl3454; yyj3454++ { - yyv3454 = append(yyv3454, PersistentVolume{}) - yyh3454.ElemContainerState(yyj3454) + if yyrt3503 { + for ; yyj3503 < yyl3503; yyj3503++ { + yyv3503 = append(yyv3503, PersistentVolume{}) + yyh3503.ElemContainerState(yyj3503) if r.TryDecodeAsNil() { - yyv3454[yyj3454] = PersistentVolume{} + yyv3503[yyj3503] = PersistentVolume{} } else { - yyv3456 := &yyv3454[yyj3454] - yyv3456.CodecDecodeSelf(d) + yyv3505 := &yyv3503[yyj3503] + yyv3505.CodecDecodeSelf(d) } } } } else { - yyj3454 := 0 - for ; !r.CheckBreak(); yyj3454++ { + yyj3503 := 0 + for ; !r.CheckBreak(); yyj3503++ { - if yyj3454 >= len(yyv3454) { - yyv3454 = append(yyv3454, PersistentVolume{}) // var yyz3454 PersistentVolume - yyc3454 = true + if yyj3503 >= len(yyv3503) { + yyv3503 = append(yyv3503, PersistentVolume{}) // var yyz3503 PersistentVolume + yyc3503 = true } - yyh3454.ElemContainerState(yyj3454) - if yyj3454 < len(yyv3454) { + yyh3503.ElemContainerState(yyj3503) + if yyj3503 < len(yyv3503) { if r.TryDecodeAsNil() { - yyv3454[yyj3454] = PersistentVolume{} + yyv3503[yyj3503] = PersistentVolume{} } else { - yyv3457 := &yyv3454[yyj3454] - yyv3457.CodecDecodeSelf(d) + yyv3506 := &yyv3503[yyj3503] + yyv3506.CodecDecodeSelf(d) } } else { @@ -42828,17 +43332,17 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code } } - if yyj3454 < len(yyv3454) { - yyv3454 = yyv3454[:yyj3454] - yyc3454 = true - } else if yyj3454 == 0 && yyv3454 == nil { - yyv3454 = []PersistentVolume{} - yyc3454 = true + if yyj3503 < len(yyv3503) { + yyv3503 = yyv3503[:yyj3503] + yyc3503 = true + } else if yyj3503 == 0 && yyv3503 == nil { + yyv3503 = []PersistentVolume{} + yyc3503 = true } } - yyh3454.End() - if yyc3454 { - *v = yyv3454 + yyh3503.End() + if yyc3503 { + *v = yyv3503 } } @@ -42847,10 +43351,10 @@ func (x codecSelfer1234) encSlicePersistentVolumeClaim(v []PersistentVolumeClaim z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3458 := range v { + for _, yyv3507 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3459 := &yyv3458 - yy3459.CodecEncodeSelf(e) + yy3508 := &yyv3507 + yy3508.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42860,83 +43364,83 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3460 := *v - yyh3460, yyl3460 := z.DecSliceHelperStart() - var yyc3460 bool - if yyl3460 == 0 { - if yyv3460 == nil { - yyv3460 = []PersistentVolumeClaim{} - yyc3460 = true - } else if len(yyv3460) != 0 { - yyv3460 = yyv3460[:0] - yyc3460 = true + yyv3509 := *v + yyh3509, yyl3509 := z.DecSliceHelperStart() + var yyc3509 bool + if yyl3509 == 0 { + if yyv3509 == nil { + yyv3509 = []PersistentVolumeClaim{} + yyc3509 = true + } else if len(yyv3509) != 0 { + yyv3509 = yyv3509[:0] + yyc3509 = true } - } else if yyl3460 > 0 { - var yyrr3460, yyrl3460 int - var yyrt3460 bool - if yyl3460 > cap(yyv3460) { + } else if yyl3509 > 0 { + var yyrr3509, yyrl3509 int + var yyrt3509 bool + if yyl3509 > cap(yyv3509) { - yyrg3460 := len(yyv3460) > 0 - yyv23460 := yyv3460 - yyrl3460, yyrt3460 = z.DecInferLen(yyl3460, z.DecBasicHandle().MaxInitLen, 296) - if yyrt3460 { - if yyrl3460 <= cap(yyv3460) { - yyv3460 = yyv3460[:yyrl3460] + yyrg3509 := len(yyv3509) > 0 + yyv23509 := yyv3509 + yyrl3509, yyrt3509 = z.DecInferLen(yyl3509, z.DecBasicHandle().MaxInitLen, 296) + if yyrt3509 { + if yyrl3509 <= cap(yyv3509) { + yyv3509 = yyv3509[:yyrl3509] } else { - yyv3460 = make([]PersistentVolumeClaim, yyrl3460) + yyv3509 = make([]PersistentVolumeClaim, yyrl3509) } } else { - yyv3460 = make([]PersistentVolumeClaim, yyrl3460) + yyv3509 = make([]PersistentVolumeClaim, yyrl3509) } - yyc3460 = true - yyrr3460 = len(yyv3460) - if yyrg3460 { - copy(yyv3460, yyv23460) + yyc3509 = true + yyrr3509 = len(yyv3509) + if yyrg3509 { + copy(yyv3509, yyv23509) } - } else if yyl3460 != len(yyv3460) { - yyv3460 = yyv3460[:yyl3460] - yyc3460 = true + } else if yyl3509 != len(yyv3509) { + yyv3509 = yyv3509[:yyl3509] + yyc3509 = true } - yyj3460 := 0 - for ; yyj3460 < yyrr3460; yyj3460++ { - yyh3460.ElemContainerState(yyj3460) + yyj3509 := 0 + for ; yyj3509 < yyrr3509; yyj3509++ { + yyh3509.ElemContainerState(yyj3509) if r.TryDecodeAsNil() { - yyv3460[yyj3460] = PersistentVolumeClaim{} + yyv3509[yyj3509] = PersistentVolumeClaim{} } else { - yyv3461 := &yyv3460[yyj3460] - yyv3461.CodecDecodeSelf(d) + yyv3510 := &yyv3509[yyj3509] + yyv3510.CodecDecodeSelf(d) } } - if yyrt3460 { - for ; yyj3460 < yyl3460; yyj3460++ { - yyv3460 = append(yyv3460, PersistentVolumeClaim{}) - yyh3460.ElemContainerState(yyj3460) + if yyrt3509 { + for ; yyj3509 < yyl3509; yyj3509++ { + yyv3509 = append(yyv3509, PersistentVolumeClaim{}) + yyh3509.ElemContainerState(yyj3509) if r.TryDecodeAsNil() { - yyv3460[yyj3460] = PersistentVolumeClaim{} + yyv3509[yyj3509] = PersistentVolumeClaim{} } else { - yyv3462 := &yyv3460[yyj3460] - yyv3462.CodecDecodeSelf(d) + yyv3511 := &yyv3509[yyj3509] + yyv3511.CodecDecodeSelf(d) } } } } else { - yyj3460 := 0 - for ; !r.CheckBreak(); yyj3460++ { + yyj3509 := 0 + for ; !r.CheckBreak(); yyj3509++ { - if yyj3460 >= len(yyv3460) { - yyv3460 = append(yyv3460, PersistentVolumeClaim{}) // var yyz3460 PersistentVolumeClaim - yyc3460 = true + if yyj3509 >= len(yyv3509) { + yyv3509 = append(yyv3509, PersistentVolumeClaim{}) // var yyz3509 PersistentVolumeClaim + yyc3509 = true } - yyh3460.ElemContainerState(yyj3460) - if yyj3460 < len(yyv3460) { + yyh3509.ElemContainerState(yyj3509) + if yyj3509 < len(yyv3509) { if r.TryDecodeAsNil() { - yyv3460[yyj3460] = PersistentVolumeClaim{} + yyv3509[yyj3509] = PersistentVolumeClaim{} } else { - yyv3463 := &yyv3460[yyj3460] - yyv3463.CodecDecodeSelf(d) + yyv3512 := &yyv3509[yyj3509] + yyv3512.CodecDecodeSelf(d) } } else { @@ -42944,17 +43448,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai } } - if yyj3460 < len(yyv3460) { - yyv3460 = yyv3460[:yyj3460] - yyc3460 = true - } else if yyj3460 == 0 && yyv3460 == nil { - yyv3460 = []PersistentVolumeClaim{} - yyc3460 = true + if yyj3509 < len(yyv3509) { + yyv3509 = yyv3509[:yyj3509] + yyc3509 = true + } else if yyj3509 == 0 && yyv3509 == nil { + yyv3509 = []PersistentVolumeClaim{} + yyc3509 = true } } - yyh3460.End() - if yyc3460 { - *v = yyv3460 + yyh3509.End() + if yyc3509 { + *v = yyv3509 } } @@ -42963,10 +43467,10 @@ func (x codecSelfer1234) encSliceDownwardAPIVolumeFile(v []DownwardAPIVolumeFile z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3464 := range v { + for _, yyv3513 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3465 := &yyv3464 - yy3465.CodecEncodeSelf(e) + yy3514 := &yyv3513 + yy3514.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -42976,83 +43480,83 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3466 := *v - yyh3466, yyl3466 := z.DecSliceHelperStart() - var yyc3466 bool - if yyl3466 == 0 { - if yyv3466 == nil { - yyv3466 = []DownwardAPIVolumeFile{} - yyc3466 = true - } else if len(yyv3466) != 0 { - yyv3466 = yyv3466[:0] - yyc3466 = true + yyv3515 := *v + yyh3515, yyl3515 := z.DecSliceHelperStart() + var yyc3515 bool + if yyl3515 == 0 { + if yyv3515 == nil { + yyv3515 = []DownwardAPIVolumeFile{} + yyc3515 = true + } else if len(yyv3515) != 0 { + yyv3515 = yyv3515[:0] + yyc3515 = true } - } else if yyl3466 > 0 { - var yyrr3466, yyrl3466 int - var yyrt3466 bool - if yyl3466 > cap(yyv3466) { + } else if yyl3515 > 0 { + var yyrr3515, yyrl3515 int + var yyrt3515 bool + if yyl3515 > cap(yyv3515) { - yyrg3466 := len(yyv3466) > 0 - yyv23466 := yyv3466 - yyrl3466, yyrt3466 = z.DecInferLen(yyl3466, z.DecBasicHandle().MaxInitLen, 48) - if yyrt3466 { - if yyrl3466 <= cap(yyv3466) { - yyv3466 = yyv3466[:yyrl3466] + yyrg3515 := len(yyv3515) > 0 + yyv23515 := yyv3515 + yyrl3515, yyrt3515 = z.DecInferLen(yyl3515, z.DecBasicHandle().MaxInitLen, 48) + if yyrt3515 { + if yyrl3515 <= cap(yyv3515) { + yyv3515 = yyv3515[:yyrl3515] } else { - yyv3466 = make([]DownwardAPIVolumeFile, yyrl3466) + yyv3515 = make([]DownwardAPIVolumeFile, yyrl3515) } } else { - yyv3466 = make([]DownwardAPIVolumeFile, yyrl3466) + yyv3515 = make([]DownwardAPIVolumeFile, yyrl3515) } - yyc3466 = true - yyrr3466 = len(yyv3466) - if yyrg3466 { - copy(yyv3466, yyv23466) + yyc3515 = true + yyrr3515 = len(yyv3515) + if yyrg3515 { + copy(yyv3515, yyv23515) } - } else if yyl3466 != len(yyv3466) { - yyv3466 = yyv3466[:yyl3466] - yyc3466 = true + } else if yyl3515 != len(yyv3515) { + yyv3515 = yyv3515[:yyl3515] + yyc3515 = true } - yyj3466 := 0 - for ; yyj3466 < yyrr3466; yyj3466++ { - yyh3466.ElemContainerState(yyj3466) + yyj3515 := 0 + for ; yyj3515 < yyrr3515; yyj3515++ { + yyh3515.ElemContainerState(yyj3515) if r.TryDecodeAsNil() { - yyv3466[yyj3466] = DownwardAPIVolumeFile{} + yyv3515[yyj3515] = DownwardAPIVolumeFile{} } else { - yyv3467 := &yyv3466[yyj3466] - yyv3467.CodecDecodeSelf(d) + yyv3516 := &yyv3515[yyj3515] + yyv3516.CodecDecodeSelf(d) } } - if yyrt3466 { - for ; yyj3466 < yyl3466; yyj3466++ { - yyv3466 = append(yyv3466, DownwardAPIVolumeFile{}) - yyh3466.ElemContainerState(yyj3466) + if yyrt3515 { + for ; yyj3515 < yyl3515; yyj3515++ { + yyv3515 = append(yyv3515, DownwardAPIVolumeFile{}) + yyh3515.ElemContainerState(yyj3515) if r.TryDecodeAsNil() { - yyv3466[yyj3466] = DownwardAPIVolumeFile{} + yyv3515[yyj3515] = DownwardAPIVolumeFile{} } else { - yyv3468 := &yyv3466[yyj3466] - yyv3468.CodecDecodeSelf(d) + yyv3517 := &yyv3515[yyj3515] + yyv3517.CodecDecodeSelf(d) } } } } else { - yyj3466 := 0 - for ; !r.CheckBreak(); yyj3466++ { + yyj3515 := 0 + for ; !r.CheckBreak(); yyj3515++ { - if yyj3466 >= len(yyv3466) { - yyv3466 = append(yyv3466, DownwardAPIVolumeFile{}) // var yyz3466 DownwardAPIVolumeFile - yyc3466 = true + if yyj3515 >= len(yyv3515) { + yyv3515 = append(yyv3515, DownwardAPIVolumeFile{}) // var yyz3515 DownwardAPIVolumeFile + yyc3515 = true } - yyh3466.ElemContainerState(yyj3466) - if yyj3466 < len(yyv3466) { + yyh3515.ElemContainerState(yyj3515) + if yyj3515 < len(yyv3515) { if r.TryDecodeAsNil() { - yyv3466[yyj3466] = DownwardAPIVolumeFile{} + yyv3515[yyj3515] = DownwardAPIVolumeFile{} } else { - yyv3469 := &yyv3466[yyj3466] - yyv3469.CodecDecodeSelf(d) + yyv3518 := &yyv3515[yyj3515] + yyv3518.CodecDecodeSelf(d) } } else { @@ -43060,17 +43564,17 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil } } - if yyj3466 < len(yyv3466) { - yyv3466 = yyv3466[:yyj3466] - yyc3466 = true - } else if yyj3466 == 0 && yyv3466 == nil { - yyv3466 = []DownwardAPIVolumeFile{} - yyc3466 = true + if yyj3515 < len(yyv3515) { + yyv3515 = yyv3515[:yyj3515] + yyc3515 = true + } else if yyj3515 == 0 && yyv3515 == nil { + yyv3515 = []DownwardAPIVolumeFile{} + yyc3515 = true } } - yyh3466.End() - if yyc3466 { - *v = yyv3466 + yyh3515.End() + if yyc3515 { + *v = yyv3515 } } @@ -43079,9 +43583,9 @@ func (x codecSelfer1234) encSliceCapability(v []Capability, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3470 := range v { + for _, yyv3519 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv3470.CodecEncodeSelf(e) + yyv3519.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43091,75 +43595,75 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3471 := *v - yyh3471, yyl3471 := z.DecSliceHelperStart() - var yyc3471 bool - if yyl3471 == 0 { - if yyv3471 == nil { - yyv3471 = []Capability{} - yyc3471 = true - } else if len(yyv3471) != 0 { - yyv3471 = yyv3471[:0] - yyc3471 = true + yyv3520 := *v + yyh3520, yyl3520 := z.DecSliceHelperStart() + var yyc3520 bool + if yyl3520 == 0 { + if yyv3520 == nil { + yyv3520 = []Capability{} + yyc3520 = true + } else if len(yyv3520) != 0 { + yyv3520 = yyv3520[:0] + yyc3520 = true } - } else if yyl3471 > 0 { - var yyrr3471, yyrl3471 int - var yyrt3471 bool - if yyl3471 > cap(yyv3471) { + } else if yyl3520 > 0 { + var yyrr3520, yyrl3520 int + var yyrt3520 bool + if yyl3520 > cap(yyv3520) { - yyrl3471, yyrt3471 = z.DecInferLen(yyl3471, z.DecBasicHandle().MaxInitLen, 16) - if yyrt3471 { - if yyrl3471 <= cap(yyv3471) { - yyv3471 = yyv3471[:yyrl3471] + yyrl3520, yyrt3520 = z.DecInferLen(yyl3520, z.DecBasicHandle().MaxInitLen, 16) + if yyrt3520 { + if yyrl3520 <= cap(yyv3520) { + yyv3520 = yyv3520[:yyrl3520] } else { - yyv3471 = make([]Capability, yyrl3471) + yyv3520 = make([]Capability, yyrl3520) } } else { - yyv3471 = make([]Capability, yyrl3471) + yyv3520 = make([]Capability, yyrl3520) } - yyc3471 = true - yyrr3471 = len(yyv3471) - } else if yyl3471 != len(yyv3471) { - yyv3471 = yyv3471[:yyl3471] - yyc3471 = true + yyc3520 = true + yyrr3520 = len(yyv3520) + } else if yyl3520 != len(yyv3520) { + yyv3520 = yyv3520[:yyl3520] + yyc3520 = true } - yyj3471 := 0 - for ; yyj3471 < yyrr3471; yyj3471++ { - yyh3471.ElemContainerState(yyj3471) + yyj3520 := 0 + for ; yyj3520 < yyrr3520; yyj3520++ { + yyh3520.ElemContainerState(yyj3520) if r.TryDecodeAsNil() { - yyv3471[yyj3471] = "" + yyv3520[yyj3520] = "" } else { - yyv3471[yyj3471] = Capability(r.DecodeString()) + yyv3520[yyj3520] = Capability(r.DecodeString()) } } - if yyrt3471 { - for ; yyj3471 < yyl3471; yyj3471++ { - yyv3471 = append(yyv3471, "") - yyh3471.ElemContainerState(yyj3471) + if yyrt3520 { + for ; yyj3520 < yyl3520; yyj3520++ { + yyv3520 = append(yyv3520, "") + yyh3520.ElemContainerState(yyj3520) if r.TryDecodeAsNil() { - yyv3471[yyj3471] = "" + yyv3520[yyj3520] = "" } else { - yyv3471[yyj3471] = Capability(r.DecodeString()) + yyv3520[yyj3520] = Capability(r.DecodeString()) } } } } else { - yyj3471 := 0 - for ; !r.CheckBreak(); yyj3471++ { + yyj3520 := 0 + for ; !r.CheckBreak(); yyj3520++ { - if yyj3471 >= len(yyv3471) { - yyv3471 = append(yyv3471, "") // var yyz3471 Capability - yyc3471 = true + if yyj3520 >= len(yyv3520) { + yyv3520 = append(yyv3520, "") // var yyz3520 Capability + yyc3520 = true } - yyh3471.ElemContainerState(yyj3471) - if yyj3471 < len(yyv3471) { + yyh3520.ElemContainerState(yyj3520) + if yyj3520 < len(yyv3520) { if r.TryDecodeAsNil() { - yyv3471[yyj3471] = "" + yyv3520[yyj3520] = "" } else { - yyv3471[yyj3471] = Capability(r.DecodeString()) + yyv3520[yyj3520] = Capability(r.DecodeString()) } } else { @@ -43167,17 +43671,17 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode } } - if yyj3471 < len(yyv3471) { - yyv3471 = yyv3471[:yyj3471] - yyc3471 = true - } else if yyj3471 == 0 && yyv3471 == nil { - yyv3471 = []Capability{} - yyc3471 = true + if yyj3520 < len(yyv3520) { + yyv3520 = yyv3520[:yyj3520] + yyc3520 = true + } else if yyj3520 == 0 && yyv3520 == nil { + yyv3520 = []Capability{} + yyc3520 = true } } - yyh3471.End() - if yyc3471 { - *v = yyv3471 + yyh3520.End() + if yyc3520 { + *v = yyv3520 } } @@ -43186,10 +43690,10 @@ func (x codecSelfer1234) encSliceContainerPort(v []ContainerPort, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3475 := range v { + for _, yyv3524 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3476 := &yyv3475 - yy3476.CodecEncodeSelf(e) + yy3525 := &yyv3524 + yy3525.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43199,83 +43703,83 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3477 := *v - yyh3477, yyl3477 := z.DecSliceHelperStart() - var yyc3477 bool - if yyl3477 == 0 { - if yyv3477 == nil { - yyv3477 = []ContainerPort{} - yyc3477 = true - } else if len(yyv3477) != 0 { - yyv3477 = yyv3477[:0] - yyc3477 = true + yyv3526 := *v + yyh3526, yyl3526 := z.DecSliceHelperStart() + var yyc3526 bool + if yyl3526 == 0 { + if yyv3526 == nil { + yyv3526 = []ContainerPort{} + yyc3526 = true + } else if len(yyv3526) != 0 { + yyv3526 = yyv3526[:0] + yyc3526 = true } - } else if yyl3477 > 0 { - var yyrr3477, yyrl3477 int - var yyrt3477 bool - if yyl3477 > cap(yyv3477) { + } else if yyl3526 > 0 { + var yyrr3526, yyrl3526 int + var yyrt3526 bool + if yyl3526 > cap(yyv3526) { - yyrg3477 := len(yyv3477) > 0 - yyv23477 := yyv3477 - yyrl3477, yyrt3477 = z.DecInferLen(yyl3477, z.DecBasicHandle().MaxInitLen, 64) - if yyrt3477 { - if yyrl3477 <= cap(yyv3477) { - yyv3477 = yyv3477[:yyrl3477] + yyrg3526 := len(yyv3526) > 0 + yyv23526 := yyv3526 + yyrl3526, yyrt3526 = z.DecInferLen(yyl3526, z.DecBasicHandle().MaxInitLen, 64) + if yyrt3526 { + if yyrl3526 <= cap(yyv3526) { + yyv3526 = yyv3526[:yyrl3526] } else { - yyv3477 = make([]ContainerPort, yyrl3477) + yyv3526 = make([]ContainerPort, yyrl3526) } } else { - yyv3477 = make([]ContainerPort, yyrl3477) + yyv3526 = make([]ContainerPort, yyrl3526) } - yyc3477 = true - yyrr3477 = len(yyv3477) - if yyrg3477 { - copy(yyv3477, yyv23477) + yyc3526 = true + yyrr3526 = len(yyv3526) + if yyrg3526 { + copy(yyv3526, yyv23526) } - } else if yyl3477 != len(yyv3477) { - yyv3477 = yyv3477[:yyl3477] - yyc3477 = true + } else if yyl3526 != len(yyv3526) { + yyv3526 = yyv3526[:yyl3526] + yyc3526 = true } - yyj3477 := 0 - for ; yyj3477 < yyrr3477; yyj3477++ { - yyh3477.ElemContainerState(yyj3477) + yyj3526 := 0 + for ; yyj3526 < yyrr3526; yyj3526++ { + yyh3526.ElemContainerState(yyj3526) if r.TryDecodeAsNil() { - yyv3477[yyj3477] = ContainerPort{} + yyv3526[yyj3526] = ContainerPort{} } else { - yyv3478 := &yyv3477[yyj3477] - yyv3478.CodecDecodeSelf(d) + yyv3527 := &yyv3526[yyj3526] + yyv3527.CodecDecodeSelf(d) } } - if yyrt3477 { - for ; yyj3477 < yyl3477; yyj3477++ { - yyv3477 = append(yyv3477, ContainerPort{}) - yyh3477.ElemContainerState(yyj3477) + if yyrt3526 { + for ; yyj3526 < yyl3526; yyj3526++ { + yyv3526 = append(yyv3526, ContainerPort{}) + yyh3526.ElemContainerState(yyj3526) if r.TryDecodeAsNil() { - yyv3477[yyj3477] = ContainerPort{} + yyv3526[yyj3526] = ContainerPort{} } else { - yyv3479 := &yyv3477[yyj3477] - yyv3479.CodecDecodeSelf(d) + yyv3528 := &yyv3526[yyj3526] + yyv3528.CodecDecodeSelf(d) } } } } else { - yyj3477 := 0 - for ; !r.CheckBreak(); yyj3477++ { + yyj3526 := 0 + for ; !r.CheckBreak(); yyj3526++ { - if yyj3477 >= len(yyv3477) { - yyv3477 = append(yyv3477, ContainerPort{}) // var yyz3477 ContainerPort - yyc3477 = true + if yyj3526 >= len(yyv3526) { + yyv3526 = append(yyv3526, ContainerPort{}) // var yyz3526 ContainerPort + yyc3526 = true } - yyh3477.ElemContainerState(yyj3477) - if yyj3477 < len(yyv3477) { + yyh3526.ElemContainerState(yyj3526) + if yyj3526 < len(yyv3526) { if r.TryDecodeAsNil() { - yyv3477[yyj3477] = ContainerPort{} + yyv3526[yyj3526] = ContainerPort{} } else { - yyv3480 := &yyv3477[yyj3477] - yyv3480.CodecDecodeSelf(d) + yyv3529 := &yyv3526[yyj3526] + yyv3529.CodecDecodeSelf(d) } } else { @@ -43283,17 +43787,17 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. } } - if yyj3477 < len(yyv3477) { - yyv3477 = yyv3477[:yyj3477] - yyc3477 = true - } else if yyj3477 == 0 && yyv3477 == nil { - yyv3477 = []ContainerPort{} - yyc3477 = true + if yyj3526 < len(yyv3526) { + yyv3526 = yyv3526[:yyj3526] + yyc3526 = true + } else if yyj3526 == 0 && yyv3526 == nil { + yyv3526 = []ContainerPort{} + yyc3526 = true } } - yyh3477.End() - if yyc3477 { - *v = yyv3477 + yyh3526.End() + if yyc3526 { + *v = yyv3526 } } @@ -43302,10 +43806,10 @@ func (x codecSelfer1234) encSliceEnvVar(v []EnvVar, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3481 := range v { + for _, yyv3530 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3482 := &yyv3481 - yy3482.CodecEncodeSelf(e) + yy3531 := &yyv3530 + yy3531.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43315,83 +43819,83 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3483 := *v - yyh3483, yyl3483 := z.DecSliceHelperStart() - var yyc3483 bool - if yyl3483 == 0 { - if yyv3483 == nil { - yyv3483 = []EnvVar{} - yyc3483 = true - } else if len(yyv3483) != 0 { - yyv3483 = yyv3483[:0] - yyc3483 = true + yyv3532 := *v + yyh3532, yyl3532 := z.DecSliceHelperStart() + var yyc3532 bool + if yyl3532 == 0 { + if yyv3532 == nil { + yyv3532 = []EnvVar{} + yyc3532 = true + } else if len(yyv3532) != 0 { + yyv3532 = yyv3532[:0] + yyc3532 = true } - } else if yyl3483 > 0 { - var yyrr3483, yyrl3483 int - var yyrt3483 bool - if yyl3483 > cap(yyv3483) { + } else if yyl3532 > 0 { + var yyrr3532, yyrl3532 int + var yyrt3532 bool + if yyl3532 > cap(yyv3532) { - yyrg3483 := len(yyv3483) > 0 - yyv23483 := yyv3483 - yyrl3483, yyrt3483 = z.DecInferLen(yyl3483, z.DecBasicHandle().MaxInitLen, 40) - if yyrt3483 { - if yyrl3483 <= cap(yyv3483) { - yyv3483 = yyv3483[:yyrl3483] + yyrg3532 := len(yyv3532) > 0 + yyv23532 := yyv3532 + yyrl3532, yyrt3532 = z.DecInferLen(yyl3532, z.DecBasicHandle().MaxInitLen, 40) + if yyrt3532 { + if yyrl3532 <= cap(yyv3532) { + yyv3532 = yyv3532[:yyrl3532] } else { - yyv3483 = make([]EnvVar, yyrl3483) + yyv3532 = make([]EnvVar, yyrl3532) } } else { - yyv3483 = make([]EnvVar, yyrl3483) + yyv3532 = make([]EnvVar, yyrl3532) } - yyc3483 = true - yyrr3483 = len(yyv3483) - if yyrg3483 { - copy(yyv3483, yyv23483) + yyc3532 = true + yyrr3532 = len(yyv3532) + if yyrg3532 { + copy(yyv3532, yyv23532) } - } else if yyl3483 != len(yyv3483) { - yyv3483 = yyv3483[:yyl3483] - yyc3483 = true + } else if yyl3532 != len(yyv3532) { + yyv3532 = yyv3532[:yyl3532] + yyc3532 = true } - yyj3483 := 0 - for ; yyj3483 < yyrr3483; yyj3483++ { - yyh3483.ElemContainerState(yyj3483) + yyj3532 := 0 + for ; yyj3532 < yyrr3532; yyj3532++ { + yyh3532.ElemContainerState(yyj3532) if r.TryDecodeAsNil() { - yyv3483[yyj3483] = EnvVar{} + yyv3532[yyj3532] = EnvVar{} } else { - yyv3484 := &yyv3483[yyj3483] - yyv3484.CodecDecodeSelf(d) + yyv3533 := &yyv3532[yyj3532] + yyv3533.CodecDecodeSelf(d) } } - if yyrt3483 { - for ; yyj3483 < yyl3483; yyj3483++ { - yyv3483 = append(yyv3483, EnvVar{}) - yyh3483.ElemContainerState(yyj3483) + if yyrt3532 { + for ; yyj3532 < yyl3532; yyj3532++ { + yyv3532 = append(yyv3532, EnvVar{}) + yyh3532.ElemContainerState(yyj3532) if r.TryDecodeAsNil() { - yyv3483[yyj3483] = EnvVar{} + yyv3532[yyj3532] = EnvVar{} } else { - yyv3485 := &yyv3483[yyj3483] - yyv3485.CodecDecodeSelf(d) + yyv3534 := &yyv3532[yyj3532] + yyv3534.CodecDecodeSelf(d) } } } } else { - yyj3483 := 0 - for ; !r.CheckBreak(); yyj3483++ { + yyj3532 := 0 + for ; !r.CheckBreak(); yyj3532++ { - if yyj3483 >= len(yyv3483) { - yyv3483 = append(yyv3483, EnvVar{}) // var yyz3483 EnvVar - yyc3483 = true + if yyj3532 >= len(yyv3532) { + yyv3532 = append(yyv3532, EnvVar{}) // var yyz3532 EnvVar + yyc3532 = true } - yyh3483.ElemContainerState(yyj3483) - if yyj3483 < len(yyv3483) { + yyh3532.ElemContainerState(yyj3532) + if yyj3532 < len(yyv3532) { if r.TryDecodeAsNil() { - yyv3483[yyj3483] = EnvVar{} + yyv3532[yyj3532] = EnvVar{} } else { - yyv3486 := &yyv3483[yyj3483] - yyv3486.CodecDecodeSelf(d) + yyv3535 := &yyv3532[yyj3532] + yyv3535.CodecDecodeSelf(d) } } else { @@ -43399,17 +43903,17 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { } } - if yyj3483 < len(yyv3483) { - yyv3483 = yyv3483[:yyj3483] - yyc3483 = true - } else if yyj3483 == 0 && yyv3483 == nil { - yyv3483 = []EnvVar{} - yyc3483 = true + if yyj3532 < len(yyv3532) { + yyv3532 = yyv3532[:yyj3532] + yyc3532 = true + } else if yyj3532 == 0 && yyv3532 == nil { + yyv3532 = []EnvVar{} + yyc3532 = true } } - yyh3483.End() - if yyc3483 { - *v = yyv3483 + yyh3532.End() + if yyc3532 { + *v = yyv3532 } } @@ -43418,10 +43922,10 @@ func (x codecSelfer1234) encSliceVolumeMount(v []VolumeMount, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3487 := range v { + for _, yyv3536 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3488 := &yyv3487 - yy3488.CodecEncodeSelf(e) + yy3537 := &yyv3536 + yy3537.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43431,83 +43935,83 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3489 := *v - yyh3489, yyl3489 := z.DecSliceHelperStart() - var yyc3489 bool - if yyl3489 == 0 { - if yyv3489 == nil { - yyv3489 = []VolumeMount{} - yyc3489 = true - } else if len(yyv3489) != 0 { - yyv3489 = yyv3489[:0] - yyc3489 = true + yyv3538 := *v + yyh3538, yyl3538 := z.DecSliceHelperStart() + var yyc3538 bool + if yyl3538 == 0 { + if yyv3538 == nil { + yyv3538 = []VolumeMount{} + yyc3538 = true + } else if len(yyv3538) != 0 { + yyv3538 = yyv3538[:0] + yyc3538 = true } - } else if yyl3489 > 0 { - var yyrr3489, yyrl3489 int - var yyrt3489 bool - if yyl3489 > cap(yyv3489) { + } else if yyl3538 > 0 { + var yyrr3538, yyrl3538 int + var yyrt3538 bool + if yyl3538 > cap(yyv3538) { - yyrg3489 := len(yyv3489) > 0 - yyv23489 := yyv3489 - yyrl3489, yyrt3489 = z.DecInferLen(yyl3489, z.DecBasicHandle().MaxInitLen, 40) - if yyrt3489 { - if yyrl3489 <= cap(yyv3489) { - yyv3489 = yyv3489[:yyrl3489] + yyrg3538 := len(yyv3538) > 0 + yyv23538 := yyv3538 + yyrl3538, yyrt3538 = z.DecInferLen(yyl3538, z.DecBasicHandle().MaxInitLen, 40) + if yyrt3538 { + if yyrl3538 <= cap(yyv3538) { + yyv3538 = yyv3538[:yyrl3538] } else { - yyv3489 = make([]VolumeMount, yyrl3489) + yyv3538 = make([]VolumeMount, yyrl3538) } } else { - yyv3489 = make([]VolumeMount, yyrl3489) + yyv3538 = make([]VolumeMount, yyrl3538) } - yyc3489 = true - yyrr3489 = len(yyv3489) - if yyrg3489 { - copy(yyv3489, yyv23489) + yyc3538 = true + yyrr3538 = len(yyv3538) + if yyrg3538 { + copy(yyv3538, yyv23538) } - } else if yyl3489 != len(yyv3489) { - yyv3489 = yyv3489[:yyl3489] - yyc3489 = true + } else if yyl3538 != len(yyv3538) { + yyv3538 = yyv3538[:yyl3538] + yyc3538 = true } - yyj3489 := 0 - for ; yyj3489 < yyrr3489; yyj3489++ { - yyh3489.ElemContainerState(yyj3489) + yyj3538 := 0 + for ; yyj3538 < yyrr3538; yyj3538++ { + yyh3538.ElemContainerState(yyj3538) if r.TryDecodeAsNil() { - yyv3489[yyj3489] = VolumeMount{} + yyv3538[yyj3538] = VolumeMount{} } else { - yyv3490 := &yyv3489[yyj3489] - yyv3490.CodecDecodeSelf(d) + yyv3539 := &yyv3538[yyj3538] + yyv3539.CodecDecodeSelf(d) } } - if yyrt3489 { - for ; yyj3489 < yyl3489; yyj3489++ { - yyv3489 = append(yyv3489, VolumeMount{}) - yyh3489.ElemContainerState(yyj3489) + if yyrt3538 { + for ; yyj3538 < yyl3538; yyj3538++ { + yyv3538 = append(yyv3538, VolumeMount{}) + yyh3538.ElemContainerState(yyj3538) if r.TryDecodeAsNil() { - yyv3489[yyj3489] = VolumeMount{} + yyv3538[yyj3538] = VolumeMount{} } else { - yyv3491 := &yyv3489[yyj3489] - yyv3491.CodecDecodeSelf(d) + yyv3540 := &yyv3538[yyj3538] + yyv3540.CodecDecodeSelf(d) } } } } else { - yyj3489 := 0 - for ; !r.CheckBreak(); yyj3489++ { + yyj3538 := 0 + for ; !r.CheckBreak(); yyj3538++ { - if yyj3489 >= len(yyv3489) { - yyv3489 = append(yyv3489, VolumeMount{}) // var yyz3489 VolumeMount - yyc3489 = true + if yyj3538 >= len(yyv3538) { + yyv3538 = append(yyv3538, VolumeMount{}) // var yyz3538 VolumeMount + yyc3538 = true } - yyh3489.ElemContainerState(yyj3489) - if yyj3489 < len(yyv3489) { + yyh3538.ElemContainerState(yyj3538) + if yyj3538 < len(yyv3538) { if r.TryDecodeAsNil() { - yyv3489[yyj3489] = VolumeMount{} + yyv3538[yyj3538] = VolumeMount{} } else { - yyv3492 := &yyv3489[yyj3489] - yyv3492.CodecDecodeSelf(d) + yyv3541 := &yyv3538[yyj3538] + yyv3541.CodecDecodeSelf(d) } } else { @@ -43515,17 +44019,17 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco } } - if yyj3489 < len(yyv3489) { - yyv3489 = yyv3489[:yyj3489] - yyc3489 = true - } else if yyj3489 == 0 && yyv3489 == nil { - yyv3489 = []VolumeMount{} - yyc3489 = true + if yyj3538 < len(yyv3538) { + yyv3538 = yyv3538[:yyj3538] + yyc3538 = true + } else if yyj3538 == 0 && yyv3538 == nil { + yyv3538 = []VolumeMount{} + yyc3538 = true } } - yyh3489.End() - if yyc3489 { - *v = yyv3489 + yyh3538.End() + if yyc3538 { + *v = yyv3538 } } @@ -43534,10 +44038,10 @@ func (x codecSelfer1234) encSlicePod(v []Pod, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3493 := range v { + for _, yyv3542 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3494 := &yyv3493 - yy3494.CodecEncodeSelf(e) + yy3543 := &yyv3542 + yy3543.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43547,83 +44051,83 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3495 := *v - yyh3495, yyl3495 := z.DecSliceHelperStart() - var yyc3495 bool - if yyl3495 == 0 { - if yyv3495 == nil { - yyv3495 = []Pod{} - yyc3495 = true - } else if len(yyv3495) != 0 { - yyv3495 = yyv3495[:0] - yyc3495 = true + yyv3544 := *v + yyh3544, yyl3544 := z.DecSliceHelperStart() + var yyc3544 bool + if yyl3544 == 0 { + if yyv3544 == nil { + yyv3544 = []Pod{} + yyc3544 = true + } else if len(yyv3544) != 0 { + yyv3544 = yyv3544[:0] + yyc3544 = true } - } else if yyl3495 > 0 { - var yyrr3495, yyrl3495 int - var yyrt3495 bool - if yyl3495 > cap(yyv3495) { + } else if yyl3544 > 0 { + var yyrr3544, yyrl3544 int + var yyrt3544 bool + if yyl3544 > cap(yyv3544) { - yyrg3495 := len(yyv3495) > 0 - yyv23495 := yyv3495 - yyrl3495, yyrt3495 = z.DecInferLen(yyl3495, z.DecBasicHandle().MaxInitLen, 496) - if yyrt3495 { - if yyrl3495 <= cap(yyv3495) { - yyv3495 = yyv3495[:yyrl3495] + yyrg3544 := len(yyv3544) > 0 + yyv23544 := yyv3544 + yyrl3544, yyrt3544 = z.DecInferLen(yyl3544, z.DecBasicHandle().MaxInitLen, 496) + if yyrt3544 { + if yyrl3544 <= cap(yyv3544) { + yyv3544 = yyv3544[:yyrl3544] } else { - yyv3495 = make([]Pod, yyrl3495) + yyv3544 = make([]Pod, yyrl3544) } } else { - yyv3495 = make([]Pod, yyrl3495) + yyv3544 = make([]Pod, yyrl3544) } - yyc3495 = true - yyrr3495 = len(yyv3495) - if yyrg3495 { - copy(yyv3495, yyv23495) + yyc3544 = true + yyrr3544 = len(yyv3544) + if yyrg3544 { + copy(yyv3544, yyv23544) } - } else if yyl3495 != len(yyv3495) { - yyv3495 = yyv3495[:yyl3495] - yyc3495 = true + } else if yyl3544 != len(yyv3544) { + yyv3544 = yyv3544[:yyl3544] + yyc3544 = true } - yyj3495 := 0 - for ; yyj3495 < yyrr3495; yyj3495++ { - yyh3495.ElemContainerState(yyj3495) + yyj3544 := 0 + for ; yyj3544 < yyrr3544; yyj3544++ { + yyh3544.ElemContainerState(yyj3544) if r.TryDecodeAsNil() { - yyv3495[yyj3495] = Pod{} + yyv3544[yyj3544] = Pod{} } else { - yyv3496 := &yyv3495[yyj3495] - yyv3496.CodecDecodeSelf(d) + yyv3545 := &yyv3544[yyj3544] + yyv3545.CodecDecodeSelf(d) } } - if yyrt3495 { - for ; yyj3495 < yyl3495; yyj3495++ { - yyv3495 = append(yyv3495, Pod{}) - yyh3495.ElemContainerState(yyj3495) + if yyrt3544 { + for ; yyj3544 < yyl3544; yyj3544++ { + yyv3544 = append(yyv3544, Pod{}) + yyh3544.ElemContainerState(yyj3544) if r.TryDecodeAsNil() { - yyv3495[yyj3495] = Pod{} + yyv3544[yyj3544] = Pod{} } else { - yyv3497 := &yyv3495[yyj3495] - yyv3497.CodecDecodeSelf(d) + yyv3546 := &yyv3544[yyj3544] + yyv3546.CodecDecodeSelf(d) } } } } else { - yyj3495 := 0 - for ; !r.CheckBreak(); yyj3495++ { + yyj3544 := 0 + for ; !r.CheckBreak(); yyj3544++ { - if yyj3495 >= len(yyv3495) { - yyv3495 = append(yyv3495, Pod{}) // var yyz3495 Pod - yyc3495 = true + if yyj3544 >= len(yyv3544) { + yyv3544 = append(yyv3544, Pod{}) // var yyz3544 Pod + yyc3544 = true } - yyh3495.ElemContainerState(yyj3495) - if yyj3495 < len(yyv3495) { + yyh3544.ElemContainerState(yyj3544) + if yyj3544 < len(yyv3544) { if r.TryDecodeAsNil() { - yyv3495[yyj3495] = Pod{} + yyv3544[yyj3544] = Pod{} } else { - yyv3498 := &yyv3495[yyj3495] - yyv3498.CodecDecodeSelf(d) + yyv3547 := &yyv3544[yyj3544] + yyv3547.CodecDecodeSelf(d) } } else { @@ -43631,17 +44135,17 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { } } - if yyj3495 < len(yyv3495) { - yyv3495 = yyv3495[:yyj3495] - yyc3495 = true - } else if yyj3495 == 0 && yyv3495 == nil { - yyv3495 = []Pod{} - yyc3495 = true + if yyj3544 < len(yyv3544) { + yyv3544 = yyv3544[:yyj3544] + yyc3544 = true + } else if yyj3544 == 0 && yyv3544 == nil { + yyv3544 = []Pod{} + yyc3544 = true } } - yyh3495.End() - if yyc3495 { - *v = yyv3495 + yyh3544.End() + if yyc3544 { + *v = yyv3544 } } @@ -43650,10 +44154,10 @@ func (x codecSelfer1234) encSliceVolume(v []Volume, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3499 := range v { + for _, yyv3548 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3500 := &yyv3499 - yy3500.CodecEncodeSelf(e) + yy3549 := &yyv3548 + yy3549.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43663,83 +44167,83 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3501 := *v - yyh3501, yyl3501 := z.DecSliceHelperStart() - var yyc3501 bool - if yyl3501 == 0 { - if yyv3501 == nil { - yyv3501 = []Volume{} - yyc3501 = true - } else if len(yyv3501) != 0 { - yyv3501 = yyv3501[:0] - yyc3501 = true + yyv3550 := *v + yyh3550, yyl3550 := z.DecSliceHelperStart() + var yyc3550 bool + if yyl3550 == 0 { + if yyv3550 == nil { + yyv3550 = []Volume{} + yyc3550 = true + } else if len(yyv3550) != 0 { + yyv3550 = yyv3550[:0] + yyc3550 = true } - } else if yyl3501 > 0 { - var yyrr3501, yyrl3501 int - var yyrt3501 bool - if yyl3501 > cap(yyv3501) { + } else if yyl3550 > 0 { + var yyrr3550, yyrl3550 int + var yyrt3550 bool + if yyl3550 > cap(yyv3550) { - yyrg3501 := len(yyv3501) > 0 - yyv23501 := yyv3501 - yyrl3501, yyrt3501 = z.DecInferLen(yyl3501, z.DecBasicHandle().MaxInitLen, 144) - if yyrt3501 { - if yyrl3501 <= cap(yyv3501) { - yyv3501 = yyv3501[:yyrl3501] + yyrg3550 := len(yyv3550) > 0 + yyv23550 := yyv3550 + yyrl3550, yyrt3550 = z.DecInferLen(yyl3550, z.DecBasicHandle().MaxInitLen, 144) + if yyrt3550 { + if yyrl3550 <= cap(yyv3550) { + yyv3550 = yyv3550[:yyrl3550] } else { - yyv3501 = make([]Volume, yyrl3501) + yyv3550 = make([]Volume, yyrl3550) } } else { - yyv3501 = make([]Volume, yyrl3501) + yyv3550 = make([]Volume, yyrl3550) } - yyc3501 = true - yyrr3501 = len(yyv3501) - if yyrg3501 { - copy(yyv3501, yyv23501) + yyc3550 = true + yyrr3550 = len(yyv3550) + if yyrg3550 { + copy(yyv3550, yyv23550) } - } else if yyl3501 != len(yyv3501) { - yyv3501 = yyv3501[:yyl3501] - yyc3501 = true + } else if yyl3550 != len(yyv3550) { + yyv3550 = yyv3550[:yyl3550] + yyc3550 = true } - yyj3501 := 0 - for ; yyj3501 < yyrr3501; yyj3501++ { - yyh3501.ElemContainerState(yyj3501) + yyj3550 := 0 + for ; yyj3550 < yyrr3550; yyj3550++ { + yyh3550.ElemContainerState(yyj3550) if r.TryDecodeAsNil() { - yyv3501[yyj3501] = Volume{} + yyv3550[yyj3550] = Volume{} } else { - yyv3502 := &yyv3501[yyj3501] - yyv3502.CodecDecodeSelf(d) + yyv3551 := &yyv3550[yyj3550] + yyv3551.CodecDecodeSelf(d) } } - if yyrt3501 { - for ; yyj3501 < yyl3501; yyj3501++ { - yyv3501 = append(yyv3501, Volume{}) - yyh3501.ElemContainerState(yyj3501) + if yyrt3550 { + for ; yyj3550 < yyl3550; yyj3550++ { + yyv3550 = append(yyv3550, Volume{}) + yyh3550.ElemContainerState(yyj3550) if r.TryDecodeAsNil() { - yyv3501[yyj3501] = Volume{} + yyv3550[yyj3550] = Volume{} } else { - yyv3503 := &yyv3501[yyj3501] - yyv3503.CodecDecodeSelf(d) + yyv3552 := &yyv3550[yyj3550] + yyv3552.CodecDecodeSelf(d) } } } } else { - yyj3501 := 0 - for ; !r.CheckBreak(); yyj3501++ { + yyj3550 := 0 + for ; !r.CheckBreak(); yyj3550++ { - if yyj3501 >= len(yyv3501) { - yyv3501 = append(yyv3501, Volume{}) // var yyz3501 Volume - yyc3501 = true + if yyj3550 >= len(yyv3550) { + yyv3550 = append(yyv3550, Volume{}) // var yyz3550 Volume + yyc3550 = true } - yyh3501.ElemContainerState(yyj3501) - if yyj3501 < len(yyv3501) { + yyh3550.ElemContainerState(yyj3550) + if yyj3550 < len(yyv3550) { if r.TryDecodeAsNil() { - yyv3501[yyj3501] = Volume{} + yyv3550[yyj3550] = Volume{} } else { - yyv3504 := &yyv3501[yyj3501] - yyv3504.CodecDecodeSelf(d) + yyv3553 := &yyv3550[yyj3550] + yyv3553.CodecDecodeSelf(d) } } else { @@ -43747,17 +44251,17 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { } } - if yyj3501 < len(yyv3501) { - yyv3501 = yyv3501[:yyj3501] - yyc3501 = true - } else if yyj3501 == 0 && yyv3501 == nil { - yyv3501 = []Volume{} - yyc3501 = true + if yyj3550 < len(yyv3550) { + yyv3550 = yyv3550[:yyj3550] + yyc3550 = true + } else if yyj3550 == 0 && yyv3550 == nil { + yyv3550 = []Volume{} + yyc3550 = true } } - yyh3501.End() - if yyc3501 { - *v = yyv3501 + yyh3550.End() + if yyc3550 { + *v = yyv3550 } } @@ -43766,10 +44270,10 @@ func (x codecSelfer1234) encSliceContainer(v []Container, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3505 := range v { + for _, yyv3554 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3506 := &yyv3505 - yy3506.CodecEncodeSelf(e) + yy3555 := &yyv3554 + yy3555.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43779,83 +44283,83 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3507 := *v - yyh3507, yyl3507 := z.DecSliceHelperStart() - var yyc3507 bool - if yyl3507 == 0 { - if yyv3507 == nil { - yyv3507 = []Container{} - yyc3507 = true - } else if len(yyv3507) != 0 { - yyv3507 = yyv3507[:0] - yyc3507 = true + yyv3556 := *v + yyh3556, yyl3556 := z.DecSliceHelperStart() + var yyc3556 bool + if yyl3556 == 0 { + if yyv3556 == nil { + yyv3556 = []Container{} + yyc3556 = true + } else if len(yyv3556) != 0 { + yyv3556 = yyv3556[:0] + yyc3556 = true } - } else if yyl3507 > 0 { - var yyrr3507, yyrl3507 int - var yyrt3507 bool - if yyl3507 > cap(yyv3507) { + } else if yyl3556 > 0 { + var yyrr3556, yyrl3556 int + var yyrt3556 bool + if yyl3556 > cap(yyv3556) { - yyrg3507 := len(yyv3507) > 0 - yyv23507 := yyv3507 - yyrl3507, yyrt3507 = z.DecInferLen(yyl3507, z.DecBasicHandle().MaxInitLen, 256) - if yyrt3507 { - if yyrl3507 <= cap(yyv3507) { - yyv3507 = yyv3507[:yyrl3507] + yyrg3556 := len(yyv3556) > 0 + yyv23556 := yyv3556 + yyrl3556, yyrt3556 = z.DecInferLen(yyl3556, z.DecBasicHandle().MaxInitLen, 256) + if yyrt3556 { + if yyrl3556 <= cap(yyv3556) { + yyv3556 = yyv3556[:yyrl3556] } else { - yyv3507 = make([]Container, yyrl3507) + yyv3556 = make([]Container, yyrl3556) } } else { - yyv3507 = make([]Container, yyrl3507) + yyv3556 = make([]Container, yyrl3556) } - yyc3507 = true - yyrr3507 = len(yyv3507) - if yyrg3507 { - copy(yyv3507, yyv23507) + yyc3556 = true + yyrr3556 = len(yyv3556) + if yyrg3556 { + copy(yyv3556, yyv23556) } - } else if yyl3507 != len(yyv3507) { - yyv3507 = yyv3507[:yyl3507] - yyc3507 = true + } else if yyl3556 != len(yyv3556) { + yyv3556 = yyv3556[:yyl3556] + yyc3556 = true } - yyj3507 := 0 - for ; yyj3507 < yyrr3507; yyj3507++ { - yyh3507.ElemContainerState(yyj3507) + yyj3556 := 0 + for ; yyj3556 < yyrr3556; yyj3556++ { + yyh3556.ElemContainerState(yyj3556) if r.TryDecodeAsNil() { - yyv3507[yyj3507] = Container{} + yyv3556[yyj3556] = Container{} } else { - yyv3508 := &yyv3507[yyj3507] - yyv3508.CodecDecodeSelf(d) + yyv3557 := &yyv3556[yyj3556] + yyv3557.CodecDecodeSelf(d) } } - if yyrt3507 { - for ; yyj3507 < yyl3507; yyj3507++ { - yyv3507 = append(yyv3507, Container{}) - yyh3507.ElemContainerState(yyj3507) + if yyrt3556 { + for ; yyj3556 < yyl3556; yyj3556++ { + yyv3556 = append(yyv3556, Container{}) + yyh3556.ElemContainerState(yyj3556) if r.TryDecodeAsNil() { - yyv3507[yyj3507] = Container{} + yyv3556[yyj3556] = Container{} } else { - yyv3509 := &yyv3507[yyj3507] - yyv3509.CodecDecodeSelf(d) + yyv3558 := &yyv3556[yyj3556] + yyv3558.CodecDecodeSelf(d) } } } } else { - yyj3507 := 0 - for ; !r.CheckBreak(); yyj3507++ { + yyj3556 := 0 + for ; !r.CheckBreak(); yyj3556++ { - if yyj3507 >= len(yyv3507) { - yyv3507 = append(yyv3507, Container{}) // var yyz3507 Container - yyc3507 = true + if yyj3556 >= len(yyv3556) { + yyv3556 = append(yyv3556, Container{}) // var yyz3556 Container + yyc3556 = true } - yyh3507.ElemContainerState(yyj3507) - if yyj3507 < len(yyv3507) { + yyh3556.ElemContainerState(yyj3556) + if yyj3556 < len(yyv3556) { if r.TryDecodeAsNil() { - yyv3507[yyj3507] = Container{} + yyv3556[yyj3556] = Container{} } else { - yyv3510 := &yyv3507[yyj3507] - yyv3510.CodecDecodeSelf(d) + yyv3559 := &yyv3556[yyj3556] + yyv3559.CodecDecodeSelf(d) } } else { @@ -43863,17 +44367,17 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) } } - if yyj3507 < len(yyv3507) { - yyv3507 = yyv3507[:yyj3507] - yyc3507 = true - } else if yyj3507 == 0 && yyv3507 == nil { - yyv3507 = []Container{} - yyc3507 = true + if yyj3556 < len(yyv3556) { + yyv3556 = yyv3556[:yyj3556] + yyc3556 = true + } else if yyj3556 == 0 && yyv3556 == nil { + yyv3556 = []Container{} + yyc3556 = true } } - yyh3507.End() - if yyc3507 { - *v = yyv3507 + yyh3556.End() + if yyc3556 { + *v = yyv3556 } } @@ -43882,10 +44386,10 @@ func (x codecSelfer1234) encSliceLocalObjectReference(v []LocalObjectReference, z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3511 := range v { + for _, yyv3560 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3512 := &yyv3511 - yy3512.CodecEncodeSelf(e) + yy3561 := &yyv3560 + yy3561.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -43895,83 +44399,83 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3513 := *v - yyh3513, yyl3513 := z.DecSliceHelperStart() - var yyc3513 bool - if yyl3513 == 0 { - if yyv3513 == nil { - yyv3513 = []LocalObjectReference{} - yyc3513 = true - } else if len(yyv3513) != 0 { - yyv3513 = yyv3513[:0] - yyc3513 = true + yyv3562 := *v + yyh3562, yyl3562 := z.DecSliceHelperStart() + var yyc3562 bool + if yyl3562 == 0 { + if yyv3562 == nil { + yyv3562 = []LocalObjectReference{} + yyc3562 = true + } else if len(yyv3562) != 0 { + yyv3562 = yyv3562[:0] + yyc3562 = true } - } else if yyl3513 > 0 { - var yyrr3513, yyrl3513 int - var yyrt3513 bool - if yyl3513 > cap(yyv3513) { + } else if yyl3562 > 0 { + var yyrr3562, yyrl3562 int + var yyrt3562 bool + if yyl3562 > cap(yyv3562) { - yyrg3513 := len(yyv3513) > 0 - yyv23513 := yyv3513 - yyrl3513, yyrt3513 = z.DecInferLen(yyl3513, z.DecBasicHandle().MaxInitLen, 16) - if yyrt3513 { - if yyrl3513 <= cap(yyv3513) { - yyv3513 = yyv3513[:yyrl3513] + yyrg3562 := len(yyv3562) > 0 + yyv23562 := yyv3562 + yyrl3562, yyrt3562 = z.DecInferLen(yyl3562, z.DecBasicHandle().MaxInitLen, 16) + if yyrt3562 { + if yyrl3562 <= cap(yyv3562) { + yyv3562 = yyv3562[:yyrl3562] } else { - yyv3513 = make([]LocalObjectReference, yyrl3513) + yyv3562 = make([]LocalObjectReference, yyrl3562) } } else { - yyv3513 = make([]LocalObjectReference, yyrl3513) + yyv3562 = make([]LocalObjectReference, yyrl3562) } - yyc3513 = true - yyrr3513 = len(yyv3513) - if yyrg3513 { - copy(yyv3513, yyv23513) + yyc3562 = true + yyrr3562 = len(yyv3562) + if yyrg3562 { + copy(yyv3562, yyv23562) } - } else if yyl3513 != len(yyv3513) { - yyv3513 = yyv3513[:yyl3513] - yyc3513 = true + } else if yyl3562 != len(yyv3562) { + yyv3562 = yyv3562[:yyl3562] + yyc3562 = true } - yyj3513 := 0 - for ; yyj3513 < yyrr3513; yyj3513++ { - yyh3513.ElemContainerState(yyj3513) + yyj3562 := 0 + for ; yyj3562 < yyrr3562; yyj3562++ { + yyh3562.ElemContainerState(yyj3562) if r.TryDecodeAsNil() { - yyv3513[yyj3513] = LocalObjectReference{} + yyv3562[yyj3562] = LocalObjectReference{} } else { - yyv3514 := &yyv3513[yyj3513] - yyv3514.CodecDecodeSelf(d) + yyv3563 := &yyv3562[yyj3562] + yyv3563.CodecDecodeSelf(d) } } - if yyrt3513 { - for ; yyj3513 < yyl3513; yyj3513++ { - yyv3513 = append(yyv3513, LocalObjectReference{}) - yyh3513.ElemContainerState(yyj3513) + if yyrt3562 { + for ; yyj3562 < yyl3562; yyj3562++ { + yyv3562 = append(yyv3562, LocalObjectReference{}) + yyh3562.ElemContainerState(yyj3562) if r.TryDecodeAsNil() { - yyv3513[yyj3513] = LocalObjectReference{} + yyv3562[yyj3562] = LocalObjectReference{} } else { - yyv3515 := &yyv3513[yyj3513] - yyv3515.CodecDecodeSelf(d) + yyv3564 := &yyv3562[yyj3562] + yyv3564.CodecDecodeSelf(d) } } } } else { - yyj3513 := 0 - for ; !r.CheckBreak(); yyj3513++ { + yyj3562 := 0 + for ; !r.CheckBreak(); yyj3562++ { - if yyj3513 >= len(yyv3513) { - yyv3513 = append(yyv3513, LocalObjectReference{}) // var yyz3513 LocalObjectReference - yyc3513 = true + if yyj3562 >= len(yyv3562) { + yyv3562 = append(yyv3562, LocalObjectReference{}) // var yyz3562 LocalObjectReference + yyc3562 = true } - yyh3513.ElemContainerState(yyj3513) - if yyj3513 < len(yyv3513) { + yyh3562.ElemContainerState(yyj3562) + if yyj3562 < len(yyv3562) { if r.TryDecodeAsNil() { - yyv3513[yyj3513] = LocalObjectReference{} + yyv3562[yyj3562] = LocalObjectReference{} } else { - yyv3516 := &yyv3513[yyj3513] - yyv3516.CodecDecodeSelf(d) + yyv3565 := &yyv3562[yyj3562] + yyv3565.CodecDecodeSelf(d) } } else { @@ -43979,17 +44483,17 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, } } - if yyj3513 < len(yyv3513) { - yyv3513 = yyv3513[:yyj3513] - yyc3513 = true - } else if yyj3513 == 0 && yyv3513 == nil { - yyv3513 = []LocalObjectReference{} - yyc3513 = true + if yyj3562 < len(yyv3562) { + yyv3562 = yyv3562[:yyj3562] + yyc3562 = true + } else if yyj3562 == 0 && yyv3562 == nil { + yyv3562 = []LocalObjectReference{} + yyc3562 = true } } - yyh3513.End() - if yyc3513 { - *v = yyv3513 + yyh3562.End() + if yyc3562 { + *v = yyv3562 } } @@ -43998,10 +44502,10 @@ func (x codecSelfer1234) encSlicePodCondition(v []PodCondition, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3517 := range v { + for _, yyv3566 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3518 := &yyv3517 - yy3518.CodecEncodeSelf(e) + yy3567 := &yyv3566 + yy3567.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44011,83 +44515,83 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3519 := *v - yyh3519, yyl3519 := z.DecSliceHelperStart() - var yyc3519 bool - if yyl3519 == 0 { - if yyv3519 == nil { - yyv3519 = []PodCondition{} - yyc3519 = true - } else if len(yyv3519) != 0 { - yyv3519 = yyv3519[:0] - yyc3519 = true + yyv3568 := *v + yyh3568, yyl3568 := z.DecSliceHelperStart() + var yyc3568 bool + if yyl3568 == 0 { + if yyv3568 == nil { + yyv3568 = []PodCondition{} + yyc3568 = true + } else if len(yyv3568) != 0 { + yyv3568 = yyv3568[:0] + yyc3568 = true } - } else if yyl3519 > 0 { - var yyrr3519, yyrl3519 int - var yyrt3519 bool - if yyl3519 > cap(yyv3519) { + } else if yyl3568 > 0 { + var yyrr3568, yyrl3568 int + var yyrt3568 bool + if yyl3568 > cap(yyv3568) { - yyrg3519 := len(yyv3519) > 0 - yyv23519 := yyv3519 - yyrl3519, yyrt3519 = z.DecInferLen(yyl3519, z.DecBasicHandle().MaxInitLen, 112) - if yyrt3519 { - if yyrl3519 <= cap(yyv3519) { - yyv3519 = yyv3519[:yyrl3519] + yyrg3568 := len(yyv3568) > 0 + yyv23568 := yyv3568 + yyrl3568, yyrt3568 = z.DecInferLen(yyl3568, z.DecBasicHandle().MaxInitLen, 112) + if yyrt3568 { + if yyrl3568 <= cap(yyv3568) { + yyv3568 = yyv3568[:yyrl3568] } else { - yyv3519 = make([]PodCondition, yyrl3519) + yyv3568 = make([]PodCondition, yyrl3568) } } else { - yyv3519 = make([]PodCondition, yyrl3519) + yyv3568 = make([]PodCondition, yyrl3568) } - yyc3519 = true - yyrr3519 = len(yyv3519) - if yyrg3519 { - copy(yyv3519, yyv23519) + yyc3568 = true + yyrr3568 = len(yyv3568) + if yyrg3568 { + copy(yyv3568, yyv23568) } - } else if yyl3519 != len(yyv3519) { - yyv3519 = yyv3519[:yyl3519] - yyc3519 = true + } else if yyl3568 != len(yyv3568) { + yyv3568 = yyv3568[:yyl3568] + yyc3568 = true } - yyj3519 := 0 - for ; yyj3519 < yyrr3519; yyj3519++ { - yyh3519.ElemContainerState(yyj3519) + yyj3568 := 0 + for ; yyj3568 < yyrr3568; yyj3568++ { + yyh3568.ElemContainerState(yyj3568) if r.TryDecodeAsNil() { - yyv3519[yyj3519] = PodCondition{} + yyv3568[yyj3568] = PodCondition{} } else { - yyv3520 := &yyv3519[yyj3519] - yyv3520.CodecDecodeSelf(d) + yyv3569 := &yyv3568[yyj3568] + yyv3569.CodecDecodeSelf(d) } } - if yyrt3519 { - for ; yyj3519 < yyl3519; yyj3519++ { - yyv3519 = append(yyv3519, PodCondition{}) - yyh3519.ElemContainerState(yyj3519) + if yyrt3568 { + for ; yyj3568 < yyl3568; yyj3568++ { + yyv3568 = append(yyv3568, PodCondition{}) + yyh3568.ElemContainerState(yyj3568) if r.TryDecodeAsNil() { - yyv3519[yyj3519] = PodCondition{} + yyv3568[yyj3568] = PodCondition{} } else { - yyv3521 := &yyv3519[yyj3519] - yyv3521.CodecDecodeSelf(d) + yyv3570 := &yyv3568[yyj3568] + yyv3570.CodecDecodeSelf(d) } } } } else { - yyj3519 := 0 - for ; !r.CheckBreak(); yyj3519++ { + yyj3568 := 0 + for ; !r.CheckBreak(); yyj3568++ { - if yyj3519 >= len(yyv3519) { - yyv3519 = append(yyv3519, PodCondition{}) // var yyz3519 PodCondition - yyc3519 = true + if yyj3568 >= len(yyv3568) { + yyv3568 = append(yyv3568, PodCondition{}) // var yyz3568 PodCondition + yyc3568 = true } - yyh3519.ElemContainerState(yyj3519) - if yyj3519 < len(yyv3519) { + yyh3568.ElemContainerState(yyj3568) + if yyj3568 < len(yyv3568) { if r.TryDecodeAsNil() { - yyv3519[yyj3519] = PodCondition{} + yyv3568[yyj3568] = PodCondition{} } else { - yyv3522 := &yyv3519[yyj3519] - yyv3522.CodecDecodeSelf(d) + yyv3571 := &yyv3568[yyj3568] + yyv3571.CodecDecodeSelf(d) } } else { @@ -44095,17 +44599,17 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De } } - if yyj3519 < len(yyv3519) { - yyv3519 = yyv3519[:yyj3519] - yyc3519 = true - } else if yyj3519 == 0 && yyv3519 == nil { - yyv3519 = []PodCondition{} - yyc3519 = true + if yyj3568 < len(yyv3568) { + yyv3568 = yyv3568[:yyj3568] + yyc3568 = true + } else if yyj3568 == 0 && yyv3568 == nil { + yyv3568 = []PodCondition{} + yyc3568 = true } } - yyh3519.End() - if yyc3519 { - *v = yyv3519 + yyh3568.End() + if yyc3568 { + *v = yyv3568 } } @@ -44114,10 +44618,10 @@ func (x codecSelfer1234) encSliceContainerStatus(v []ContainerStatus, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3523 := range v { + for _, yyv3572 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3524 := &yyv3523 - yy3524.CodecEncodeSelf(e) + yy3573 := &yyv3572 + yy3573.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44127,83 +44631,83 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3525 := *v - yyh3525, yyl3525 := z.DecSliceHelperStart() - var yyc3525 bool - if yyl3525 == 0 { - if yyv3525 == nil { - yyv3525 = []ContainerStatus{} - yyc3525 = true - } else if len(yyv3525) != 0 { - yyv3525 = yyv3525[:0] - yyc3525 = true + yyv3574 := *v + yyh3574, yyl3574 := z.DecSliceHelperStart() + var yyc3574 bool + if yyl3574 == 0 { + if yyv3574 == nil { + yyv3574 = []ContainerStatus{} + yyc3574 = true + } else if len(yyv3574) != 0 { + yyv3574 = yyv3574[:0] + yyc3574 = true } - } else if yyl3525 > 0 { - var yyrr3525, yyrl3525 int - var yyrt3525 bool - if yyl3525 > cap(yyv3525) { + } else if yyl3574 > 0 { + var yyrr3574, yyrl3574 int + var yyrt3574 bool + if yyl3574 > cap(yyv3574) { - yyrg3525 := len(yyv3525) > 0 - yyv23525 := yyv3525 - yyrl3525, yyrt3525 = z.DecInferLen(yyl3525, z.DecBasicHandle().MaxInitLen, 128) - if yyrt3525 { - if yyrl3525 <= cap(yyv3525) { - yyv3525 = yyv3525[:yyrl3525] + yyrg3574 := len(yyv3574) > 0 + yyv23574 := yyv3574 + yyrl3574, yyrt3574 = z.DecInferLen(yyl3574, z.DecBasicHandle().MaxInitLen, 128) + if yyrt3574 { + if yyrl3574 <= cap(yyv3574) { + yyv3574 = yyv3574[:yyrl3574] } else { - yyv3525 = make([]ContainerStatus, yyrl3525) + yyv3574 = make([]ContainerStatus, yyrl3574) } } else { - yyv3525 = make([]ContainerStatus, yyrl3525) + yyv3574 = make([]ContainerStatus, yyrl3574) } - yyc3525 = true - yyrr3525 = len(yyv3525) - if yyrg3525 { - copy(yyv3525, yyv23525) + yyc3574 = true + yyrr3574 = len(yyv3574) + if yyrg3574 { + copy(yyv3574, yyv23574) } - } else if yyl3525 != len(yyv3525) { - yyv3525 = yyv3525[:yyl3525] - yyc3525 = true + } else if yyl3574 != len(yyv3574) { + yyv3574 = yyv3574[:yyl3574] + yyc3574 = true } - yyj3525 := 0 - for ; yyj3525 < yyrr3525; yyj3525++ { - yyh3525.ElemContainerState(yyj3525) + yyj3574 := 0 + for ; yyj3574 < yyrr3574; yyj3574++ { + yyh3574.ElemContainerState(yyj3574) if r.TryDecodeAsNil() { - yyv3525[yyj3525] = ContainerStatus{} + yyv3574[yyj3574] = ContainerStatus{} } else { - yyv3526 := &yyv3525[yyj3525] - yyv3526.CodecDecodeSelf(d) + yyv3575 := &yyv3574[yyj3574] + yyv3575.CodecDecodeSelf(d) } } - if yyrt3525 { - for ; yyj3525 < yyl3525; yyj3525++ { - yyv3525 = append(yyv3525, ContainerStatus{}) - yyh3525.ElemContainerState(yyj3525) + if yyrt3574 { + for ; yyj3574 < yyl3574; yyj3574++ { + yyv3574 = append(yyv3574, ContainerStatus{}) + yyh3574.ElemContainerState(yyj3574) if r.TryDecodeAsNil() { - yyv3525[yyj3525] = ContainerStatus{} + yyv3574[yyj3574] = ContainerStatus{} } else { - yyv3527 := &yyv3525[yyj3525] - yyv3527.CodecDecodeSelf(d) + yyv3576 := &yyv3574[yyj3574] + yyv3576.CodecDecodeSelf(d) } } } } else { - yyj3525 := 0 - for ; !r.CheckBreak(); yyj3525++ { + yyj3574 := 0 + for ; !r.CheckBreak(); yyj3574++ { - if yyj3525 >= len(yyv3525) { - yyv3525 = append(yyv3525, ContainerStatus{}) // var yyz3525 ContainerStatus - yyc3525 = true + if yyj3574 >= len(yyv3574) { + yyv3574 = append(yyv3574, ContainerStatus{}) // var yyz3574 ContainerStatus + yyc3574 = true } - yyh3525.ElemContainerState(yyj3525) - if yyj3525 < len(yyv3525) { + yyh3574.ElemContainerState(yyj3574) + if yyj3574 < len(yyv3574) { if r.TryDecodeAsNil() { - yyv3525[yyj3525] = ContainerStatus{} + yyv3574[yyj3574] = ContainerStatus{} } else { - yyv3528 := &yyv3525[yyj3525] - yyv3528.CodecDecodeSelf(d) + yyv3577 := &yyv3574[yyj3574] + yyv3577.CodecDecodeSelf(d) } } else { @@ -44211,17 +44715,17 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 } } - if yyj3525 < len(yyv3525) { - yyv3525 = yyv3525[:yyj3525] - yyc3525 = true - } else if yyj3525 == 0 && yyv3525 == nil { - yyv3525 = []ContainerStatus{} - yyc3525 = true + if yyj3574 < len(yyv3574) { + yyv3574 = yyv3574[:yyj3574] + yyc3574 = true + } else if yyj3574 == 0 && yyv3574 == nil { + yyv3574 = []ContainerStatus{} + yyc3574 = true } } - yyh3525.End() - if yyc3525 { - *v = yyv3525 + yyh3574.End() + if yyc3574 { + *v = yyv3574 } } @@ -44230,10 +44734,10 @@ func (x codecSelfer1234) encSlicePodTemplate(v []PodTemplate, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3529 := range v { + for _, yyv3578 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3530 := &yyv3529 - yy3530.CodecEncodeSelf(e) + yy3579 := &yyv3578 + yy3579.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44243,83 +44747,83 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3531 := *v - yyh3531, yyl3531 := z.DecSliceHelperStart() - var yyc3531 bool - if yyl3531 == 0 { - if yyv3531 == nil { - yyv3531 = []PodTemplate{} - yyc3531 = true - } else if len(yyv3531) != 0 { - yyv3531 = yyv3531[:0] - yyc3531 = true + yyv3580 := *v + yyh3580, yyl3580 := z.DecSliceHelperStart() + var yyc3580 bool + if yyl3580 == 0 { + if yyv3580 == nil { + yyv3580 = []PodTemplate{} + yyc3580 = true + } else if len(yyv3580) != 0 { + yyv3580 = yyv3580[:0] + yyc3580 = true } - } else if yyl3531 > 0 { - var yyrr3531, yyrl3531 int - var yyrt3531 bool - if yyl3531 > cap(yyv3531) { + } else if yyl3580 > 0 { + var yyrr3580, yyrl3580 int + var yyrt3580 bool + if yyl3580 > cap(yyv3580) { - yyrg3531 := len(yyv3531) > 0 - yyv23531 := yyv3531 - yyrl3531, yyrt3531 = z.DecInferLen(yyl3531, z.DecBasicHandle().MaxInitLen, 520) - if yyrt3531 { - if yyrl3531 <= cap(yyv3531) { - yyv3531 = yyv3531[:yyrl3531] + yyrg3580 := len(yyv3580) > 0 + yyv23580 := yyv3580 + yyrl3580, yyrt3580 = z.DecInferLen(yyl3580, z.DecBasicHandle().MaxInitLen, 520) + if yyrt3580 { + if yyrl3580 <= cap(yyv3580) { + yyv3580 = yyv3580[:yyrl3580] } else { - yyv3531 = make([]PodTemplate, yyrl3531) + yyv3580 = make([]PodTemplate, yyrl3580) } } else { - yyv3531 = make([]PodTemplate, yyrl3531) + yyv3580 = make([]PodTemplate, yyrl3580) } - yyc3531 = true - yyrr3531 = len(yyv3531) - if yyrg3531 { - copy(yyv3531, yyv23531) + yyc3580 = true + yyrr3580 = len(yyv3580) + if yyrg3580 { + copy(yyv3580, yyv23580) } - } else if yyl3531 != len(yyv3531) { - yyv3531 = yyv3531[:yyl3531] - yyc3531 = true + } else if yyl3580 != len(yyv3580) { + yyv3580 = yyv3580[:yyl3580] + yyc3580 = true } - yyj3531 := 0 - for ; yyj3531 < yyrr3531; yyj3531++ { - yyh3531.ElemContainerState(yyj3531) + yyj3580 := 0 + for ; yyj3580 < yyrr3580; yyj3580++ { + yyh3580.ElemContainerState(yyj3580) if r.TryDecodeAsNil() { - yyv3531[yyj3531] = PodTemplate{} + yyv3580[yyj3580] = PodTemplate{} } else { - yyv3532 := &yyv3531[yyj3531] - yyv3532.CodecDecodeSelf(d) + yyv3581 := &yyv3580[yyj3580] + yyv3581.CodecDecodeSelf(d) } } - if yyrt3531 { - for ; yyj3531 < yyl3531; yyj3531++ { - yyv3531 = append(yyv3531, PodTemplate{}) - yyh3531.ElemContainerState(yyj3531) + if yyrt3580 { + for ; yyj3580 < yyl3580; yyj3580++ { + yyv3580 = append(yyv3580, PodTemplate{}) + yyh3580.ElemContainerState(yyj3580) if r.TryDecodeAsNil() { - yyv3531[yyj3531] = PodTemplate{} + yyv3580[yyj3580] = PodTemplate{} } else { - yyv3533 := &yyv3531[yyj3531] - yyv3533.CodecDecodeSelf(d) + yyv3582 := &yyv3580[yyj3580] + yyv3582.CodecDecodeSelf(d) } } } } else { - yyj3531 := 0 - for ; !r.CheckBreak(); yyj3531++ { + yyj3580 := 0 + for ; !r.CheckBreak(); yyj3580++ { - if yyj3531 >= len(yyv3531) { - yyv3531 = append(yyv3531, PodTemplate{}) // var yyz3531 PodTemplate - yyc3531 = true + if yyj3580 >= len(yyv3580) { + yyv3580 = append(yyv3580, PodTemplate{}) // var yyz3580 PodTemplate + yyc3580 = true } - yyh3531.ElemContainerState(yyj3531) - if yyj3531 < len(yyv3531) { + yyh3580.ElemContainerState(yyj3580) + if yyj3580 < len(yyv3580) { if r.TryDecodeAsNil() { - yyv3531[yyj3531] = PodTemplate{} + yyv3580[yyj3580] = PodTemplate{} } else { - yyv3534 := &yyv3531[yyj3531] - yyv3534.CodecDecodeSelf(d) + yyv3583 := &yyv3580[yyj3580] + yyv3583.CodecDecodeSelf(d) } } else { @@ -44327,17 +44831,17 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco } } - if yyj3531 < len(yyv3531) { - yyv3531 = yyv3531[:yyj3531] - yyc3531 = true - } else if yyj3531 == 0 && yyv3531 == nil { - yyv3531 = []PodTemplate{} - yyc3531 = true + if yyj3580 < len(yyv3580) { + yyv3580 = yyv3580[:yyj3580] + yyc3580 = true + } else if yyj3580 == 0 && yyv3580 == nil { + yyv3580 = []PodTemplate{} + yyc3580 = true } } - yyh3531.End() - if yyc3531 { - *v = yyv3531 + yyh3580.End() + if yyc3580 { + *v = yyv3580 } } @@ -44346,10 +44850,10 @@ func (x codecSelfer1234) encSliceReplicationController(v []ReplicationController z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3535 := range v { + for _, yyv3584 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3536 := &yyv3535 - yy3536.CodecEncodeSelf(e) + yy3585 := &yyv3584 + yy3585.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44359,83 +44863,83 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3537 := *v - yyh3537, yyl3537 := z.DecSliceHelperStart() - var yyc3537 bool - if yyl3537 == 0 { - if yyv3537 == nil { - yyv3537 = []ReplicationController{} - yyc3537 = true - } else if len(yyv3537) != 0 { - yyv3537 = yyv3537[:0] - yyc3537 = true + yyv3586 := *v + yyh3586, yyl3586 := z.DecSliceHelperStart() + var yyc3586 bool + if yyl3586 == 0 { + if yyv3586 == nil { + yyv3586 = []ReplicationController{} + yyc3586 = true + } else if len(yyv3586) != 0 { + yyv3586 = yyv3586[:0] + yyc3586 = true } - } else if yyl3537 > 0 { - var yyrr3537, yyrl3537 int - var yyrt3537 bool - if yyl3537 > cap(yyv3537) { + } else if yyl3586 > 0 { + var yyrr3586, yyrl3586 int + var yyrt3586 bool + if yyl3586 > cap(yyv3586) { - yyrg3537 := len(yyv3537) > 0 - yyv23537 := yyv3537 - yyrl3537, yyrt3537 = z.DecInferLen(yyl3537, z.DecBasicHandle().MaxInitLen, 232) - if yyrt3537 { - if yyrl3537 <= cap(yyv3537) { - yyv3537 = yyv3537[:yyrl3537] + yyrg3586 := len(yyv3586) > 0 + yyv23586 := yyv3586 + yyrl3586, yyrt3586 = z.DecInferLen(yyl3586, z.DecBasicHandle().MaxInitLen, 232) + if yyrt3586 { + if yyrl3586 <= cap(yyv3586) { + yyv3586 = yyv3586[:yyrl3586] } else { - yyv3537 = make([]ReplicationController, yyrl3537) + yyv3586 = make([]ReplicationController, yyrl3586) } } else { - yyv3537 = make([]ReplicationController, yyrl3537) + yyv3586 = make([]ReplicationController, yyrl3586) } - yyc3537 = true - yyrr3537 = len(yyv3537) - if yyrg3537 { - copy(yyv3537, yyv23537) + yyc3586 = true + yyrr3586 = len(yyv3586) + if yyrg3586 { + copy(yyv3586, yyv23586) } - } else if yyl3537 != len(yyv3537) { - yyv3537 = yyv3537[:yyl3537] - yyc3537 = true + } else if yyl3586 != len(yyv3586) { + yyv3586 = yyv3586[:yyl3586] + yyc3586 = true } - yyj3537 := 0 - for ; yyj3537 < yyrr3537; yyj3537++ { - yyh3537.ElemContainerState(yyj3537) + yyj3586 := 0 + for ; yyj3586 < yyrr3586; yyj3586++ { + yyh3586.ElemContainerState(yyj3586) if r.TryDecodeAsNil() { - yyv3537[yyj3537] = ReplicationController{} + yyv3586[yyj3586] = ReplicationController{} } else { - yyv3538 := &yyv3537[yyj3537] - yyv3538.CodecDecodeSelf(d) + yyv3587 := &yyv3586[yyj3586] + yyv3587.CodecDecodeSelf(d) } } - if yyrt3537 { - for ; yyj3537 < yyl3537; yyj3537++ { - yyv3537 = append(yyv3537, ReplicationController{}) - yyh3537.ElemContainerState(yyj3537) + if yyrt3586 { + for ; yyj3586 < yyl3586; yyj3586++ { + yyv3586 = append(yyv3586, ReplicationController{}) + yyh3586.ElemContainerState(yyj3586) if r.TryDecodeAsNil() { - yyv3537[yyj3537] = ReplicationController{} + yyv3586[yyj3586] = ReplicationController{} } else { - yyv3539 := &yyv3537[yyj3537] - yyv3539.CodecDecodeSelf(d) + yyv3588 := &yyv3586[yyj3586] + yyv3588.CodecDecodeSelf(d) } } } } else { - yyj3537 := 0 - for ; !r.CheckBreak(); yyj3537++ { + yyj3586 := 0 + for ; !r.CheckBreak(); yyj3586++ { - if yyj3537 >= len(yyv3537) { - yyv3537 = append(yyv3537, ReplicationController{}) // var yyz3537 ReplicationController - yyc3537 = true + if yyj3586 >= len(yyv3586) { + yyv3586 = append(yyv3586, ReplicationController{}) // var yyz3586 ReplicationController + yyc3586 = true } - yyh3537.ElemContainerState(yyj3537) - if yyj3537 < len(yyv3537) { + yyh3586.ElemContainerState(yyj3586) + if yyj3586 < len(yyv3586) { if r.TryDecodeAsNil() { - yyv3537[yyj3537] = ReplicationController{} + yyv3586[yyj3586] = ReplicationController{} } else { - yyv3540 := &yyv3537[yyj3537] - yyv3540.CodecDecodeSelf(d) + yyv3589 := &yyv3586[yyj3586] + yyv3589.CodecDecodeSelf(d) } } else { @@ -44443,17 +44947,17 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle } } - if yyj3537 < len(yyv3537) { - yyv3537 = yyv3537[:yyj3537] - yyc3537 = true - } else if yyj3537 == 0 && yyv3537 == nil { - yyv3537 = []ReplicationController{} - yyc3537 = true + if yyj3586 < len(yyv3586) { + yyv3586 = yyv3586[:yyj3586] + yyc3586 = true + } else if yyj3586 == 0 && yyv3586 == nil { + yyv3586 = []ReplicationController{} + yyc3586 = true } } - yyh3537.End() - if yyc3537 { - *v = yyv3537 + yyh3586.End() + if yyc3586 { + *v = yyv3586 } } @@ -44462,10 +44966,10 @@ func (x codecSelfer1234) encSliceService(v []Service, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3541 := range v { + for _, yyv3590 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3542 := &yyv3541 - yy3542.CodecEncodeSelf(e) + yy3591 := &yyv3590 + yy3591.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44475,83 +44979,83 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3543 := *v - yyh3543, yyl3543 := z.DecSliceHelperStart() - var yyc3543 bool - if yyl3543 == 0 { - if yyv3543 == nil { - yyv3543 = []Service{} - yyc3543 = true - } else if len(yyv3543) != 0 { - yyv3543 = yyv3543[:0] - yyc3543 = true + yyv3592 := *v + yyh3592, yyl3592 := z.DecSliceHelperStart() + var yyc3592 bool + if yyl3592 == 0 { + if yyv3592 == nil { + yyv3592 = []Service{} + yyc3592 = true + } else if len(yyv3592) != 0 { + yyv3592 = yyv3592[:0] + yyc3592 = true } - } else if yyl3543 > 0 { - var yyrr3543, yyrl3543 int - var yyrt3543 bool - if yyl3543 > cap(yyv3543) { + } else if yyl3592 > 0 { + var yyrr3592, yyrl3592 int + var yyrt3592 bool + if yyl3592 > cap(yyv3592) { - yyrg3543 := len(yyv3543) > 0 - yyv23543 := yyv3543 - yyrl3543, yyrt3543 = z.DecInferLen(yyl3543, z.DecBasicHandle().MaxInitLen, 336) - if yyrt3543 { - if yyrl3543 <= cap(yyv3543) { - yyv3543 = yyv3543[:yyrl3543] + yyrg3592 := len(yyv3592) > 0 + yyv23592 := yyv3592 + yyrl3592, yyrt3592 = z.DecInferLen(yyl3592, z.DecBasicHandle().MaxInitLen, 336) + if yyrt3592 { + if yyrl3592 <= cap(yyv3592) { + yyv3592 = yyv3592[:yyrl3592] } else { - yyv3543 = make([]Service, yyrl3543) + yyv3592 = make([]Service, yyrl3592) } } else { - yyv3543 = make([]Service, yyrl3543) + yyv3592 = make([]Service, yyrl3592) } - yyc3543 = true - yyrr3543 = len(yyv3543) - if yyrg3543 { - copy(yyv3543, yyv23543) + yyc3592 = true + yyrr3592 = len(yyv3592) + if yyrg3592 { + copy(yyv3592, yyv23592) } - } else if yyl3543 != len(yyv3543) { - yyv3543 = yyv3543[:yyl3543] - yyc3543 = true + } else if yyl3592 != len(yyv3592) { + yyv3592 = yyv3592[:yyl3592] + yyc3592 = true } - yyj3543 := 0 - for ; yyj3543 < yyrr3543; yyj3543++ { - yyh3543.ElemContainerState(yyj3543) + yyj3592 := 0 + for ; yyj3592 < yyrr3592; yyj3592++ { + yyh3592.ElemContainerState(yyj3592) if r.TryDecodeAsNil() { - yyv3543[yyj3543] = Service{} + yyv3592[yyj3592] = Service{} } else { - yyv3544 := &yyv3543[yyj3543] - yyv3544.CodecDecodeSelf(d) + yyv3593 := &yyv3592[yyj3592] + yyv3593.CodecDecodeSelf(d) } } - if yyrt3543 { - for ; yyj3543 < yyl3543; yyj3543++ { - yyv3543 = append(yyv3543, Service{}) - yyh3543.ElemContainerState(yyj3543) + if yyrt3592 { + for ; yyj3592 < yyl3592; yyj3592++ { + yyv3592 = append(yyv3592, Service{}) + yyh3592.ElemContainerState(yyj3592) if r.TryDecodeAsNil() { - yyv3543[yyj3543] = Service{} + yyv3592[yyj3592] = Service{} } else { - yyv3545 := &yyv3543[yyj3543] - yyv3545.CodecDecodeSelf(d) + yyv3594 := &yyv3592[yyj3592] + yyv3594.CodecDecodeSelf(d) } } } } else { - yyj3543 := 0 - for ; !r.CheckBreak(); yyj3543++ { + yyj3592 := 0 + for ; !r.CheckBreak(); yyj3592++ { - if yyj3543 >= len(yyv3543) { - yyv3543 = append(yyv3543, Service{}) // var yyz3543 Service - yyc3543 = true + if yyj3592 >= len(yyv3592) { + yyv3592 = append(yyv3592, Service{}) // var yyz3592 Service + yyc3592 = true } - yyh3543.ElemContainerState(yyj3543) - if yyj3543 < len(yyv3543) { + yyh3592.ElemContainerState(yyj3592) + if yyj3592 < len(yyv3592) { if r.TryDecodeAsNil() { - yyv3543[yyj3543] = Service{} + yyv3592[yyj3592] = Service{} } else { - yyv3546 := &yyv3543[yyj3543] - yyv3546.CodecDecodeSelf(d) + yyv3595 := &yyv3592[yyj3592] + yyv3595.CodecDecodeSelf(d) } } else { @@ -44559,17 +45063,17 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { } } - if yyj3543 < len(yyv3543) { - yyv3543 = yyv3543[:yyj3543] - yyc3543 = true - } else if yyj3543 == 0 && yyv3543 == nil { - yyv3543 = []Service{} - yyc3543 = true + if yyj3592 < len(yyv3592) { + yyv3592 = yyv3592[:yyj3592] + yyc3592 = true + } else if yyj3592 == 0 && yyv3592 == nil { + yyv3592 = []Service{} + yyc3592 = true } } - yyh3543.End() - if yyc3543 { - *v = yyv3543 + yyh3592.End() + if yyc3592 { + *v = yyv3592 } } @@ -44578,10 +45082,10 @@ func (x codecSelfer1234) encSliceLoadBalancerIngress(v []LoadBalancerIngress, e z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3547 := range v { + for _, yyv3596 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3548 := &yyv3547 - yy3548.CodecEncodeSelf(e) + yy3597 := &yyv3596 + yy3597.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44591,83 +45095,83 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3549 := *v - yyh3549, yyl3549 := z.DecSliceHelperStart() - var yyc3549 bool - if yyl3549 == 0 { - if yyv3549 == nil { - yyv3549 = []LoadBalancerIngress{} - yyc3549 = true - } else if len(yyv3549) != 0 { - yyv3549 = yyv3549[:0] - yyc3549 = true + yyv3598 := *v + yyh3598, yyl3598 := z.DecSliceHelperStart() + var yyc3598 bool + if yyl3598 == 0 { + if yyv3598 == nil { + yyv3598 = []LoadBalancerIngress{} + yyc3598 = true + } else if len(yyv3598) != 0 { + yyv3598 = yyv3598[:0] + yyc3598 = true } - } else if yyl3549 > 0 { - var yyrr3549, yyrl3549 int - var yyrt3549 bool - if yyl3549 > cap(yyv3549) { + } else if yyl3598 > 0 { + var yyrr3598, yyrl3598 int + var yyrt3598 bool + if yyl3598 > cap(yyv3598) { - yyrg3549 := len(yyv3549) > 0 - yyv23549 := yyv3549 - yyrl3549, yyrt3549 = z.DecInferLen(yyl3549, z.DecBasicHandle().MaxInitLen, 32) - if yyrt3549 { - if yyrl3549 <= cap(yyv3549) { - yyv3549 = yyv3549[:yyrl3549] + yyrg3598 := len(yyv3598) > 0 + yyv23598 := yyv3598 + yyrl3598, yyrt3598 = z.DecInferLen(yyl3598, z.DecBasicHandle().MaxInitLen, 32) + if yyrt3598 { + if yyrl3598 <= cap(yyv3598) { + yyv3598 = yyv3598[:yyrl3598] } else { - yyv3549 = make([]LoadBalancerIngress, yyrl3549) + yyv3598 = make([]LoadBalancerIngress, yyrl3598) } } else { - yyv3549 = make([]LoadBalancerIngress, yyrl3549) + yyv3598 = make([]LoadBalancerIngress, yyrl3598) } - yyc3549 = true - yyrr3549 = len(yyv3549) - if yyrg3549 { - copy(yyv3549, yyv23549) + yyc3598 = true + yyrr3598 = len(yyv3598) + if yyrg3598 { + copy(yyv3598, yyv23598) } - } else if yyl3549 != len(yyv3549) { - yyv3549 = yyv3549[:yyl3549] - yyc3549 = true + } else if yyl3598 != len(yyv3598) { + yyv3598 = yyv3598[:yyl3598] + yyc3598 = true } - yyj3549 := 0 - for ; yyj3549 < yyrr3549; yyj3549++ { - yyh3549.ElemContainerState(yyj3549) + yyj3598 := 0 + for ; yyj3598 < yyrr3598; yyj3598++ { + yyh3598.ElemContainerState(yyj3598) if r.TryDecodeAsNil() { - yyv3549[yyj3549] = LoadBalancerIngress{} + yyv3598[yyj3598] = LoadBalancerIngress{} } else { - yyv3550 := &yyv3549[yyj3549] - yyv3550.CodecDecodeSelf(d) + yyv3599 := &yyv3598[yyj3598] + yyv3599.CodecDecodeSelf(d) } } - if yyrt3549 { - for ; yyj3549 < yyl3549; yyj3549++ { - yyv3549 = append(yyv3549, LoadBalancerIngress{}) - yyh3549.ElemContainerState(yyj3549) + if yyrt3598 { + for ; yyj3598 < yyl3598; yyj3598++ { + yyv3598 = append(yyv3598, LoadBalancerIngress{}) + yyh3598.ElemContainerState(yyj3598) if r.TryDecodeAsNil() { - yyv3549[yyj3549] = LoadBalancerIngress{} + yyv3598[yyj3598] = LoadBalancerIngress{} } else { - yyv3551 := &yyv3549[yyj3549] - yyv3551.CodecDecodeSelf(d) + yyv3600 := &yyv3598[yyj3598] + yyv3600.CodecDecodeSelf(d) } } } } else { - yyj3549 := 0 - for ; !r.CheckBreak(); yyj3549++ { + yyj3598 := 0 + for ; !r.CheckBreak(); yyj3598++ { - if yyj3549 >= len(yyv3549) { - yyv3549 = append(yyv3549, LoadBalancerIngress{}) // var yyz3549 LoadBalancerIngress - yyc3549 = true + if yyj3598 >= len(yyv3598) { + yyv3598 = append(yyv3598, LoadBalancerIngress{}) // var yyz3598 LoadBalancerIngress + yyc3598 = true } - yyh3549.ElemContainerState(yyj3549) - if yyj3549 < len(yyv3549) { + yyh3598.ElemContainerState(yyj3598) + if yyj3598 < len(yyv3598) { if r.TryDecodeAsNil() { - yyv3549[yyj3549] = LoadBalancerIngress{} + yyv3598[yyj3598] = LoadBalancerIngress{} } else { - yyv3552 := &yyv3549[yyj3549] - yyv3552.CodecDecodeSelf(d) + yyv3601 := &yyv3598[yyj3598] + yyv3601.CodecDecodeSelf(d) } } else { @@ -44675,17 +45179,17 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d } } - if yyj3549 < len(yyv3549) { - yyv3549 = yyv3549[:yyj3549] - yyc3549 = true - } else if yyj3549 == 0 && yyv3549 == nil { - yyv3549 = []LoadBalancerIngress{} - yyc3549 = true + if yyj3598 < len(yyv3598) { + yyv3598 = yyv3598[:yyj3598] + yyc3598 = true + } else if yyj3598 == 0 && yyv3598 == nil { + yyv3598 = []LoadBalancerIngress{} + yyc3598 = true } } - yyh3549.End() - if yyc3549 { - *v = yyv3549 + yyh3598.End() + if yyc3598 { + *v = yyv3598 } } @@ -44694,10 +45198,10 @@ func (x codecSelfer1234) encSliceServicePort(v []ServicePort, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3553 := range v { + for _, yyv3602 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3554 := &yyv3553 - yy3554.CodecEncodeSelf(e) + yy3603 := &yyv3602 + yy3603.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44707,83 +45211,83 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3555 := *v - yyh3555, yyl3555 := z.DecSliceHelperStart() - var yyc3555 bool - if yyl3555 == 0 { - if yyv3555 == nil { - yyv3555 = []ServicePort{} - yyc3555 = true - } else if len(yyv3555) != 0 { - yyv3555 = yyv3555[:0] - yyc3555 = true + yyv3604 := *v + yyh3604, yyl3604 := z.DecSliceHelperStart() + var yyc3604 bool + if yyl3604 == 0 { + if yyv3604 == nil { + yyv3604 = []ServicePort{} + yyc3604 = true + } else if len(yyv3604) != 0 { + yyv3604 = yyv3604[:0] + yyc3604 = true } - } else if yyl3555 > 0 { - var yyrr3555, yyrl3555 int - var yyrt3555 bool - if yyl3555 > cap(yyv3555) { + } else if yyl3604 > 0 { + var yyrr3604, yyrl3604 int + var yyrt3604 bool + if yyl3604 > cap(yyv3604) { - yyrg3555 := len(yyv3555) > 0 - yyv23555 := yyv3555 - yyrl3555, yyrt3555 = z.DecInferLen(yyl3555, z.DecBasicHandle().MaxInitLen, 80) - if yyrt3555 { - if yyrl3555 <= cap(yyv3555) { - yyv3555 = yyv3555[:yyrl3555] + yyrg3604 := len(yyv3604) > 0 + yyv23604 := yyv3604 + yyrl3604, yyrt3604 = z.DecInferLen(yyl3604, z.DecBasicHandle().MaxInitLen, 80) + if yyrt3604 { + if yyrl3604 <= cap(yyv3604) { + yyv3604 = yyv3604[:yyrl3604] } else { - yyv3555 = make([]ServicePort, yyrl3555) + yyv3604 = make([]ServicePort, yyrl3604) } } else { - yyv3555 = make([]ServicePort, yyrl3555) + yyv3604 = make([]ServicePort, yyrl3604) } - yyc3555 = true - yyrr3555 = len(yyv3555) - if yyrg3555 { - copy(yyv3555, yyv23555) + yyc3604 = true + yyrr3604 = len(yyv3604) + if yyrg3604 { + copy(yyv3604, yyv23604) } - } else if yyl3555 != len(yyv3555) { - yyv3555 = yyv3555[:yyl3555] - yyc3555 = true + } else if yyl3604 != len(yyv3604) { + yyv3604 = yyv3604[:yyl3604] + yyc3604 = true } - yyj3555 := 0 - for ; yyj3555 < yyrr3555; yyj3555++ { - yyh3555.ElemContainerState(yyj3555) + yyj3604 := 0 + for ; yyj3604 < yyrr3604; yyj3604++ { + yyh3604.ElemContainerState(yyj3604) if r.TryDecodeAsNil() { - yyv3555[yyj3555] = ServicePort{} + yyv3604[yyj3604] = ServicePort{} } else { - yyv3556 := &yyv3555[yyj3555] - yyv3556.CodecDecodeSelf(d) + yyv3605 := &yyv3604[yyj3604] + yyv3605.CodecDecodeSelf(d) } } - if yyrt3555 { - for ; yyj3555 < yyl3555; yyj3555++ { - yyv3555 = append(yyv3555, ServicePort{}) - yyh3555.ElemContainerState(yyj3555) + if yyrt3604 { + for ; yyj3604 < yyl3604; yyj3604++ { + yyv3604 = append(yyv3604, ServicePort{}) + yyh3604.ElemContainerState(yyj3604) if r.TryDecodeAsNil() { - yyv3555[yyj3555] = ServicePort{} + yyv3604[yyj3604] = ServicePort{} } else { - yyv3557 := &yyv3555[yyj3555] - yyv3557.CodecDecodeSelf(d) + yyv3606 := &yyv3604[yyj3604] + yyv3606.CodecDecodeSelf(d) } } } } else { - yyj3555 := 0 - for ; !r.CheckBreak(); yyj3555++ { + yyj3604 := 0 + for ; !r.CheckBreak(); yyj3604++ { - if yyj3555 >= len(yyv3555) { - yyv3555 = append(yyv3555, ServicePort{}) // var yyz3555 ServicePort - yyc3555 = true + if yyj3604 >= len(yyv3604) { + yyv3604 = append(yyv3604, ServicePort{}) // var yyz3604 ServicePort + yyc3604 = true } - yyh3555.ElemContainerState(yyj3555) - if yyj3555 < len(yyv3555) { + yyh3604.ElemContainerState(yyj3604) + if yyj3604 < len(yyv3604) { if r.TryDecodeAsNil() { - yyv3555[yyj3555] = ServicePort{} + yyv3604[yyj3604] = ServicePort{} } else { - yyv3558 := &yyv3555[yyj3555] - yyv3558.CodecDecodeSelf(d) + yyv3607 := &yyv3604[yyj3604] + yyv3607.CodecDecodeSelf(d) } } else { @@ -44791,17 +45295,17 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco } } - if yyj3555 < len(yyv3555) { - yyv3555 = yyv3555[:yyj3555] - yyc3555 = true - } else if yyj3555 == 0 && yyv3555 == nil { - yyv3555 = []ServicePort{} - yyc3555 = true + if yyj3604 < len(yyv3604) { + yyv3604 = yyv3604[:yyj3604] + yyc3604 = true + } else if yyj3604 == 0 && yyv3604 == nil { + yyv3604 = []ServicePort{} + yyc3604 = true } } - yyh3555.End() - if yyc3555 { - *v = yyv3555 + yyh3604.End() + if yyc3604 { + *v = yyv3604 } } @@ -44810,10 +45314,10 @@ func (x codecSelfer1234) encSliceObjectReference(v []ObjectReference, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3559 := range v { + for _, yyv3608 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3560 := &yyv3559 - yy3560.CodecEncodeSelf(e) + yy3609 := &yyv3608 + yy3609.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44823,83 +45327,83 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3561 := *v - yyh3561, yyl3561 := z.DecSliceHelperStart() - var yyc3561 bool - if yyl3561 == 0 { - if yyv3561 == nil { - yyv3561 = []ObjectReference{} - yyc3561 = true - } else if len(yyv3561) != 0 { - yyv3561 = yyv3561[:0] - yyc3561 = true + yyv3610 := *v + yyh3610, yyl3610 := z.DecSliceHelperStart() + var yyc3610 bool + if yyl3610 == 0 { + if yyv3610 == nil { + yyv3610 = []ObjectReference{} + yyc3610 = true + } else if len(yyv3610) != 0 { + yyv3610 = yyv3610[:0] + yyc3610 = true } - } else if yyl3561 > 0 { - var yyrr3561, yyrl3561 int - var yyrt3561 bool - if yyl3561 > cap(yyv3561) { + } else if yyl3610 > 0 { + var yyrr3610, yyrl3610 int + var yyrt3610 bool + if yyl3610 > cap(yyv3610) { - yyrg3561 := len(yyv3561) > 0 - yyv23561 := yyv3561 - yyrl3561, yyrt3561 = z.DecInferLen(yyl3561, z.DecBasicHandle().MaxInitLen, 112) - if yyrt3561 { - if yyrl3561 <= cap(yyv3561) { - yyv3561 = yyv3561[:yyrl3561] + yyrg3610 := len(yyv3610) > 0 + yyv23610 := yyv3610 + yyrl3610, yyrt3610 = z.DecInferLen(yyl3610, z.DecBasicHandle().MaxInitLen, 112) + if yyrt3610 { + if yyrl3610 <= cap(yyv3610) { + yyv3610 = yyv3610[:yyrl3610] } else { - yyv3561 = make([]ObjectReference, yyrl3561) + yyv3610 = make([]ObjectReference, yyrl3610) } } else { - yyv3561 = make([]ObjectReference, yyrl3561) + yyv3610 = make([]ObjectReference, yyrl3610) } - yyc3561 = true - yyrr3561 = len(yyv3561) - if yyrg3561 { - copy(yyv3561, yyv23561) + yyc3610 = true + yyrr3610 = len(yyv3610) + if yyrg3610 { + copy(yyv3610, yyv23610) } - } else if yyl3561 != len(yyv3561) { - yyv3561 = yyv3561[:yyl3561] - yyc3561 = true + } else if yyl3610 != len(yyv3610) { + yyv3610 = yyv3610[:yyl3610] + yyc3610 = true } - yyj3561 := 0 - for ; yyj3561 < yyrr3561; yyj3561++ { - yyh3561.ElemContainerState(yyj3561) + yyj3610 := 0 + for ; yyj3610 < yyrr3610; yyj3610++ { + yyh3610.ElemContainerState(yyj3610) if r.TryDecodeAsNil() { - yyv3561[yyj3561] = ObjectReference{} + yyv3610[yyj3610] = ObjectReference{} } else { - yyv3562 := &yyv3561[yyj3561] - yyv3562.CodecDecodeSelf(d) + yyv3611 := &yyv3610[yyj3610] + yyv3611.CodecDecodeSelf(d) } } - if yyrt3561 { - for ; yyj3561 < yyl3561; yyj3561++ { - yyv3561 = append(yyv3561, ObjectReference{}) - yyh3561.ElemContainerState(yyj3561) + if yyrt3610 { + for ; yyj3610 < yyl3610; yyj3610++ { + yyv3610 = append(yyv3610, ObjectReference{}) + yyh3610.ElemContainerState(yyj3610) if r.TryDecodeAsNil() { - yyv3561[yyj3561] = ObjectReference{} + yyv3610[yyj3610] = ObjectReference{} } else { - yyv3563 := &yyv3561[yyj3561] - yyv3563.CodecDecodeSelf(d) + yyv3612 := &yyv3610[yyj3610] + yyv3612.CodecDecodeSelf(d) } } } } else { - yyj3561 := 0 - for ; !r.CheckBreak(); yyj3561++ { + yyj3610 := 0 + for ; !r.CheckBreak(); yyj3610++ { - if yyj3561 >= len(yyv3561) { - yyv3561 = append(yyv3561, ObjectReference{}) // var yyz3561 ObjectReference - yyc3561 = true + if yyj3610 >= len(yyv3610) { + yyv3610 = append(yyv3610, ObjectReference{}) // var yyz3610 ObjectReference + yyc3610 = true } - yyh3561.ElemContainerState(yyj3561) - if yyj3561 < len(yyv3561) { + yyh3610.ElemContainerState(yyj3610) + if yyj3610 < len(yyv3610) { if r.TryDecodeAsNil() { - yyv3561[yyj3561] = ObjectReference{} + yyv3610[yyj3610] = ObjectReference{} } else { - yyv3564 := &yyv3561[yyj3561] - yyv3564.CodecDecodeSelf(d) + yyv3613 := &yyv3610[yyj3610] + yyv3613.CodecDecodeSelf(d) } } else { @@ -44907,17 +45411,17 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 } } - if yyj3561 < len(yyv3561) { - yyv3561 = yyv3561[:yyj3561] - yyc3561 = true - } else if yyj3561 == 0 && yyv3561 == nil { - yyv3561 = []ObjectReference{} - yyc3561 = true + if yyj3610 < len(yyv3610) { + yyv3610 = yyv3610[:yyj3610] + yyc3610 = true + } else if yyj3610 == 0 && yyv3610 == nil { + yyv3610 = []ObjectReference{} + yyc3610 = true } } - yyh3561.End() - if yyc3561 { - *v = yyv3561 + yyh3610.End() + if yyc3610 { + *v = yyv3610 } } @@ -44926,10 +45430,10 @@ func (x codecSelfer1234) encSliceServiceAccount(v []ServiceAccount, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3565 := range v { + for _, yyv3614 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3566 := &yyv3565 - yy3566.CodecEncodeSelf(e) + yy3615 := &yyv3614 + yy3615.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -44939,83 +45443,83 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3567 := *v - yyh3567, yyl3567 := z.DecSliceHelperStart() - var yyc3567 bool - if yyl3567 == 0 { - if yyv3567 == nil { - yyv3567 = []ServiceAccount{} - yyc3567 = true - } else if len(yyv3567) != 0 { - yyv3567 = yyv3567[:0] - yyc3567 = true + yyv3616 := *v + yyh3616, yyl3616 := z.DecSliceHelperStart() + var yyc3616 bool + if yyl3616 == 0 { + if yyv3616 == nil { + yyv3616 = []ServiceAccount{} + yyc3616 = true + } else if len(yyv3616) != 0 { + yyv3616 = yyv3616[:0] + yyc3616 = true } - } else if yyl3567 > 0 { - var yyrr3567, yyrl3567 int - var yyrt3567 bool - if yyl3567 > cap(yyv3567) { + } else if yyl3616 > 0 { + var yyrr3616, yyrl3616 int + var yyrt3616 bool + if yyl3616 > cap(yyv3616) { - yyrg3567 := len(yyv3567) > 0 - yyv23567 := yyv3567 - yyrl3567, yyrt3567 = z.DecInferLen(yyl3567, z.DecBasicHandle().MaxInitLen, 240) - if yyrt3567 { - if yyrl3567 <= cap(yyv3567) { - yyv3567 = yyv3567[:yyrl3567] + yyrg3616 := len(yyv3616) > 0 + yyv23616 := yyv3616 + yyrl3616, yyrt3616 = z.DecInferLen(yyl3616, z.DecBasicHandle().MaxInitLen, 240) + if yyrt3616 { + if yyrl3616 <= cap(yyv3616) { + yyv3616 = yyv3616[:yyrl3616] } else { - yyv3567 = make([]ServiceAccount, yyrl3567) + yyv3616 = make([]ServiceAccount, yyrl3616) } } else { - yyv3567 = make([]ServiceAccount, yyrl3567) + yyv3616 = make([]ServiceAccount, yyrl3616) } - yyc3567 = true - yyrr3567 = len(yyv3567) - if yyrg3567 { - copy(yyv3567, yyv23567) + yyc3616 = true + yyrr3616 = len(yyv3616) + if yyrg3616 { + copy(yyv3616, yyv23616) } - } else if yyl3567 != len(yyv3567) { - yyv3567 = yyv3567[:yyl3567] - yyc3567 = true + } else if yyl3616 != len(yyv3616) { + yyv3616 = yyv3616[:yyl3616] + yyc3616 = true } - yyj3567 := 0 - for ; yyj3567 < yyrr3567; yyj3567++ { - yyh3567.ElemContainerState(yyj3567) + yyj3616 := 0 + for ; yyj3616 < yyrr3616; yyj3616++ { + yyh3616.ElemContainerState(yyj3616) if r.TryDecodeAsNil() { - yyv3567[yyj3567] = ServiceAccount{} + yyv3616[yyj3616] = ServiceAccount{} } else { - yyv3568 := &yyv3567[yyj3567] - yyv3568.CodecDecodeSelf(d) + yyv3617 := &yyv3616[yyj3616] + yyv3617.CodecDecodeSelf(d) } } - if yyrt3567 { - for ; yyj3567 < yyl3567; yyj3567++ { - yyv3567 = append(yyv3567, ServiceAccount{}) - yyh3567.ElemContainerState(yyj3567) + if yyrt3616 { + for ; yyj3616 < yyl3616; yyj3616++ { + yyv3616 = append(yyv3616, ServiceAccount{}) + yyh3616.ElemContainerState(yyj3616) if r.TryDecodeAsNil() { - yyv3567[yyj3567] = ServiceAccount{} + yyv3616[yyj3616] = ServiceAccount{} } else { - yyv3569 := &yyv3567[yyj3567] - yyv3569.CodecDecodeSelf(d) + yyv3618 := &yyv3616[yyj3616] + yyv3618.CodecDecodeSelf(d) } } } } else { - yyj3567 := 0 - for ; !r.CheckBreak(); yyj3567++ { + yyj3616 := 0 + for ; !r.CheckBreak(); yyj3616++ { - if yyj3567 >= len(yyv3567) { - yyv3567 = append(yyv3567, ServiceAccount{}) // var yyz3567 ServiceAccount - yyc3567 = true + if yyj3616 >= len(yyv3616) { + yyv3616 = append(yyv3616, ServiceAccount{}) // var yyz3616 ServiceAccount + yyc3616 = true } - yyh3567.ElemContainerState(yyj3567) - if yyj3567 < len(yyv3567) { + yyh3616.ElemContainerState(yyj3616) + if yyj3616 < len(yyv3616) { if r.TryDecodeAsNil() { - yyv3567[yyj3567] = ServiceAccount{} + yyv3616[yyj3616] = ServiceAccount{} } else { - yyv3570 := &yyv3567[yyj3567] - yyv3570.CodecDecodeSelf(d) + yyv3619 := &yyv3616[yyj3616] + yyv3619.CodecDecodeSelf(d) } } else { @@ -45023,17 +45527,17 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 } } - if yyj3567 < len(yyv3567) { - yyv3567 = yyv3567[:yyj3567] - yyc3567 = true - } else if yyj3567 == 0 && yyv3567 == nil { - yyv3567 = []ServiceAccount{} - yyc3567 = true + if yyj3616 < len(yyv3616) { + yyv3616 = yyv3616[:yyj3616] + yyc3616 = true + } else if yyj3616 == 0 && yyv3616 == nil { + yyv3616 = []ServiceAccount{} + yyc3616 = true } } - yyh3567.End() - if yyc3567 { - *v = yyv3567 + yyh3616.End() + if yyc3616 { + *v = yyv3616 } } @@ -45042,10 +45546,10 @@ func (x codecSelfer1234) encSliceEndpointSubset(v []EndpointSubset, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3571 := range v { + for _, yyv3620 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3572 := &yyv3571 - yy3572.CodecEncodeSelf(e) + yy3621 := &yyv3620 + yy3621.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45055,83 +45559,83 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3573 := *v - yyh3573, yyl3573 := z.DecSliceHelperStart() - var yyc3573 bool - if yyl3573 == 0 { - if yyv3573 == nil { - yyv3573 = []EndpointSubset{} - yyc3573 = true - } else if len(yyv3573) != 0 { - yyv3573 = yyv3573[:0] - yyc3573 = true + yyv3622 := *v + yyh3622, yyl3622 := z.DecSliceHelperStart() + var yyc3622 bool + if yyl3622 == 0 { + if yyv3622 == nil { + yyv3622 = []EndpointSubset{} + yyc3622 = true + } else if len(yyv3622) != 0 { + yyv3622 = yyv3622[:0] + yyc3622 = true } - } else if yyl3573 > 0 { - var yyrr3573, yyrl3573 int - var yyrt3573 bool - if yyl3573 > cap(yyv3573) { + } else if yyl3622 > 0 { + var yyrr3622, yyrl3622 int + var yyrt3622 bool + if yyl3622 > cap(yyv3622) { - yyrg3573 := len(yyv3573) > 0 - yyv23573 := yyv3573 - yyrl3573, yyrt3573 = z.DecInferLen(yyl3573, z.DecBasicHandle().MaxInitLen, 72) - if yyrt3573 { - if yyrl3573 <= cap(yyv3573) { - yyv3573 = yyv3573[:yyrl3573] + yyrg3622 := len(yyv3622) > 0 + yyv23622 := yyv3622 + yyrl3622, yyrt3622 = z.DecInferLen(yyl3622, z.DecBasicHandle().MaxInitLen, 72) + if yyrt3622 { + if yyrl3622 <= cap(yyv3622) { + yyv3622 = yyv3622[:yyrl3622] } else { - yyv3573 = make([]EndpointSubset, yyrl3573) + yyv3622 = make([]EndpointSubset, yyrl3622) } } else { - yyv3573 = make([]EndpointSubset, yyrl3573) + yyv3622 = make([]EndpointSubset, yyrl3622) } - yyc3573 = true - yyrr3573 = len(yyv3573) - if yyrg3573 { - copy(yyv3573, yyv23573) + yyc3622 = true + yyrr3622 = len(yyv3622) + if yyrg3622 { + copy(yyv3622, yyv23622) } - } else if yyl3573 != len(yyv3573) { - yyv3573 = yyv3573[:yyl3573] - yyc3573 = true + } else if yyl3622 != len(yyv3622) { + yyv3622 = yyv3622[:yyl3622] + yyc3622 = true } - yyj3573 := 0 - for ; yyj3573 < yyrr3573; yyj3573++ { - yyh3573.ElemContainerState(yyj3573) + yyj3622 := 0 + for ; yyj3622 < yyrr3622; yyj3622++ { + yyh3622.ElemContainerState(yyj3622) if r.TryDecodeAsNil() { - yyv3573[yyj3573] = EndpointSubset{} + yyv3622[yyj3622] = EndpointSubset{} } else { - yyv3574 := &yyv3573[yyj3573] - yyv3574.CodecDecodeSelf(d) + yyv3623 := &yyv3622[yyj3622] + yyv3623.CodecDecodeSelf(d) } } - if yyrt3573 { - for ; yyj3573 < yyl3573; yyj3573++ { - yyv3573 = append(yyv3573, EndpointSubset{}) - yyh3573.ElemContainerState(yyj3573) + if yyrt3622 { + for ; yyj3622 < yyl3622; yyj3622++ { + yyv3622 = append(yyv3622, EndpointSubset{}) + yyh3622.ElemContainerState(yyj3622) if r.TryDecodeAsNil() { - yyv3573[yyj3573] = EndpointSubset{} + yyv3622[yyj3622] = EndpointSubset{} } else { - yyv3575 := &yyv3573[yyj3573] - yyv3575.CodecDecodeSelf(d) + yyv3624 := &yyv3622[yyj3622] + yyv3624.CodecDecodeSelf(d) } } } } else { - yyj3573 := 0 - for ; !r.CheckBreak(); yyj3573++ { + yyj3622 := 0 + for ; !r.CheckBreak(); yyj3622++ { - if yyj3573 >= len(yyv3573) { - yyv3573 = append(yyv3573, EndpointSubset{}) // var yyz3573 EndpointSubset - yyc3573 = true + if yyj3622 >= len(yyv3622) { + yyv3622 = append(yyv3622, EndpointSubset{}) // var yyz3622 EndpointSubset + yyc3622 = true } - yyh3573.ElemContainerState(yyj3573) - if yyj3573 < len(yyv3573) { + yyh3622.ElemContainerState(yyj3622) + if yyj3622 < len(yyv3622) { if r.TryDecodeAsNil() { - yyv3573[yyj3573] = EndpointSubset{} + yyv3622[yyj3622] = EndpointSubset{} } else { - yyv3576 := &yyv3573[yyj3573] - yyv3576.CodecDecodeSelf(d) + yyv3625 := &yyv3622[yyj3622] + yyv3625.CodecDecodeSelf(d) } } else { @@ -45139,17 +45643,17 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 } } - if yyj3573 < len(yyv3573) { - yyv3573 = yyv3573[:yyj3573] - yyc3573 = true - } else if yyj3573 == 0 && yyv3573 == nil { - yyv3573 = []EndpointSubset{} - yyc3573 = true + if yyj3622 < len(yyv3622) { + yyv3622 = yyv3622[:yyj3622] + yyc3622 = true + } else if yyj3622 == 0 && yyv3622 == nil { + yyv3622 = []EndpointSubset{} + yyc3622 = true } } - yyh3573.End() - if yyc3573 { - *v = yyv3573 + yyh3622.End() + if yyc3622 { + *v = yyv3622 } } @@ -45158,10 +45662,10 @@ func (x codecSelfer1234) encSliceEndpointAddress(v []EndpointAddress, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3577 := range v { + for _, yyv3626 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3578 := &yyv3577 - yy3578.CodecEncodeSelf(e) + yy3627 := &yyv3626 + yy3627.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45171,83 +45675,83 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3579 := *v - yyh3579, yyl3579 := z.DecSliceHelperStart() - var yyc3579 bool - if yyl3579 == 0 { - if yyv3579 == nil { - yyv3579 = []EndpointAddress{} - yyc3579 = true - } else if len(yyv3579) != 0 { - yyv3579 = yyv3579[:0] - yyc3579 = true + yyv3628 := *v + yyh3628, yyl3628 := z.DecSliceHelperStart() + var yyc3628 bool + if yyl3628 == 0 { + if yyv3628 == nil { + yyv3628 = []EndpointAddress{} + yyc3628 = true + } else if len(yyv3628) != 0 { + yyv3628 = yyv3628[:0] + yyc3628 = true } - } else if yyl3579 > 0 { - var yyrr3579, yyrl3579 int - var yyrt3579 bool - if yyl3579 > cap(yyv3579) { + } else if yyl3628 > 0 { + var yyrr3628, yyrl3628 int + var yyrt3628 bool + if yyl3628 > cap(yyv3628) { - yyrg3579 := len(yyv3579) > 0 - yyv23579 := yyv3579 - yyrl3579, yyrt3579 = z.DecInferLen(yyl3579, z.DecBasicHandle().MaxInitLen, 24) - if yyrt3579 { - if yyrl3579 <= cap(yyv3579) { - yyv3579 = yyv3579[:yyrl3579] + yyrg3628 := len(yyv3628) > 0 + yyv23628 := yyv3628 + yyrl3628, yyrt3628 = z.DecInferLen(yyl3628, z.DecBasicHandle().MaxInitLen, 24) + if yyrt3628 { + if yyrl3628 <= cap(yyv3628) { + yyv3628 = yyv3628[:yyrl3628] } else { - yyv3579 = make([]EndpointAddress, yyrl3579) + yyv3628 = make([]EndpointAddress, yyrl3628) } } else { - yyv3579 = make([]EndpointAddress, yyrl3579) + yyv3628 = make([]EndpointAddress, yyrl3628) } - yyc3579 = true - yyrr3579 = len(yyv3579) - if yyrg3579 { - copy(yyv3579, yyv23579) + yyc3628 = true + yyrr3628 = len(yyv3628) + if yyrg3628 { + copy(yyv3628, yyv23628) } - } else if yyl3579 != len(yyv3579) { - yyv3579 = yyv3579[:yyl3579] - yyc3579 = true + } else if yyl3628 != len(yyv3628) { + yyv3628 = yyv3628[:yyl3628] + yyc3628 = true } - yyj3579 := 0 - for ; yyj3579 < yyrr3579; yyj3579++ { - yyh3579.ElemContainerState(yyj3579) + yyj3628 := 0 + for ; yyj3628 < yyrr3628; yyj3628++ { + yyh3628.ElemContainerState(yyj3628) if r.TryDecodeAsNil() { - yyv3579[yyj3579] = EndpointAddress{} + yyv3628[yyj3628] = EndpointAddress{} } else { - yyv3580 := &yyv3579[yyj3579] - yyv3580.CodecDecodeSelf(d) + yyv3629 := &yyv3628[yyj3628] + yyv3629.CodecDecodeSelf(d) } } - if yyrt3579 { - for ; yyj3579 < yyl3579; yyj3579++ { - yyv3579 = append(yyv3579, EndpointAddress{}) - yyh3579.ElemContainerState(yyj3579) + if yyrt3628 { + for ; yyj3628 < yyl3628; yyj3628++ { + yyv3628 = append(yyv3628, EndpointAddress{}) + yyh3628.ElemContainerState(yyj3628) if r.TryDecodeAsNil() { - yyv3579[yyj3579] = EndpointAddress{} + yyv3628[yyj3628] = EndpointAddress{} } else { - yyv3581 := &yyv3579[yyj3579] - yyv3581.CodecDecodeSelf(d) + yyv3630 := &yyv3628[yyj3628] + yyv3630.CodecDecodeSelf(d) } } } } else { - yyj3579 := 0 - for ; !r.CheckBreak(); yyj3579++ { + yyj3628 := 0 + for ; !r.CheckBreak(); yyj3628++ { - if yyj3579 >= len(yyv3579) { - yyv3579 = append(yyv3579, EndpointAddress{}) // var yyz3579 EndpointAddress - yyc3579 = true + if yyj3628 >= len(yyv3628) { + yyv3628 = append(yyv3628, EndpointAddress{}) // var yyz3628 EndpointAddress + yyc3628 = true } - yyh3579.ElemContainerState(yyj3579) - if yyj3579 < len(yyv3579) { + yyh3628.ElemContainerState(yyj3628) + if yyj3628 < len(yyv3628) { if r.TryDecodeAsNil() { - yyv3579[yyj3579] = EndpointAddress{} + yyv3628[yyj3628] = EndpointAddress{} } else { - yyv3582 := &yyv3579[yyj3579] - yyv3582.CodecDecodeSelf(d) + yyv3631 := &yyv3628[yyj3628] + yyv3631.CodecDecodeSelf(d) } } else { @@ -45255,17 +45759,17 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 } } - if yyj3579 < len(yyv3579) { - yyv3579 = yyv3579[:yyj3579] - yyc3579 = true - } else if yyj3579 == 0 && yyv3579 == nil { - yyv3579 = []EndpointAddress{} - yyc3579 = true + if yyj3628 < len(yyv3628) { + yyv3628 = yyv3628[:yyj3628] + yyc3628 = true + } else if yyj3628 == 0 && yyv3628 == nil { + yyv3628 = []EndpointAddress{} + yyc3628 = true } } - yyh3579.End() - if yyc3579 { - *v = yyv3579 + yyh3628.End() + if yyc3628 { + *v = yyv3628 } } @@ -45274,10 +45778,10 @@ func (x codecSelfer1234) encSliceEndpointPort(v []EndpointPort, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3583 := range v { + for _, yyv3632 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3584 := &yyv3583 - yy3584.CodecEncodeSelf(e) + yy3633 := &yyv3632 + yy3633.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45287,83 +45791,83 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3585 := *v - yyh3585, yyl3585 := z.DecSliceHelperStart() - var yyc3585 bool - if yyl3585 == 0 { - if yyv3585 == nil { - yyv3585 = []EndpointPort{} - yyc3585 = true - } else if len(yyv3585) != 0 { - yyv3585 = yyv3585[:0] - yyc3585 = true + yyv3634 := *v + yyh3634, yyl3634 := z.DecSliceHelperStart() + var yyc3634 bool + if yyl3634 == 0 { + if yyv3634 == nil { + yyv3634 = []EndpointPort{} + yyc3634 = true + } else if len(yyv3634) != 0 { + yyv3634 = yyv3634[:0] + yyc3634 = true } - } else if yyl3585 > 0 { - var yyrr3585, yyrl3585 int - var yyrt3585 bool - if yyl3585 > cap(yyv3585) { + } else if yyl3634 > 0 { + var yyrr3634, yyrl3634 int + var yyrt3634 bool + if yyl3634 > cap(yyv3634) { - yyrg3585 := len(yyv3585) > 0 - yyv23585 := yyv3585 - yyrl3585, yyrt3585 = z.DecInferLen(yyl3585, z.DecBasicHandle().MaxInitLen, 40) - if yyrt3585 { - if yyrl3585 <= cap(yyv3585) { - yyv3585 = yyv3585[:yyrl3585] + yyrg3634 := len(yyv3634) > 0 + yyv23634 := yyv3634 + yyrl3634, yyrt3634 = z.DecInferLen(yyl3634, z.DecBasicHandle().MaxInitLen, 40) + if yyrt3634 { + if yyrl3634 <= cap(yyv3634) { + yyv3634 = yyv3634[:yyrl3634] } else { - yyv3585 = make([]EndpointPort, yyrl3585) + yyv3634 = make([]EndpointPort, yyrl3634) } } else { - yyv3585 = make([]EndpointPort, yyrl3585) + yyv3634 = make([]EndpointPort, yyrl3634) } - yyc3585 = true - yyrr3585 = len(yyv3585) - if yyrg3585 { - copy(yyv3585, yyv23585) + yyc3634 = true + yyrr3634 = len(yyv3634) + if yyrg3634 { + copy(yyv3634, yyv23634) } - } else if yyl3585 != len(yyv3585) { - yyv3585 = yyv3585[:yyl3585] - yyc3585 = true + } else if yyl3634 != len(yyv3634) { + yyv3634 = yyv3634[:yyl3634] + yyc3634 = true } - yyj3585 := 0 - for ; yyj3585 < yyrr3585; yyj3585++ { - yyh3585.ElemContainerState(yyj3585) + yyj3634 := 0 + for ; yyj3634 < yyrr3634; yyj3634++ { + yyh3634.ElemContainerState(yyj3634) if r.TryDecodeAsNil() { - yyv3585[yyj3585] = EndpointPort{} + yyv3634[yyj3634] = EndpointPort{} } else { - yyv3586 := &yyv3585[yyj3585] - yyv3586.CodecDecodeSelf(d) + yyv3635 := &yyv3634[yyj3634] + yyv3635.CodecDecodeSelf(d) } } - if yyrt3585 { - for ; yyj3585 < yyl3585; yyj3585++ { - yyv3585 = append(yyv3585, EndpointPort{}) - yyh3585.ElemContainerState(yyj3585) + if yyrt3634 { + for ; yyj3634 < yyl3634; yyj3634++ { + yyv3634 = append(yyv3634, EndpointPort{}) + yyh3634.ElemContainerState(yyj3634) if r.TryDecodeAsNil() { - yyv3585[yyj3585] = EndpointPort{} + yyv3634[yyj3634] = EndpointPort{} } else { - yyv3587 := &yyv3585[yyj3585] - yyv3587.CodecDecodeSelf(d) + yyv3636 := &yyv3634[yyj3634] + yyv3636.CodecDecodeSelf(d) } } } } else { - yyj3585 := 0 - for ; !r.CheckBreak(); yyj3585++ { + yyj3634 := 0 + for ; !r.CheckBreak(); yyj3634++ { - if yyj3585 >= len(yyv3585) { - yyv3585 = append(yyv3585, EndpointPort{}) // var yyz3585 EndpointPort - yyc3585 = true + if yyj3634 >= len(yyv3634) { + yyv3634 = append(yyv3634, EndpointPort{}) // var yyz3634 EndpointPort + yyc3634 = true } - yyh3585.ElemContainerState(yyj3585) - if yyj3585 < len(yyv3585) { + yyh3634.ElemContainerState(yyj3634) + if yyj3634 < len(yyv3634) { if r.TryDecodeAsNil() { - yyv3585[yyj3585] = EndpointPort{} + yyv3634[yyj3634] = EndpointPort{} } else { - yyv3588 := &yyv3585[yyj3585] - yyv3588.CodecDecodeSelf(d) + yyv3637 := &yyv3634[yyj3634] + yyv3637.CodecDecodeSelf(d) } } else { @@ -45371,17 +45875,17 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De } } - if yyj3585 < len(yyv3585) { - yyv3585 = yyv3585[:yyj3585] - yyc3585 = true - } else if yyj3585 == 0 && yyv3585 == nil { - yyv3585 = []EndpointPort{} - yyc3585 = true + if yyj3634 < len(yyv3634) { + yyv3634 = yyv3634[:yyj3634] + yyc3634 = true + } else if yyj3634 == 0 && yyv3634 == nil { + yyv3634 = []EndpointPort{} + yyc3634 = true } } - yyh3585.End() - if yyc3585 { - *v = yyv3585 + yyh3634.End() + if yyc3634 { + *v = yyv3634 } } @@ -45390,10 +45894,10 @@ func (x codecSelfer1234) encSliceEndpoints(v []Endpoints, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3589 := range v { + for _, yyv3638 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3590 := &yyv3589 - yy3590.CodecEncodeSelf(e) + yy3639 := &yyv3638 + yy3639.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45403,83 +45907,83 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3591 := *v - yyh3591, yyl3591 := z.DecSliceHelperStart() - var yyc3591 bool - if yyl3591 == 0 { - if yyv3591 == nil { - yyv3591 = []Endpoints{} - yyc3591 = true - } else if len(yyv3591) != 0 { - yyv3591 = yyv3591[:0] - yyc3591 = true + yyv3640 := *v + yyh3640, yyl3640 := z.DecSliceHelperStart() + var yyc3640 bool + if yyl3640 == 0 { + if yyv3640 == nil { + yyv3640 = []Endpoints{} + yyc3640 = true + } else if len(yyv3640) != 0 { + yyv3640 = yyv3640[:0] + yyc3640 = true } - } else if yyl3591 > 0 { - var yyrr3591, yyrl3591 int - var yyrt3591 bool - if yyl3591 > cap(yyv3591) { + } else if yyl3640 > 0 { + var yyrr3640, yyrl3640 int + var yyrt3640 bool + if yyl3640 > cap(yyv3640) { - yyrg3591 := len(yyv3591) > 0 - yyv23591 := yyv3591 - yyrl3591, yyrt3591 = z.DecInferLen(yyl3591, z.DecBasicHandle().MaxInitLen, 216) - if yyrt3591 { - if yyrl3591 <= cap(yyv3591) { - yyv3591 = yyv3591[:yyrl3591] + yyrg3640 := len(yyv3640) > 0 + yyv23640 := yyv3640 + yyrl3640, yyrt3640 = z.DecInferLen(yyl3640, z.DecBasicHandle().MaxInitLen, 216) + if yyrt3640 { + if yyrl3640 <= cap(yyv3640) { + yyv3640 = yyv3640[:yyrl3640] } else { - yyv3591 = make([]Endpoints, yyrl3591) + yyv3640 = make([]Endpoints, yyrl3640) } } else { - yyv3591 = make([]Endpoints, yyrl3591) + yyv3640 = make([]Endpoints, yyrl3640) } - yyc3591 = true - yyrr3591 = len(yyv3591) - if yyrg3591 { - copy(yyv3591, yyv23591) + yyc3640 = true + yyrr3640 = len(yyv3640) + if yyrg3640 { + copy(yyv3640, yyv23640) } - } else if yyl3591 != len(yyv3591) { - yyv3591 = yyv3591[:yyl3591] - yyc3591 = true + } else if yyl3640 != len(yyv3640) { + yyv3640 = yyv3640[:yyl3640] + yyc3640 = true } - yyj3591 := 0 - for ; yyj3591 < yyrr3591; yyj3591++ { - yyh3591.ElemContainerState(yyj3591) + yyj3640 := 0 + for ; yyj3640 < yyrr3640; yyj3640++ { + yyh3640.ElemContainerState(yyj3640) if r.TryDecodeAsNil() { - yyv3591[yyj3591] = Endpoints{} + yyv3640[yyj3640] = Endpoints{} } else { - yyv3592 := &yyv3591[yyj3591] - yyv3592.CodecDecodeSelf(d) + yyv3641 := &yyv3640[yyj3640] + yyv3641.CodecDecodeSelf(d) } } - if yyrt3591 { - for ; yyj3591 < yyl3591; yyj3591++ { - yyv3591 = append(yyv3591, Endpoints{}) - yyh3591.ElemContainerState(yyj3591) + if yyrt3640 { + for ; yyj3640 < yyl3640; yyj3640++ { + yyv3640 = append(yyv3640, Endpoints{}) + yyh3640.ElemContainerState(yyj3640) if r.TryDecodeAsNil() { - yyv3591[yyj3591] = Endpoints{} + yyv3640[yyj3640] = Endpoints{} } else { - yyv3593 := &yyv3591[yyj3591] - yyv3593.CodecDecodeSelf(d) + yyv3642 := &yyv3640[yyj3640] + yyv3642.CodecDecodeSelf(d) } } } } else { - yyj3591 := 0 - for ; !r.CheckBreak(); yyj3591++ { + yyj3640 := 0 + for ; !r.CheckBreak(); yyj3640++ { - if yyj3591 >= len(yyv3591) { - yyv3591 = append(yyv3591, Endpoints{}) // var yyz3591 Endpoints - yyc3591 = true + if yyj3640 >= len(yyv3640) { + yyv3640 = append(yyv3640, Endpoints{}) // var yyz3640 Endpoints + yyc3640 = true } - yyh3591.ElemContainerState(yyj3591) - if yyj3591 < len(yyv3591) { + yyh3640.ElemContainerState(yyj3640) + if yyj3640 < len(yyv3640) { if r.TryDecodeAsNil() { - yyv3591[yyj3591] = Endpoints{} + yyv3640[yyj3640] = Endpoints{} } else { - yyv3594 := &yyv3591[yyj3591] - yyv3594.CodecDecodeSelf(d) + yyv3643 := &yyv3640[yyj3640] + yyv3643.CodecDecodeSelf(d) } } else { @@ -45487,17 +45991,17 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) } } - if yyj3591 < len(yyv3591) { - yyv3591 = yyv3591[:yyj3591] - yyc3591 = true - } else if yyj3591 == 0 && yyv3591 == nil { - yyv3591 = []Endpoints{} - yyc3591 = true + if yyj3640 < len(yyv3640) { + yyv3640 = yyv3640[:yyj3640] + yyc3640 = true + } else if yyj3640 == 0 && yyv3640 == nil { + yyv3640 = []Endpoints{} + yyc3640 = true } } - yyh3591.End() - if yyc3591 { - *v = yyv3591 + yyh3640.End() + if yyc3640 { + *v = yyv3640 } } @@ -45506,10 +46010,10 @@ func (x codecSelfer1234) encSliceNodeCondition(v []NodeCondition, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3595 := range v { + for _, yyv3644 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3596 := &yyv3595 - yy3596.CodecEncodeSelf(e) + yy3645 := &yyv3644 + yy3645.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45519,83 +46023,83 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3597 := *v - yyh3597, yyl3597 := z.DecSliceHelperStart() - var yyc3597 bool - if yyl3597 == 0 { - if yyv3597 == nil { - yyv3597 = []NodeCondition{} - yyc3597 = true - } else if len(yyv3597) != 0 { - yyv3597 = yyv3597[:0] - yyc3597 = true + yyv3646 := *v + yyh3646, yyl3646 := z.DecSliceHelperStart() + var yyc3646 bool + if yyl3646 == 0 { + if yyv3646 == nil { + yyv3646 = []NodeCondition{} + yyc3646 = true + } else if len(yyv3646) != 0 { + yyv3646 = yyv3646[:0] + yyc3646 = true } - } else if yyl3597 > 0 { - var yyrr3597, yyrl3597 int - var yyrt3597 bool - if yyl3597 > cap(yyv3597) { + } else if yyl3646 > 0 { + var yyrr3646, yyrl3646 int + var yyrt3646 bool + if yyl3646 > cap(yyv3646) { - yyrg3597 := len(yyv3597) > 0 - yyv23597 := yyv3597 - yyrl3597, yyrt3597 = z.DecInferLen(yyl3597, z.DecBasicHandle().MaxInitLen, 112) - if yyrt3597 { - if yyrl3597 <= cap(yyv3597) { - yyv3597 = yyv3597[:yyrl3597] + yyrg3646 := len(yyv3646) > 0 + yyv23646 := yyv3646 + yyrl3646, yyrt3646 = z.DecInferLen(yyl3646, z.DecBasicHandle().MaxInitLen, 112) + if yyrt3646 { + if yyrl3646 <= cap(yyv3646) { + yyv3646 = yyv3646[:yyrl3646] } else { - yyv3597 = make([]NodeCondition, yyrl3597) + yyv3646 = make([]NodeCondition, yyrl3646) } } else { - yyv3597 = make([]NodeCondition, yyrl3597) + yyv3646 = make([]NodeCondition, yyrl3646) } - yyc3597 = true - yyrr3597 = len(yyv3597) - if yyrg3597 { - copy(yyv3597, yyv23597) + yyc3646 = true + yyrr3646 = len(yyv3646) + if yyrg3646 { + copy(yyv3646, yyv23646) } - } else if yyl3597 != len(yyv3597) { - yyv3597 = yyv3597[:yyl3597] - yyc3597 = true + } else if yyl3646 != len(yyv3646) { + yyv3646 = yyv3646[:yyl3646] + yyc3646 = true } - yyj3597 := 0 - for ; yyj3597 < yyrr3597; yyj3597++ { - yyh3597.ElemContainerState(yyj3597) + yyj3646 := 0 + for ; yyj3646 < yyrr3646; yyj3646++ { + yyh3646.ElemContainerState(yyj3646) if r.TryDecodeAsNil() { - yyv3597[yyj3597] = NodeCondition{} + yyv3646[yyj3646] = NodeCondition{} } else { - yyv3598 := &yyv3597[yyj3597] - yyv3598.CodecDecodeSelf(d) + yyv3647 := &yyv3646[yyj3646] + yyv3647.CodecDecodeSelf(d) } } - if yyrt3597 { - for ; yyj3597 < yyl3597; yyj3597++ { - yyv3597 = append(yyv3597, NodeCondition{}) - yyh3597.ElemContainerState(yyj3597) + if yyrt3646 { + for ; yyj3646 < yyl3646; yyj3646++ { + yyv3646 = append(yyv3646, NodeCondition{}) + yyh3646.ElemContainerState(yyj3646) if r.TryDecodeAsNil() { - yyv3597[yyj3597] = NodeCondition{} + yyv3646[yyj3646] = NodeCondition{} } else { - yyv3599 := &yyv3597[yyj3597] - yyv3599.CodecDecodeSelf(d) + yyv3648 := &yyv3646[yyj3646] + yyv3648.CodecDecodeSelf(d) } } } } else { - yyj3597 := 0 - for ; !r.CheckBreak(); yyj3597++ { + yyj3646 := 0 + for ; !r.CheckBreak(); yyj3646++ { - if yyj3597 >= len(yyv3597) { - yyv3597 = append(yyv3597, NodeCondition{}) // var yyz3597 NodeCondition - yyc3597 = true + if yyj3646 >= len(yyv3646) { + yyv3646 = append(yyv3646, NodeCondition{}) // var yyz3646 NodeCondition + yyc3646 = true } - yyh3597.ElemContainerState(yyj3597) - if yyj3597 < len(yyv3597) { + yyh3646.ElemContainerState(yyj3646) + if yyj3646 < len(yyv3646) { if r.TryDecodeAsNil() { - yyv3597[yyj3597] = NodeCondition{} + yyv3646[yyj3646] = NodeCondition{} } else { - yyv3600 := &yyv3597[yyj3597] - yyv3600.CodecDecodeSelf(d) + yyv3649 := &yyv3646[yyj3646] + yyv3649.CodecDecodeSelf(d) } } else { @@ -45603,17 +46107,17 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. } } - if yyj3597 < len(yyv3597) { - yyv3597 = yyv3597[:yyj3597] - yyc3597 = true - } else if yyj3597 == 0 && yyv3597 == nil { - yyv3597 = []NodeCondition{} - yyc3597 = true + if yyj3646 < len(yyv3646) { + yyv3646 = yyv3646[:yyj3646] + yyc3646 = true + } else if yyj3646 == 0 && yyv3646 == nil { + yyv3646 = []NodeCondition{} + yyc3646 = true } } - yyh3597.End() - if yyc3597 { - *v = yyv3597 + yyh3646.End() + if yyc3646 { + *v = yyv3646 } } @@ -45622,10 +46126,10 @@ func (x codecSelfer1234) encSliceNodeAddress(v []NodeAddress, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3601 := range v { + for _, yyv3650 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3602 := &yyv3601 - yy3602.CodecEncodeSelf(e) + yy3651 := &yyv3650 + yy3651.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45635,83 +46139,83 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3603 := *v - yyh3603, yyl3603 := z.DecSliceHelperStart() - var yyc3603 bool - if yyl3603 == 0 { - if yyv3603 == nil { - yyv3603 = []NodeAddress{} - yyc3603 = true - } else if len(yyv3603) != 0 { - yyv3603 = yyv3603[:0] - yyc3603 = true + yyv3652 := *v + yyh3652, yyl3652 := z.DecSliceHelperStart() + var yyc3652 bool + if yyl3652 == 0 { + if yyv3652 == nil { + yyv3652 = []NodeAddress{} + yyc3652 = true + } else if len(yyv3652) != 0 { + yyv3652 = yyv3652[:0] + yyc3652 = true } - } else if yyl3603 > 0 { - var yyrr3603, yyrl3603 int - var yyrt3603 bool - if yyl3603 > cap(yyv3603) { + } else if yyl3652 > 0 { + var yyrr3652, yyrl3652 int + var yyrt3652 bool + if yyl3652 > cap(yyv3652) { - yyrg3603 := len(yyv3603) > 0 - yyv23603 := yyv3603 - yyrl3603, yyrt3603 = z.DecInferLen(yyl3603, z.DecBasicHandle().MaxInitLen, 32) - if yyrt3603 { - if yyrl3603 <= cap(yyv3603) { - yyv3603 = yyv3603[:yyrl3603] + yyrg3652 := len(yyv3652) > 0 + yyv23652 := yyv3652 + yyrl3652, yyrt3652 = z.DecInferLen(yyl3652, z.DecBasicHandle().MaxInitLen, 32) + if yyrt3652 { + if yyrl3652 <= cap(yyv3652) { + yyv3652 = yyv3652[:yyrl3652] } else { - yyv3603 = make([]NodeAddress, yyrl3603) + yyv3652 = make([]NodeAddress, yyrl3652) } } else { - yyv3603 = make([]NodeAddress, yyrl3603) + yyv3652 = make([]NodeAddress, yyrl3652) } - yyc3603 = true - yyrr3603 = len(yyv3603) - if yyrg3603 { - copy(yyv3603, yyv23603) + yyc3652 = true + yyrr3652 = len(yyv3652) + if yyrg3652 { + copy(yyv3652, yyv23652) } - } else if yyl3603 != len(yyv3603) { - yyv3603 = yyv3603[:yyl3603] - yyc3603 = true + } else if yyl3652 != len(yyv3652) { + yyv3652 = yyv3652[:yyl3652] + yyc3652 = true } - yyj3603 := 0 - for ; yyj3603 < yyrr3603; yyj3603++ { - yyh3603.ElemContainerState(yyj3603) + yyj3652 := 0 + for ; yyj3652 < yyrr3652; yyj3652++ { + yyh3652.ElemContainerState(yyj3652) if r.TryDecodeAsNil() { - yyv3603[yyj3603] = NodeAddress{} + yyv3652[yyj3652] = NodeAddress{} } else { - yyv3604 := &yyv3603[yyj3603] - yyv3604.CodecDecodeSelf(d) + yyv3653 := &yyv3652[yyj3652] + yyv3653.CodecDecodeSelf(d) } } - if yyrt3603 { - for ; yyj3603 < yyl3603; yyj3603++ { - yyv3603 = append(yyv3603, NodeAddress{}) - yyh3603.ElemContainerState(yyj3603) + if yyrt3652 { + for ; yyj3652 < yyl3652; yyj3652++ { + yyv3652 = append(yyv3652, NodeAddress{}) + yyh3652.ElemContainerState(yyj3652) if r.TryDecodeAsNil() { - yyv3603[yyj3603] = NodeAddress{} + yyv3652[yyj3652] = NodeAddress{} } else { - yyv3605 := &yyv3603[yyj3603] - yyv3605.CodecDecodeSelf(d) + yyv3654 := &yyv3652[yyj3652] + yyv3654.CodecDecodeSelf(d) } } } } else { - yyj3603 := 0 - for ; !r.CheckBreak(); yyj3603++ { + yyj3652 := 0 + for ; !r.CheckBreak(); yyj3652++ { - if yyj3603 >= len(yyv3603) { - yyv3603 = append(yyv3603, NodeAddress{}) // var yyz3603 NodeAddress - yyc3603 = true + if yyj3652 >= len(yyv3652) { + yyv3652 = append(yyv3652, NodeAddress{}) // var yyz3652 NodeAddress + yyc3652 = true } - yyh3603.ElemContainerState(yyj3603) - if yyj3603 < len(yyv3603) { + yyh3652.ElemContainerState(yyj3652) + if yyj3652 < len(yyv3652) { if r.TryDecodeAsNil() { - yyv3603[yyj3603] = NodeAddress{} + yyv3652[yyj3652] = NodeAddress{} } else { - yyv3606 := &yyv3603[yyj3603] - yyv3606.CodecDecodeSelf(d) + yyv3655 := &yyv3652[yyj3652] + yyv3655.CodecDecodeSelf(d) } } else { @@ -45719,17 +46223,17 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco } } - if yyj3603 < len(yyv3603) { - yyv3603 = yyv3603[:yyj3603] - yyc3603 = true - } else if yyj3603 == 0 && yyv3603 == nil { - yyv3603 = []NodeAddress{} - yyc3603 = true + if yyj3652 < len(yyv3652) { + yyv3652 = yyv3652[:yyj3652] + yyc3652 = true + } else if yyj3652 == 0 && yyv3652 == nil { + yyv3652 = []NodeAddress{} + yyc3652 = true } } - yyh3603.End() - if yyc3603 { - *v = yyv3603 + yyh3652.End() + if yyc3652 { + *v = yyv3652 } } @@ -45738,19 +46242,19 @@ func (x codecSelfer1234) encResourceList(v ResourceList, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk3607, yyv3607 := range v { + for yyk3656, yyv3656 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yyk3607.CodecEncodeSelf(e) + yyk3656.CodecEncodeSelf(e) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3608 := &yyv3607 - yym3609 := z.EncBinary() - _ = yym3609 + yy3657 := &yyv3656 + yym3658 := z.EncBinary() + _ = yym3658 if false { - } else if z.HasExtensions() && z.EncExt(yy3608) { - } else if !yym3609 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3608) + } else if z.HasExtensions() && z.EncExt(yy3657) { + } else if !yym3658 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3657) } else { - z.EncFallback(yy3608) + z.EncFallback(yy3657) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -45761,86 +46265,86 @@ func (x codecSelfer1234) decResourceList(v *ResourceList, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3610 := *v - yyl3610 := r.ReadMapStart() - yybh3610 := z.DecBasicHandle() - if yyv3610 == nil { - yyrl3610, _ := z.DecInferLen(yyl3610, yybh3610.MaxInitLen, 40) - yyv3610 = make(map[ResourceName]pkg3_resource.Quantity, yyrl3610) - *v = yyv3610 + yyv3659 := *v + yyl3659 := r.ReadMapStart() + yybh3659 := z.DecBasicHandle() + if yyv3659 == nil { + yyrl3659, _ := z.DecInferLen(yyl3659, yybh3659.MaxInitLen, 40) + yyv3659 = make(map[ResourceName]pkg3_resource.Quantity, yyrl3659) + *v = yyv3659 } - var yymk3610 ResourceName - var yymv3610 pkg3_resource.Quantity - var yymg3610 bool - if yybh3610.MapValueReset { - yymg3610 = true + var yymk3659 ResourceName + var yymv3659 pkg3_resource.Quantity + var yymg3659 bool + if yybh3659.MapValueReset { + yymg3659 = true } - if yyl3610 > 0 { - for yyj3610 := 0; yyj3610 < yyl3610; yyj3610++ { + if yyl3659 > 0 { + for yyj3659 := 0; yyj3659 < yyl3659; yyj3659++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk3610 = "" + yymk3659 = "" } else { - yymk3610 = ResourceName(r.DecodeString()) + yymk3659 = ResourceName(r.DecodeString()) } - if yymg3610 { - yymv3610 = yyv3610[yymk3610] + if yymg3659 { + yymv3659 = yyv3659[yymk3659] } else { - yymv3610 = pkg3_resource.Quantity{} + yymv3659 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv3610 = pkg3_resource.Quantity{} + yymv3659 = pkg3_resource.Quantity{} } else { - yyv3612 := &yymv3610 - yym3613 := z.DecBinary() - _ = yym3613 + yyv3661 := &yymv3659 + yym3662 := z.DecBinary() + _ = yym3662 if false { - } else if z.HasExtensions() && z.DecExt(yyv3612) { - } else if !yym3613 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3612) + } else if z.HasExtensions() && z.DecExt(yyv3661) { + } else if !yym3662 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3661) } else { - z.DecFallback(yyv3612, false) + z.DecFallback(yyv3661, false) } } - if yyv3610 != nil { - yyv3610[yymk3610] = yymv3610 + if yyv3659 != nil { + yyv3659[yymk3659] = yymv3659 } } - } else if yyl3610 < 0 { - for yyj3610 := 0; !r.CheckBreak(); yyj3610++ { + } else if yyl3659 < 0 { + for yyj3659 := 0; !r.CheckBreak(); yyj3659++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk3610 = "" + yymk3659 = "" } else { - yymk3610 = ResourceName(r.DecodeString()) + yymk3659 = ResourceName(r.DecodeString()) } - if yymg3610 { - yymv3610 = yyv3610[yymk3610] + if yymg3659 { + yymv3659 = yyv3659[yymk3659] } else { - yymv3610 = pkg3_resource.Quantity{} + yymv3659 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv3610 = pkg3_resource.Quantity{} + yymv3659 = pkg3_resource.Quantity{} } else { - yyv3615 := &yymv3610 - yym3616 := z.DecBinary() - _ = yym3616 + yyv3664 := &yymv3659 + yym3665 := z.DecBinary() + _ = yym3665 if false { - } else if z.HasExtensions() && z.DecExt(yyv3615) { - } else if !yym3616 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3615) + } else if z.HasExtensions() && z.DecExt(yyv3664) { + } else if !yym3665 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3664) } else { - z.DecFallback(yyv3615, false) + z.DecFallback(yyv3664, false) } } - if yyv3610 != nil { - yyv3610[yymk3610] = yymv3610 + if yyv3659 != nil { + yyv3659[yymk3659] = yymv3659 } } } // else len==0: TODO: Should we clear map entries? @@ -45852,10 +46356,10 @@ func (x codecSelfer1234) encSliceNode(v []Node, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3617 := range v { + for _, yyv3666 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3618 := &yyv3617 - yy3618.CodecEncodeSelf(e) + yy3667 := &yyv3666 + yy3667.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45865,83 +46369,83 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3619 := *v - yyh3619, yyl3619 := z.DecSliceHelperStart() - var yyc3619 bool - if yyl3619 == 0 { - if yyv3619 == nil { - yyv3619 = []Node{} - yyc3619 = true - } else if len(yyv3619) != 0 { - yyv3619 = yyv3619[:0] - yyc3619 = true + yyv3668 := *v + yyh3668, yyl3668 := z.DecSliceHelperStart() + var yyc3668 bool + if yyl3668 == 0 { + if yyv3668 == nil { + yyv3668 = []Node{} + yyc3668 = true + } else if len(yyv3668) != 0 { + yyv3668 = yyv3668[:0] + yyc3668 = true } - } else if yyl3619 > 0 { - var yyrr3619, yyrl3619 int - var yyrt3619 bool - if yyl3619 > cap(yyv3619) { + } else if yyl3668 > 0 { + var yyrr3668, yyrl3668 int + var yyrt3668 bool + if yyl3668 > cap(yyv3668) { - yyrg3619 := len(yyv3619) > 0 - yyv23619 := yyv3619 - yyrl3619, yyrt3619 = z.DecInferLen(yyl3619, z.DecBasicHandle().MaxInitLen, 456) - if yyrt3619 { - if yyrl3619 <= cap(yyv3619) { - yyv3619 = yyv3619[:yyrl3619] + yyrg3668 := len(yyv3668) > 0 + yyv23668 := yyv3668 + yyrl3668, yyrt3668 = z.DecInferLen(yyl3668, z.DecBasicHandle().MaxInitLen, 456) + if yyrt3668 { + if yyrl3668 <= cap(yyv3668) { + yyv3668 = yyv3668[:yyrl3668] } else { - yyv3619 = make([]Node, yyrl3619) + yyv3668 = make([]Node, yyrl3668) } } else { - yyv3619 = make([]Node, yyrl3619) + yyv3668 = make([]Node, yyrl3668) } - yyc3619 = true - yyrr3619 = len(yyv3619) - if yyrg3619 { - copy(yyv3619, yyv23619) + yyc3668 = true + yyrr3668 = len(yyv3668) + if yyrg3668 { + copy(yyv3668, yyv23668) } - } else if yyl3619 != len(yyv3619) { - yyv3619 = yyv3619[:yyl3619] - yyc3619 = true + } else if yyl3668 != len(yyv3668) { + yyv3668 = yyv3668[:yyl3668] + yyc3668 = true } - yyj3619 := 0 - for ; yyj3619 < yyrr3619; yyj3619++ { - yyh3619.ElemContainerState(yyj3619) + yyj3668 := 0 + for ; yyj3668 < yyrr3668; yyj3668++ { + yyh3668.ElemContainerState(yyj3668) if r.TryDecodeAsNil() { - yyv3619[yyj3619] = Node{} + yyv3668[yyj3668] = Node{} } else { - yyv3620 := &yyv3619[yyj3619] - yyv3620.CodecDecodeSelf(d) + yyv3669 := &yyv3668[yyj3668] + yyv3669.CodecDecodeSelf(d) } } - if yyrt3619 { - for ; yyj3619 < yyl3619; yyj3619++ { - yyv3619 = append(yyv3619, Node{}) - yyh3619.ElemContainerState(yyj3619) + if yyrt3668 { + for ; yyj3668 < yyl3668; yyj3668++ { + yyv3668 = append(yyv3668, Node{}) + yyh3668.ElemContainerState(yyj3668) if r.TryDecodeAsNil() { - yyv3619[yyj3619] = Node{} + yyv3668[yyj3668] = Node{} } else { - yyv3621 := &yyv3619[yyj3619] - yyv3621.CodecDecodeSelf(d) + yyv3670 := &yyv3668[yyj3668] + yyv3670.CodecDecodeSelf(d) } } } } else { - yyj3619 := 0 - for ; !r.CheckBreak(); yyj3619++ { + yyj3668 := 0 + for ; !r.CheckBreak(); yyj3668++ { - if yyj3619 >= len(yyv3619) { - yyv3619 = append(yyv3619, Node{}) // var yyz3619 Node - yyc3619 = true + if yyj3668 >= len(yyv3668) { + yyv3668 = append(yyv3668, Node{}) // var yyz3668 Node + yyc3668 = true } - yyh3619.ElemContainerState(yyj3619) - if yyj3619 < len(yyv3619) { + yyh3668.ElemContainerState(yyj3668) + if yyj3668 < len(yyv3668) { if r.TryDecodeAsNil() { - yyv3619[yyj3619] = Node{} + yyv3668[yyj3668] = Node{} } else { - yyv3622 := &yyv3619[yyj3619] - yyv3622.CodecDecodeSelf(d) + yyv3671 := &yyv3668[yyj3668] + yyv3671.CodecDecodeSelf(d) } } else { @@ -45949,17 +46453,17 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { } } - if yyj3619 < len(yyv3619) { - yyv3619 = yyv3619[:yyj3619] - yyc3619 = true - } else if yyj3619 == 0 && yyv3619 == nil { - yyv3619 = []Node{} - yyc3619 = true + if yyj3668 < len(yyv3668) { + yyv3668 = yyv3668[:yyj3668] + yyc3668 = true + } else if yyj3668 == 0 && yyv3668 == nil { + yyv3668 = []Node{} + yyc3668 = true } } - yyh3619.End() - if yyc3619 { - *v = yyv3619 + yyh3668.End() + if yyc3668 { + *v = yyv3668 } } @@ -45968,9 +46472,9 @@ func (x codecSelfer1234) encSliceFinalizerName(v []FinalizerName, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv3623 := range v { + for _, yyv3672 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv3623.CodecEncodeSelf(e) + yyv3672.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45980,75 +46484,75 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv3624 := *v - yyh3624, yyl3624 := z.DecSliceHelperStart() - var yyc3624 bool - if yyl3624 == 0 { - if yyv3624 == nil { - yyv3624 = []FinalizerName{} - yyc3624 = true - } else if len(yyv3624) != 0 { - yyv3624 = yyv3624[:0] - yyc3624 = true + yyv3673 := *v + yyh3673, yyl3673 := z.DecSliceHelperStart() + var yyc3673 bool + if yyl3673 == 0 { + if yyv3673 == nil { + yyv3673 = []FinalizerName{} + yyc3673 = true + } else if len(yyv3673) != 0 { + yyv3673 = yyv3673[:0] + yyc3673 = true } - } else if yyl3624 > 0 { - var yyrr3624, yyrl3624 int - var yyrt3624 bool - if yyl3624 > cap(yyv3624) { + } else if yyl3673 > 0 { + var yyrr3673, yyrl3673 int + var yyrt3673 bool + if yyl3673 > cap(yyv3673) { - yyrl3624, yyrt3624 = z.DecInferLen(yyl3624, z.DecBasicHandle().MaxInitLen, 16) - if yyrt3624 { - if yyrl3624 <= cap(yyv3624) { - yyv3624 = yyv3624[:yyrl3624] + yyrl3673, yyrt3673 = z.DecInferLen(yyl3673, z.DecBasicHandle().MaxInitLen, 16) + if yyrt3673 { + if yyrl3673 <= cap(yyv3673) { + yyv3673 = yyv3673[:yyrl3673] } else { - yyv3624 = make([]FinalizerName, yyrl3624) + yyv3673 = make([]FinalizerName, yyrl3673) } } else { - yyv3624 = make([]FinalizerName, yyrl3624) + yyv3673 = make([]FinalizerName, yyrl3673) } - yyc3624 = true - yyrr3624 = len(yyv3624) - } else if yyl3624 != len(yyv3624) { - yyv3624 = yyv3624[:yyl3624] - yyc3624 = true + yyc3673 = true + yyrr3673 = len(yyv3673) + } else if yyl3673 != len(yyv3673) { + yyv3673 = yyv3673[:yyl3673] + yyc3673 = true } - yyj3624 := 0 - for ; yyj3624 < yyrr3624; yyj3624++ { - yyh3624.ElemContainerState(yyj3624) + yyj3673 := 0 + for ; yyj3673 < yyrr3673; yyj3673++ { + yyh3673.ElemContainerState(yyj3673) if r.TryDecodeAsNil() { - yyv3624[yyj3624] = "" + yyv3673[yyj3673] = "" } else { - yyv3624[yyj3624] = FinalizerName(r.DecodeString()) + yyv3673[yyj3673] = FinalizerName(r.DecodeString()) } } - if yyrt3624 { - for ; yyj3624 < yyl3624; yyj3624++ { - yyv3624 = append(yyv3624, "") - yyh3624.ElemContainerState(yyj3624) + if yyrt3673 { + for ; yyj3673 < yyl3673; yyj3673++ { + yyv3673 = append(yyv3673, "") + yyh3673.ElemContainerState(yyj3673) if r.TryDecodeAsNil() { - yyv3624[yyj3624] = "" + yyv3673[yyj3673] = "" } else { - yyv3624[yyj3624] = FinalizerName(r.DecodeString()) + yyv3673[yyj3673] = FinalizerName(r.DecodeString()) } } } } else { - yyj3624 := 0 - for ; !r.CheckBreak(); yyj3624++ { + yyj3673 := 0 + for ; !r.CheckBreak(); yyj3673++ { - if yyj3624 >= len(yyv3624) { - yyv3624 = append(yyv3624, "") // var yyz3624 FinalizerName - yyc3624 = true + if yyj3673 >= len(yyv3673) { + yyv3673 = append(yyv3673, "") // var yyz3673 FinalizerName + yyc3673 = true } - yyh3624.ElemContainerState(yyj3624) - if yyj3624 < len(yyv3624) { + yyh3673.ElemContainerState(yyj3673) + if yyj3673 < len(yyv3673) { if r.TryDecodeAsNil() { - yyv3624[yyj3624] = "" + yyv3673[yyj3673] = "" } else { - yyv3624[yyj3624] = FinalizerName(r.DecodeString()) + yyv3673[yyj3673] = FinalizerName(r.DecodeString()) } } else { @@ -46056,857 +46560,21 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. } } - if yyj3624 < len(yyv3624) { - yyv3624 = yyv3624[:yyj3624] - yyc3624 = true - } else if yyj3624 == 0 && yyv3624 == nil { - yyv3624 = []FinalizerName{} - yyc3624 = true + if yyj3673 < len(yyv3673) { + yyv3673 = yyv3673[:yyj3673] + yyc3673 = true + } else if yyj3673 == 0 && yyv3673 == nil { + yyv3673 = []FinalizerName{} + yyc3673 = true } } - yyh3624.End() - if yyc3624 { - *v = yyv3624 + yyh3673.End() + if yyc3673 { + *v = yyv3673 } } func (x codecSelfer1234) encSliceNamespace(v []Namespace, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3628 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3629 := &yyv3628 - yy3629.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3630 := *v - yyh3630, yyl3630 := z.DecSliceHelperStart() - var yyc3630 bool - if yyl3630 == 0 { - if yyv3630 == nil { - yyv3630 = []Namespace{} - yyc3630 = true - } else if len(yyv3630) != 0 { - yyv3630 = yyv3630[:0] - yyc3630 = true - } - } else if yyl3630 > 0 { - var yyrr3630, yyrl3630 int - var yyrt3630 bool - if yyl3630 > cap(yyv3630) { - - yyrg3630 := len(yyv3630) > 0 - yyv23630 := yyv3630 - yyrl3630, yyrt3630 = z.DecInferLen(yyl3630, z.DecBasicHandle().MaxInitLen, 232) - if yyrt3630 { - if yyrl3630 <= cap(yyv3630) { - yyv3630 = yyv3630[:yyrl3630] - } else { - yyv3630 = make([]Namespace, yyrl3630) - } - } else { - yyv3630 = make([]Namespace, yyrl3630) - } - yyc3630 = true - yyrr3630 = len(yyv3630) - if yyrg3630 { - copy(yyv3630, yyv23630) - } - } else if yyl3630 != len(yyv3630) { - yyv3630 = yyv3630[:yyl3630] - yyc3630 = true - } - yyj3630 := 0 - for ; yyj3630 < yyrr3630; yyj3630++ { - yyh3630.ElemContainerState(yyj3630) - if r.TryDecodeAsNil() { - yyv3630[yyj3630] = Namespace{} - } else { - yyv3631 := &yyv3630[yyj3630] - yyv3631.CodecDecodeSelf(d) - } - - } - if yyrt3630 { - for ; yyj3630 < yyl3630; yyj3630++ { - yyv3630 = append(yyv3630, Namespace{}) - yyh3630.ElemContainerState(yyj3630) - if r.TryDecodeAsNil() { - yyv3630[yyj3630] = Namespace{} - } else { - yyv3632 := &yyv3630[yyj3630] - yyv3632.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj3630 := 0 - for ; !r.CheckBreak(); yyj3630++ { - - if yyj3630 >= len(yyv3630) { - yyv3630 = append(yyv3630, Namespace{}) // var yyz3630 Namespace - yyc3630 = true - } - yyh3630.ElemContainerState(yyj3630) - if yyj3630 < len(yyv3630) { - if r.TryDecodeAsNil() { - yyv3630[yyj3630] = Namespace{} - } else { - yyv3633 := &yyv3630[yyj3630] - yyv3633.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj3630 < len(yyv3630) { - yyv3630 = yyv3630[:yyj3630] - yyc3630 = true - } else if yyj3630 == 0 && yyv3630 == nil { - yyv3630 = []Namespace{} - yyc3630 = true - } - } - yyh3630.End() - if yyc3630 { - *v = yyv3630 - } -} - -func (x codecSelfer1234) encSliceEvent(v []Event, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3634 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3635 := &yyv3634 - yy3635.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3636 := *v - yyh3636, yyl3636 := z.DecSliceHelperStart() - var yyc3636 bool - if yyl3636 == 0 { - if yyv3636 == nil { - yyv3636 = []Event{} - yyc3636 = true - } else if len(yyv3636) != 0 { - yyv3636 = yyv3636[:0] - yyc3636 = true - } - } else if yyl3636 > 0 { - var yyrr3636, yyrl3636 int - var yyrt3636 bool - if yyl3636 > cap(yyv3636) { - - yyrg3636 := len(yyv3636) > 0 - yyv23636 := yyv3636 - yyrl3636, yyrt3636 = z.DecInferLen(yyl3636, z.DecBasicHandle().MaxInitLen, 440) - if yyrt3636 { - if yyrl3636 <= cap(yyv3636) { - yyv3636 = yyv3636[:yyrl3636] - } else { - yyv3636 = make([]Event, yyrl3636) - } - } else { - yyv3636 = make([]Event, yyrl3636) - } - yyc3636 = true - yyrr3636 = len(yyv3636) - if yyrg3636 { - copy(yyv3636, yyv23636) - } - } else if yyl3636 != len(yyv3636) { - yyv3636 = yyv3636[:yyl3636] - yyc3636 = true - } - yyj3636 := 0 - for ; yyj3636 < yyrr3636; yyj3636++ { - yyh3636.ElemContainerState(yyj3636) - if r.TryDecodeAsNil() { - yyv3636[yyj3636] = Event{} - } else { - yyv3637 := &yyv3636[yyj3636] - yyv3637.CodecDecodeSelf(d) - } - - } - if yyrt3636 { - for ; yyj3636 < yyl3636; yyj3636++ { - yyv3636 = append(yyv3636, Event{}) - yyh3636.ElemContainerState(yyj3636) - if r.TryDecodeAsNil() { - yyv3636[yyj3636] = Event{} - } else { - yyv3638 := &yyv3636[yyj3636] - yyv3638.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj3636 := 0 - for ; !r.CheckBreak(); yyj3636++ { - - if yyj3636 >= len(yyv3636) { - yyv3636 = append(yyv3636, Event{}) // var yyz3636 Event - yyc3636 = true - } - yyh3636.ElemContainerState(yyj3636) - if yyj3636 < len(yyv3636) { - if r.TryDecodeAsNil() { - yyv3636[yyj3636] = Event{} - } else { - yyv3639 := &yyv3636[yyj3636] - yyv3639.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj3636 < len(yyv3636) { - yyv3636 = yyv3636[:yyj3636] - yyc3636 = true - } else if yyj3636 == 0 && yyv3636 == nil { - yyv3636 = []Event{} - yyc3636 = true - } - } - yyh3636.End() - if yyc3636 { - *v = yyv3636 - } -} - -func (x codecSelfer1234) encSliceruntime_Object(v []pkg6_runtime.Object, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3640 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyv3640 == nil { - r.EncodeNil() - } else { - yym3641 := z.EncBinary() - _ = yym3641 - if false { - } else if z.HasExtensions() && z.EncExt(yyv3640) { - } else { - z.EncFallback(yyv3640) - } - } - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg6_runtime.Object, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3642 := *v - yyh3642, yyl3642 := z.DecSliceHelperStart() - var yyc3642 bool - if yyl3642 == 0 { - if yyv3642 == nil { - yyv3642 = []pkg6_runtime.Object{} - yyc3642 = true - } else if len(yyv3642) != 0 { - yyv3642 = yyv3642[:0] - yyc3642 = true - } - } else if yyl3642 > 0 { - var yyrr3642, yyrl3642 int - var yyrt3642 bool - if yyl3642 > cap(yyv3642) { - - yyrg3642 := len(yyv3642) > 0 - yyv23642 := yyv3642 - yyrl3642, yyrt3642 = z.DecInferLen(yyl3642, z.DecBasicHandle().MaxInitLen, 16) - if yyrt3642 { - if yyrl3642 <= cap(yyv3642) { - yyv3642 = yyv3642[:yyrl3642] - } else { - yyv3642 = make([]pkg6_runtime.Object, yyrl3642) - } - } else { - yyv3642 = make([]pkg6_runtime.Object, yyrl3642) - } - yyc3642 = true - yyrr3642 = len(yyv3642) - if yyrg3642 { - copy(yyv3642, yyv23642) - } - } else if yyl3642 != len(yyv3642) { - yyv3642 = yyv3642[:yyl3642] - yyc3642 = true - } - yyj3642 := 0 - for ; yyj3642 < yyrr3642; yyj3642++ { - yyh3642.ElemContainerState(yyj3642) - if r.TryDecodeAsNil() { - yyv3642[yyj3642] = nil - } else { - yyv3643 := &yyv3642[yyj3642] - yym3644 := z.DecBinary() - _ = yym3644 - if false { - } else if z.HasExtensions() && z.DecExt(yyv3643) { - } else { - z.DecFallback(yyv3643, true) - } - } - - } - if yyrt3642 { - for ; yyj3642 < yyl3642; yyj3642++ { - yyv3642 = append(yyv3642, nil) - yyh3642.ElemContainerState(yyj3642) - if r.TryDecodeAsNil() { - yyv3642[yyj3642] = nil - } else { - yyv3645 := &yyv3642[yyj3642] - yym3646 := z.DecBinary() - _ = yym3646 - if false { - } else if z.HasExtensions() && z.DecExt(yyv3645) { - } else { - z.DecFallback(yyv3645, true) - } - } - - } - } - - } else { - yyj3642 := 0 - for ; !r.CheckBreak(); yyj3642++ { - - if yyj3642 >= len(yyv3642) { - yyv3642 = append(yyv3642, nil) // var yyz3642 pkg6_runtime.Object - yyc3642 = true - } - yyh3642.ElemContainerState(yyj3642) - if yyj3642 < len(yyv3642) { - if r.TryDecodeAsNil() { - yyv3642[yyj3642] = nil - } else { - yyv3647 := &yyv3642[yyj3642] - yym3648 := z.DecBinary() - _ = yym3648 - if false { - } else if z.HasExtensions() && z.DecExt(yyv3647) { - } else { - z.DecFallback(yyv3647, true) - } - } - - } else { - z.DecSwallow() - } - - } - if yyj3642 < len(yyv3642) { - yyv3642 = yyv3642[:yyj3642] - yyc3642 = true - } else if yyj3642 == 0 && yyv3642 == nil { - yyv3642 = []pkg6_runtime.Object{} - yyc3642 = true - } - } - yyh3642.End() - if yyc3642 { - *v = yyv3642 - } -} - -func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3649 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3650 := &yyv3649 - yy3650.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3651 := *v - yyh3651, yyl3651 := z.DecSliceHelperStart() - var yyc3651 bool - if yyl3651 == 0 { - if yyv3651 == nil { - yyv3651 = []LimitRangeItem{} - yyc3651 = true - } else if len(yyv3651) != 0 { - yyv3651 = yyv3651[:0] - yyc3651 = true - } - } else if yyl3651 > 0 { - var yyrr3651, yyrl3651 int - var yyrt3651 bool - if yyl3651 > cap(yyv3651) { - - yyrg3651 := len(yyv3651) > 0 - yyv23651 := yyv3651 - yyrl3651, yyrt3651 = z.DecInferLen(yyl3651, z.DecBasicHandle().MaxInitLen, 56) - if yyrt3651 { - if yyrl3651 <= cap(yyv3651) { - yyv3651 = yyv3651[:yyrl3651] - } else { - yyv3651 = make([]LimitRangeItem, yyrl3651) - } - } else { - yyv3651 = make([]LimitRangeItem, yyrl3651) - } - yyc3651 = true - yyrr3651 = len(yyv3651) - if yyrg3651 { - copy(yyv3651, yyv23651) - } - } else if yyl3651 != len(yyv3651) { - yyv3651 = yyv3651[:yyl3651] - yyc3651 = true - } - yyj3651 := 0 - for ; yyj3651 < yyrr3651; yyj3651++ { - yyh3651.ElemContainerState(yyj3651) - if r.TryDecodeAsNil() { - yyv3651[yyj3651] = LimitRangeItem{} - } else { - yyv3652 := &yyv3651[yyj3651] - yyv3652.CodecDecodeSelf(d) - } - - } - if yyrt3651 { - for ; yyj3651 < yyl3651; yyj3651++ { - yyv3651 = append(yyv3651, LimitRangeItem{}) - yyh3651.ElemContainerState(yyj3651) - if r.TryDecodeAsNil() { - yyv3651[yyj3651] = LimitRangeItem{} - } else { - yyv3653 := &yyv3651[yyj3651] - yyv3653.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj3651 := 0 - for ; !r.CheckBreak(); yyj3651++ { - - if yyj3651 >= len(yyv3651) { - yyv3651 = append(yyv3651, LimitRangeItem{}) // var yyz3651 LimitRangeItem - yyc3651 = true - } - yyh3651.ElemContainerState(yyj3651) - if yyj3651 < len(yyv3651) { - if r.TryDecodeAsNil() { - yyv3651[yyj3651] = LimitRangeItem{} - } else { - yyv3654 := &yyv3651[yyj3651] - yyv3654.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj3651 < len(yyv3651) { - yyv3651 = yyv3651[:yyj3651] - yyc3651 = true - } else if yyj3651 == 0 && yyv3651 == nil { - yyv3651 = []LimitRangeItem{} - yyc3651 = true - } - } - yyh3651.End() - if yyc3651 { - *v = yyv3651 - } -} - -func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3655 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3656 := &yyv3655 - yy3656.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3657 := *v - yyh3657, yyl3657 := z.DecSliceHelperStart() - var yyc3657 bool - if yyl3657 == 0 { - if yyv3657 == nil { - yyv3657 = []LimitRange{} - yyc3657 = true - } else if len(yyv3657) != 0 { - yyv3657 = yyv3657[:0] - yyc3657 = true - } - } else if yyl3657 > 0 { - var yyrr3657, yyrl3657 int - var yyrt3657 bool - if yyl3657 > cap(yyv3657) { - - yyrg3657 := len(yyv3657) > 0 - yyv23657 := yyv3657 - yyrl3657, yyrt3657 = z.DecInferLen(yyl3657, z.DecBasicHandle().MaxInitLen, 216) - if yyrt3657 { - if yyrl3657 <= cap(yyv3657) { - yyv3657 = yyv3657[:yyrl3657] - } else { - yyv3657 = make([]LimitRange, yyrl3657) - } - } else { - yyv3657 = make([]LimitRange, yyrl3657) - } - yyc3657 = true - yyrr3657 = len(yyv3657) - if yyrg3657 { - copy(yyv3657, yyv23657) - } - } else if yyl3657 != len(yyv3657) { - yyv3657 = yyv3657[:yyl3657] - yyc3657 = true - } - yyj3657 := 0 - for ; yyj3657 < yyrr3657; yyj3657++ { - yyh3657.ElemContainerState(yyj3657) - if r.TryDecodeAsNil() { - yyv3657[yyj3657] = LimitRange{} - } else { - yyv3658 := &yyv3657[yyj3657] - yyv3658.CodecDecodeSelf(d) - } - - } - if yyrt3657 { - for ; yyj3657 < yyl3657; yyj3657++ { - yyv3657 = append(yyv3657, LimitRange{}) - yyh3657.ElemContainerState(yyj3657) - if r.TryDecodeAsNil() { - yyv3657[yyj3657] = LimitRange{} - } else { - yyv3659 := &yyv3657[yyj3657] - yyv3659.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj3657 := 0 - for ; !r.CheckBreak(); yyj3657++ { - - if yyj3657 >= len(yyv3657) { - yyv3657 = append(yyv3657, LimitRange{}) // var yyz3657 LimitRange - yyc3657 = true - } - yyh3657.ElemContainerState(yyj3657) - if yyj3657 < len(yyv3657) { - if r.TryDecodeAsNil() { - yyv3657[yyj3657] = LimitRange{} - } else { - yyv3660 := &yyv3657[yyj3657] - yyv3660.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj3657 < len(yyv3657) { - yyv3657 = yyv3657[:yyj3657] - yyc3657 = true - } else if yyj3657 == 0 && yyv3657 == nil { - yyv3657 = []LimitRange{} - yyc3657 = true - } - } - yyh3657.End() - if yyc3657 { - *v = yyv3657 - } -} - -func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv3661 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3662 := &yyv3661 - yy3662.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3663 := *v - yyh3663, yyl3663 := z.DecSliceHelperStart() - var yyc3663 bool - if yyl3663 == 0 { - if yyv3663 == nil { - yyv3663 = []ResourceQuota{} - yyc3663 = true - } else if len(yyv3663) != 0 { - yyv3663 = yyv3663[:0] - yyc3663 = true - } - } else if yyl3663 > 0 { - var yyrr3663, yyrl3663 int - var yyrt3663 bool - if yyl3663 > cap(yyv3663) { - - yyrg3663 := len(yyv3663) > 0 - yyv23663 := yyv3663 - yyrl3663, yyrt3663 = z.DecInferLen(yyl3663, z.DecBasicHandle().MaxInitLen, 216) - if yyrt3663 { - if yyrl3663 <= cap(yyv3663) { - yyv3663 = yyv3663[:yyrl3663] - } else { - yyv3663 = make([]ResourceQuota, yyrl3663) - } - } else { - yyv3663 = make([]ResourceQuota, yyrl3663) - } - yyc3663 = true - yyrr3663 = len(yyv3663) - if yyrg3663 { - copy(yyv3663, yyv23663) - } - } else if yyl3663 != len(yyv3663) { - yyv3663 = yyv3663[:yyl3663] - yyc3663 = true - } - yyj3663 := 0 - for ; yyj3663 < yyrr3663; yyj3663++ { - yyh3663.ElemContainerState(yyj3663) - if r.TryDecodeAsNil() { - yyv3663[yyj3663] = ResourceQuota{} - } else { - yyv3664 := &yyv3663[yyj3663] - yyv3664.CodecDecodeSelf(d) - } - - } - if yyrt3663 { - for ; yyj3663 < yyl3663; yyj3663++ { - yyv3663 = append(yyv3663, ResourceQuota{}) - yyh3663.ElemContainerState(yyj3663) - if r.TryDecodeAsNil() { - yyv3663[yyj3663] = ResourceQuota{} - } else { - yyv3665 := &yyv3663[yyj3663] - yyv3665.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj3663 := 0 - for ; !r.CheckBreak(); yyj3663++ { - - if yyj3663 >= len(yyv3663) { - yyv3663 = append(yyv3663, ResourceQuota{}) // var yyz3663 ResourceQuota - yyc3663 = true - } - yyh3663.ElemContainerState(yyj3663) - if yyj3663 < len(yyv3663) { - if r.TryDecodeAsNil() { - yyv3663[yyj3663] = ResourceQuota{} - } else { - yyv3666 := &yyv3663[yyj3663] - yyv3666.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj3663 < len(yyv3663) { - yyv3663 = yyv3663[:yyj3663] - yyc3663 = true - } else if yyj3663 == 0 && yyv3663 == nil { - yyv3663 = []ResourceQuota{} - yyc3663 = true - } - } - yyh3663.End() - if yyc3663 { - *v = yyv3663 - } -} - -func (x codecSelfer1234) encMapstringSliceuint8(v map[string][]uint8, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeMapStart(len(v)) - for yyk3667, yyv3667 := range v { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym3668 := z.EncBinary() - _ = yym3668 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk3667)) - } - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if yyv3667 == nil { - r.EncodeNil() - } else { - yym3669 := z.EncBinary() - _ = yym3669 - if false { - } else { - r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv3667)) - } - } - } - z.EncSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x codecSelfer1234) decMapstringSliceuint8(v *map[string][]uint8, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv3670 := *v - yyl3670 := r.ReadMapStart() - yybh3670 := z.DecBasicHandle() - if yyv3670 == nil { - yyrl3670, _ := z.DecInferLen(yyl3670, yybh3670.MaxInitLen, 40) - yyv3670 = make(map[string][]uint8, yyrl3670) - *v = yyv3670 - } - var yymk3670 string - var yymv3670 []uint8 - var yymg3670 bool - if yybh3670.MapValueReset { - yymg3670 = true - } - if yyl3670 > 0 { - for yyj3670 := 0; yyj3670 < yyl3670; yyj3670++ { - z.DecSendContainerState(codecSelfer_containerMapKey1234) - if r.TryDecodeAsNil() { - yymk3670 = "" - } else { - yymk3670 = string(r.DecodeString()) - } - - if yymg3670 { - yymv3670 = yyv3670[yymk3670] - } else { - yymv3670 = nil - } - z.DecSendContainerState(codecSelfer_containerMapValue1234) - if r.TryDecodeAsNil() { - yymv3670 = nil - } else { - yyv3672 := &yymv3670 - yym3673 := z.DecBinary() - _ = yym3673 - if false { - } else { - *yyv3672 = r.DecodeBytes(*(*[]byte)(yyv3672), false, false) - } - } - - if yyv3670 != nil { - yyv3670[yymk3670] = yymv3670 - } - } - } else if yyl3670 < 0 { - for yyj3670 := 0; !r.CheckBreak(); yyj3670++ { - z.DecSendContainerState(codecSelfer_containerMapKey1234) - if r.TryDecodeAsNil() { - yymk3670 = "" - } else { - yymk3670 = string(r.DecodeString()) - } - - if yymg3670 { - yymv3670 = yyv3670[yymk3670] - } else { - yymv3670 = nil - } - z.DecSendContainerState(codecSelfer_containerMapValue1234) - if r.TryDecodeAsNil() { - yymv3670 = nil - } else { - yyv3675 := &yymv3670 - yym3676 := z.DecBinary() - _ = yym3676 - if false { - } else { - *yyv3675 = r.DecodeBytes(*(*[]byte)(yyv3675), false, false) - } - } - - if yyv3670 != nil { - yyv3670[yymk3670] = yymv3670 - } - } - } // else len==0: TODO: Should we clear map entries? - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x codecSelfer1234) encSliceSecret(v []Secret, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -46919,7 +46587,7 @@ func (x codecSelfer1234) encSliceSecret(v []Secret, e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { +func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -46929,7 +46597,7 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { var yyc3679 bool if yyl3679 == 0 { if yyv3679 == nil { - yyv3679 = []Secret{} + yyv3679 = []Namespace{} yyc3679 = true } else if len(yyv3679) != 0 { yyv3679 = yyv3679[:0] @@ -46942,15 +46610,15 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { yyrg3679 := len(yyv3679) > 0 yyv23679 := yyv3679 - yyrl3679, yyrt3679 = z.DecInferLen(yyl3679, z.DecBasicHandle().MaxInitLen, 216) + yyrl3679, yyrt3679 = z.DecInferLen(yyl3679, z.DecBasicHandle().MaxInitLen, 232) if yyrt3679 { if yyrl3679 <= cap(yyv3679) { yyv3679 = yyv3679[:yyrl3679] } else { - yyv3679 = make([]Secret, yyrl3679) + yyv3679 = make([]Namespace, yyrl3679) } } else { - yyv3679 = make([]Secret, yyrl3679) + yyv3679 = make([]Namespace, yyrl3679) } yyc3679 = true yyrr3679 = len(yyv3679) @@ -46965,7 +46633,7 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { for ; yyj3679 < yyrr3679; yyj3679++ { yyh3679.ElemContainerState(yyj3679) if r.TryDecodeAsNil() { - yyv3679[yyj3679] = Secret{} + yyv3679[yyj3679] = Namespace{} } else { yyv3680 := &yyv3679[yyj3679] yyv3680.CodecDecodeSelf(d) @@ -46974,10 +46642,10 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { } if yyrt3679 { for ; yyj3679 < yyl3679; yyj3679++ { - yyv3679 = append(yyv3679, Secret{}) + yyv3679 = append(yyv3679, Namespace{}) yyh3679.ElemContainerState(yyj3679) if r.TryDecodeAsNil() { - yyv3679[yyj3679] = Secret{} + yyv3679[yyj3679] = Namespace{} } else { yyv3681 := &yyv3679[yyj3679] yyv3681.CodecDecodeSelf(d) @@ -46991,13 +46659,13 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { for ; !r.CheckBreak(); yyj3679++ { if yyj3679 >= len(yyv3679) { - yyv3679 = append(yyv3679, Secret{}) // var yyz3679 Secret + yyv3679 = append(yyv3679, Namespace{}) // var yyz3679 Namespace yyc3679 = true } yyh3679.ElemContainerState(yyj3679) if yyj3679 < len(yyv3679) { if r.TryDecodeAsNil() { - yyv3679[yyj3679] = Secret{} + yyv3679[yyj3679] = Namespace{} } else { yyv3682 := &yyv3679[yyj3679] yyv3682.CodecDecodeSelf(d) @@ -47012,7 +46680,7 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { yyv3679 = yyv3679[:yyj3679] yyc3679 = true } else if yyj3679 == 0 && yyv3679 == nil { - yyv3679 = []Secret{} + yyv3679 = []Namespace{} yyc3679 = true } } @@ -47022,7 +46690,7 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { } } -func (x codecSelfer1234) encSliceComponentCondition(v []ComponentCondition, e *codec1978.Encoder) { +func (x codecSelfer1234) encSliceEvent(v []Event, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -47035,7 +46703,7 @@ func (x codecSelfer1234) encSliceComponentCondition(v []ComponentCondition, e *c z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d *codec1978.Decoder) { +func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -47045,7 +46713,7 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * var yyc3685 bool if yyl3685 == 0 { if yyv3685 == nil { - yyv3685 = []ComponentCondition{} + yyv3685 = []Event{} yyc3685 = true } else if len(yyv3685) != 0 { yyv3685 = yyv3685[:0] @@ -47058,15 +46726,15 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * yyrg3685 := len(yyv3685) > 0 yyv23685 := yyv3685 - yyrl3685, yyrt3685 = z.DecInferLen(yyl3685, z.DecBasicHandle().MaxInitLen, 64) + yyrl3685, yyrt3685 = z.DecInferLen(yyl3685, z.DecBasicHandle().MaxInitLen, 440) if yyrt3685 { if yyrl3685 <= cap(yyv3685) { yyv3685 = yyv3685[:yyrl3685] } else { - yyv3685 = make([]ComponentCondition, yyrl3685) + yyv3685 = make([]Event, yyrl3685) } } else { - yyv3685 = make([]ComponentCondition, yyrl3685) + yyv3685 = make([]Event, yyrl3685) } yyc3685 = true yyrr3685 = len(yyv3685) @@ -47081,7 +46749,7 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * for ; yyj3685 < yyrr3685; yyj3685++ { yyh3685.ElemContainerState(yyj3685) if r.TryDecodeAsNil() { - yyv3685[yyj3685] = ComponentCondition{} + yyv3685[yyj3685] = Event{} } else { yyv3686 := &yyv3685[yyj3685] yyv3686.CodecDecodeSelf(d) @@ -47090,10 +46758,10 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * } if yyrt3685 { for ; yyj3685 < yyl3685; yyj3685++ { - yyv3685 = append(yyv3685, ComponentCondition{}) + yyv3685 = append(yyv3685, Event{}) yyh3685.ElemContainerState(yyj3685) if r.TryDecodeAsNil() { - yyv3685[yyj3685] = ComponentCondition{} + yyv3685[yyj3685] = Event{} } else { yyv3687 := &yyv3685[yyj3685] yyv3687.CodecDecodeSelf(d) @@ -47107,13 +46775,13 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * for ; !r.CheckBreak(); yyj3685++ { if yyj3685 >= len(yyv3685) { - yyv3685 = append(yyv3685, ComponentCondition{}) // var yyz3685 ComponentCondition + yyv3685 = append(yyv3685, Event{}) // var yyz3685 Event yyc3685 = true } yyh3685.ElemContainerState(yyj3685) if yyj3685 < len(yyv3685) { if r.TryDecodeAsNil() { - yyv3685[yyj3685] = ComponentCondition{} + yyv3685[yyj3685] = Event{} } else { yyv3688 := &yyv3685[yyj3685] yyv3688.CodecDecodeSelf(d) @@ -47128,7 +46796,7 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * yyv3685 = yyv3685[:yyj3685] yyc3685 = true } else if yyj3685 == 0 && yyv3685 == nil { - yyv3685 = []ComponentCondition{} + yyv3685 = []Event{} yyc3685 = true } } @@ -47138,20 +46806,29 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * } } -func (x codecSelfer1234) encSliceComponentStatus(v []ComponentStatus, e *codec1978.Encoder) { +func (x codecSelfer1234) encSliceruntime_Object(v []pkg8_runtime.Object, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) for _, yyv3689 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3690 := &yyv3689 - yy3690.CodecEncodeSelf(e) + if yyv3689 == nil { + r.EncodeNil() + } else { + yym3690 := z.EncBinary() + _ = yym3690 + if false { + } else if z.HasExtensions() && z.EncExt(yyv3689) { + } else { + z.EncFallback(yyv3689) + } + } } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1978.Decoder) { +func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg8_runtime.Object, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -47161,7 +46838,7 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 var yyc3691 bool if yyl3691 == 0 { if yyv3691 == nil { - yyv3691 = []ComponentStatus{} + yyv3691 = []pkg8_runtime.Object{} yyc3691 = true } else if len(yyv3691) != 0 { yyv3691 = yyv3691[:0] @@ -47174,15 +46851,15 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 yyrg3691 := len(yyv3691) > 0 yyv23691 := yyv3691 - yyrl3691, yyrt3691 = z.DecInferLen(yyl3691, z.DecBasicHandle().MaxInitLen, 216) + yyrl3691, yyrt3691 = z.DecInferLen(yyl3691, z.DecBasicHandle().MaxInitLen, 16) if yyrt3691 { if yyrl3691 <= cap(yyv3691) { yyv3691 = yyv3691[:yyrl3691] } else { - yyv3691 = make([]ComponentStatus, yyrl3691) + yyv3691 = make([]pkg8_runtime.Object, yyrl3691) } } else { - yyv3691 = make([]ComponentStatus, yyrl3691) + yyv3691 = make([]pkg8_runtime.Object, yyrl3691) } yyc3691 = true yyrr3691 = len(yyv3691) @@ -47197,22 +46874,34 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 for ; yyj3691 < yyrr3691; yyj3691++ { yyh3691.ElemContainerState(yyj3691) if r.TryDecodeAsNil() { - yyv3691[yyj3691] = ComponentStatus{} + yyv3691[yyj3691] = nil } else { yyv3692 := &yyv3691[yyj3691] - yyv3692.CodecDecodeSelf(d) + yym3693 := z.DecBinary() + _ = yym3693 + if false { + } else if z.HasExtensions() && z.DecExt(yyv3692) { + } else { + z.DecFallback(yyv3692, true) + } } } if yyrt3691 { for ; yyj3691 < yyl3691; yyj3691++ { - yyv3691 = append(yyv3691, ComponentStatus{}) + yyv3691 = append(yyv3691, nil) yyh3691.ElemContainerState(yyj3691) if r.TryDecodeAsNil() { - yyv3691[yyj3691] = ComponentStatus{} + yyv3691[yyj3691] = nil } else { - yyv3693 := &yyv3691[yyj3691] - yyv3693.CodecDecodeSelf(d) + yyv3694 := &yyv3691[yyj3691] + yym3695 := z.DecBinary() + _ = yym3695 + if false { + } else if z.HasExtensions() && z.DecExt(yyv3694) { + } else { + z.DecFallback(yyv3694, true) + } } } @@ -47223,16 +46912,22 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 for ; !r.CheckBreak(); yyj3691++ { if yyj3691 >= len(yyv3691) { - yyv3691 = append(yyv3691, ComponentStatus{}) // var yyz3691 ComponentStatus + yyv3691 = append(yyv3691, nil) // var yyz3691 pkg8_runtime.Object yyc3691 = true } yyh3691.ElemContainerState(yyj3691) if yyj3691 < len(yyv3691) { if r.TryDecodeAsNil() { - yyv3691[yyj3691] = ComponentStatus{} + yyv3691[yyj3691] = nil } else { - yyv3694 := &yyv3691[yyj3691] - yyv3694.CodecDecodeSelf(d) + yyv3696 := &yyv3691[yyj3691] + yym3697 := z.DecBinary() + _ = yym3697 + if false { + } else if z.HasExtensions() && z.DecExt(yyv3696) { + } else { + z.DecFallback(yyv3696, true) + } } } else { @@ -47244,7 +46939,7 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 yyv3691 = yyv3691[:yyj3691] yyc3691 = true } else if yyj3691 == 0 && yyv3691 == nil { - yyv3691 = []ComponentStatus{} + yyv3691 = []pkg8_runtime.Object{} yyc3691 = true } } @@ -47253,3 +46948,812 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 *v = yyv3691 } } + +func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3698 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3699 := &yyv3698 + yy3699.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3700 := *v + yyh3700, yyl3700 := z.DecSliceHelperStart() + var yyc3700 bool + if yyl3700 == 0 { + if yyv3700 == nil { + yyv3700 = []LimitRangeItem{} + yyc3700 = true + } else if len(yyv3700) != 0 { + yyv3700 = yyv3700[:0] + yyc3700 = true + } + } else if yyl3700 > 0 { + var yyrr3700, yyrl3700 int + var yyrt3700 bool + if yyl3700 > cap(yyv3700) { + + yyrg3700 := len(yyv3700) > 0 + yyv23700 := yyv3700 + yyrl3700, yyrt3700 = z.DecInferLen(yyl3700, z.DecBasicHandle().MaxInitLen, 56) + if yyrt3700 { + if yyrl3700 <= cap(yyv3700) { + yyv3700 = yyv3700[:yyrl3700] + } else { + yyv3700 = make([]LimitRangeItem, yyrl3700) + } + } else { + yyv3700 = make([]LimitRangeItem, yyrl3700) + } + yyc3700 = true + yyrr3700 = len(yyv3700) + if yyrg3700 { + copy(yyv3700, yyv23700) + } + } else if yyl3700 != len(yyv3700) { + yyv3700 = yyv3700[:yyl3700] + yyc3700 = true + } + yyj3700 := 0 + for ; yyj3700 < yyrr3700; yyj3700++ { + yyh3700.ElemContainerState(yyj3700) + if r.TryDecodeAsNil() { + yyv3700[yyj3700] = LimitRangeItem{} + } else { + yyv3701 := &yyv3700[yyj3700] + yyv3701.CodecDecodeSelf(d) + } + + } + if yyrt3700 { + for ; yyj3700 < yyl3700; yyj3700++ { + yyv3700 = append(yyv3700, LimitRangeItem{}) + yyh3700.ElemContainerState(yyj3700) + if r.TryDecodeAsNil() { + yyv3700[yyj3700] = LimitRangeItem{} + } else { + yyv3702 := &yyv3700[yyj3700] + yyv3702.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3700 := 0 + for ; !r.CheckBreak(); yyj3700++ { + + if yyj3700 >= len(yyv3700) { + yyv3700 = append(yyv3700, LimitRangeItem{}) // var yyz3700 LimitRangeItem + yyc3700 = true + } + yyh3700.ElemContainerState(yyj3700) + if yyj3700 < len(yyv3700) { + if r.TryDecodeAsNil() { + yyv3700[yyj3700] = LimitRangeItem{} + } else { + yyv3703 := &yyv3700[yyj3700] + yyv3703.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3700 < len(yyv3700) { + yyv3700 = yyv3700[:yyj3700] + yyc3700 = true + } else if yyj3700 == 0 && yyv3700 == nil { + yyv3700 = []LimitRangeItem{} + yyc3700 = true + } + } + yyh3700.End() + if yyc3700 { + *v = yyv3700 + } +} + +func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3704 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3705 := &yyv3704 + yy3705.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3706 := *v + yyh3706, yyl3706 := z.DecSliceHelperStart() + var yyc3706 bool + if yyl3706 == 0 { + if yyv3706 == nil { + yyv3706 = []LimitRange{} + yyc3706 = true + } else if len(yyv3706) != 0 { + yyv3706 = yyv3706[:0] + yyc3706 = true + } + } else if yyl3706 > 0 { + var yyrr3706, yyrl3706 int + var yyrt3706 bool + if yyl3706 > cap(yyv3706) { + + yyrg3706 := len(yyv3706) > 0 + yyv23706 := yyv3706 + yyrl3706, yyrt3706 = z.DecInferLen(yyl3706, z.DecBasicHandle().MaxInitLen, 216) + if yyrt3706 { + if yyrl3706 <= cap(yyv3706) { + yyv3706 = yyv3706[:yyrl3706] + } else { + yyv3706 = make([]LimitRange, yyrl3706) + } + } else { + yyv3706 = make([]LimitRange, yyrl3706) + } + yyc3706 = true + yyrr3706 = len(yyv3706) + if yyrg3706 { + copy(yyv3706, yyv23706) + } + } else if yyl3706 != len(yyv3706) { + yyv3706 = yyv3706[:yyl3706] + yyc3706 = true + } + yyj3706 := 0 + for ; yyj3706 < yyrr3706; yyj3706++ { + yyh3706.ElemContainerState(yyj3706) + if r.TryDecodeAsNil() { + yyv3706[yyj3706] = LimitRange{} + } else { + yyv3707 := &yyv3706[yyj3706] + yyv3707.CodecDecodeSelf(d) + } + + } + if yyrt3706 { + for ; yyj3706 < yyl3706; yyj3706++ { + yyv3706 = append(yyv3706, LimitRange{}) + yyh3706.ElemContainerState(yyj3706) + if r.TryDecodeAsNil() { + yyv3706[yyj3706] = LimitRange{} + } else { + yyv3708 := &yyv3706[yyj3706] + yyv3708.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3706 := 0 + for ; !r.CheckBreak(); yyj3706++ { + + if yyj3706 >= len(yyv3706) { + yyv3706 = append(yyv3706, LimitRange{}) // var yyz3706 LimitRange + yyc3706 = true + } + yyh3706.ElemContainerState(yyj3706) + if yyj3706 < len(yyv3706) { + if r.TryDecodeAsNil() { + yyv3706[yyj3706] = LimitRange{} + } else { + yyv3709 := &yyv3706[yyj3706] + yyv3709.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3706 < len(yyv3706) { + yyv3706 = yyv3706[:yyj3706] + yyc3706 = true + } else if yyj3706 == 0 && yyv3706 == nil { + yyv3706 = []LimitRange{} + yyc3706 = true + } + } + yyh3706.End() + if yyc3706 { + *v = yyv3706 + } +} + +func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3710 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3711 := &yyv3710 + yy3711.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3712 := *v + yyh3712, yyl3712 := z.DecSliceHelperStart() + var yyc3712 bool + if yyl3712 == 0 { + if yyv3712 == nil { + yyv3712 = []ResourceQuota{} + yyc3712 = true + } else if len(yyv3712) != 0 { + yyv3712 = yyv3712[:0] + yyc3712 = true + } + } else if yyl3712 > 0 { + var yyrr3712, yyrl3712 int + var yyrt3712 bool + if yyl3712 > cap(yyv3712) { + + yyrg3712 := len(yyv3712) > 0 + yyv23712 := yyv3712 + yyrl3712, yyrt3712 = z.DecInferLen(yyl3712, z.DecBasicHandle().MaxInitLen, 216) + if yyrt3712 { + if yyrl3712 <= cap(yyv3712) { + yyv3712 = yyv3712[:yyrl3712] + } else { + yyv3712 = make([]ResourceQuota, yyrl3712) + } + } else { + yyv3712 = make([]ResourceQuota, yyrl3712) + } + yyc3712 = true + yyrr3712 = len(yyv3712) + if yyrg3712 { + copy(yyv3712, yyv23712) + } + } else if yyl3712 != len(yyv3712) { + yyv3712 = yyv3712[:yyl3712] + yyc3712 = true + } + yyj3712 := 0 + for ; yyj3712 < yyrr3712; yyj3712++ { + yyh3712.ElemContainerState(yyj3712) + if r.TryDecodeAsNil() { + yyv3712[yyj3712] = ResourceQuota{} + } else { + yyv3713 := &yyv3712[yyj3712] + yyv3713.CodecDecodeSelf(d) + } + + } + if yyrt3712 { + for ; yyj3712 < yyl3712; yyj3712++ { + yyv3712 = append(yyv3712, ResourceQuota{}) + yyh3712.ElemContainerState(yyj3712) + if r.TryDecodeAsNil() { + yyv3712[yyj3712] = ResourceQuota{} + } else { + yyv3714 := &yyv3712[yyj3712] + yyv3714.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3712 := 0 + for ; !r.CheckBreak(); yyj3712++ { + + if yyj3712 >= len(yyv3712) { + yyv3712 = append(yyv3712, ResourceQuota{}) // var yyz3712 ResourceQuota + yyc3712 = true + } + yyh3712.ElemContainerState(yyj3712) + if yyj3712 < len(yyv3712) { + if r.TryDecodeAsNil() { + yyv3712[yyj3712] = ResourceQuota{} + } else { + yyv3715 := &yyv3712[yyj3712] + yyv3715.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3712 < len(yyv3712) { + yyv3712 = yyv3712[:yyj3712] + yyc3712 = true + } else if yyj3712 == 0 && yyv3712 == nil { + yyv3712 = []ResourceQuota{} + yyc3712 = true + } + } + yyh3712.End() + if yyc3712 { + *v = yyv3712 + } +} + +func (x codecSelfer1234) encMapstringSliceuint8(v map[string][]uint8, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeMapStart(len(v)) + for yyk3716, yyv3716 := range v { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + yym3717 := z.EncBinary() + _ = yym3717 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(yyk3716)) + } + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if yyv3716 == nil { + r.EncodeNil() + } else { + yym3718 := z.EncBinary() + _ = yym3718 + if false { + } else { + r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv3716)) + } + } + } + z.EncSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x codecSelfer1234) decMapstringSliceuint8(v *map[string][]uint8, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3719 := *v + yyl3719 := r.ReadMapStart() + yybh3719 := z.DecBasicHandle() + if yyv3719 == nil { + yyrl3719, _ := z.DecInferLen(yyl3719, yybh3719.MaxInitLen, 40) + yyv3719 = make(map[string][]uint8, yyrl3719) + *v = yyv3719 + } + var yymk3719 string + var yymv3719 []uint8 + var yymg3719 bool + if yybh3719.MapValueReset { + yymg3719 = true + } + if yyl3719 > 0 { + for yyj3719 := 0; yyj3719 < yyl3719; yyj3719++ { + z.DecSendContainerState(codecSelfer_containerMapKey1234) + if r.TryDecodeAsNil() { + yymk3719 = "" + } else { + yymk3719 = string(r.DecodeString()) + } + + if yymg3719 { + yymv3719 = yyv3719[yymk3719] + } else { + yymv3719 = nil + } + z.DecSendContainerState(codecSelfer_containerMapValue1234) + if r.TryDecodeAsNil() { + yymv3719 = nil + } else { + yyv3721 := &yymv3719 + yym3722 := z.DecBinary() + _ = yym3722 + if false { + } else { + *yyv3721 = r.DecodeBytes(*(*[]byte)(yyv3721), false, false) + } + } + + if yyv3719 != nil { + yyv3719[yymk3719] = yymv3719 + } + } + } else if yyl3719 < 0 { + for yyj3719 := 0; !r.CheckBreak(); yyj3719++ { + z.DecSendContainerState(codecSelfer_containerMapKey1234) + if r.TryDecodeAsNil() { + yymk3719 = "" + } else { + yymk3719 = string(r.DecodeString()) + } + + if yymg3719 { + yymv3719 = yyv3719[yymk3719] + } else { + yymv3719 = nil + } + z.DecSendContainerState(codecSelfer_containerMapValue1234) + if r.TryDecodeAsNil() { + yymv3719 = nil + } else { + yyv3724 := &yymv3719 + yym3725 := z.DecBinary() + _ = yym3725 + if false { + } else { + *yyv3724 = r.DecodeBytes(*(*[]byte)(yyv3724), false, false) + } + } + + if yyv3719 != nil { + yyv3719[yymk3719] = yymv3719 + } + } + } // else len==0: TODO: Should we clear map entries? + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x codecSelfer1234) encSliceSecret(v []Secret, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3726 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3727 := &yyv3726 + yy3727.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3728 := *v + yyh3728, yyl3728 := z.DecSliceHelperStart() + var yyc3728 bool + if yyl3728 == 0 { + if yyv3728 == nil { + yyv3728 = []Secret{} + yyc3728 = true + } else if len(yyv3728) != 0 { + yyv3728 = yyv3728[:0] + yyc3728 = true + } + } else if yyl3728 > 0 { + var yyrr3728, yyrl3728 int + var yyrt3728 bool + if yyl3728 > cap(yyv3728) { + + yyrg3728 := len(yyv3728) > 0 + yyv23728 := yyv3728 + yyrl3728, yyrt3728 = z.DecInferLen(yyl3728, z.DecBasicHandle().MaxInitLen, 216) + if yyrt3728 { + if yyrl3728 <= cap(yyv3728) { + yyv3728 = yyv3728[:yyrl3728] + } else { + yyv3728 = make([]Secret, yyrl3728) + } + } else { + yyv3728 = make([]Secret, yyrl3728) + } + yyc3728 = true + yyrr3728 = len(yyv3728) + if yyrg3728 { + copy(yyv3728, yyv23728) + } + } else if yyl3728 != len(yyv3728) { + yyv3728 = yyv3728[:yyl3728] + yyc3728 = true + } + yyj3728 := 0 + for ; yyj3728 < yyrr3728; yyj3728++ { + yyh3728.ElemContainerState(yyj3728) + if r.TryDecodeAsNil() { + yyv3728[yyj3728] = Secret{} + } else { + yyv3729 := &yyv3728[yyj3728] + yyv3729.CodecDecodeSelf(d) + } + + } + if yyrt3728 { + for ; yyj3728 < yyl3728; yyj3728++ { + yyv3728 = append(yyv3728, Secret{}) + yyh3728.ElemContainerState(yyj3728) + if r.TryDecodeAsNil() { + yyv3728[yyj3728] = Secret{} + } else { + yyv3730 := &yyv3728[yyj3728] + yyv3730.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3728 := 0 + for ; !r.CheckBreak(); yyj3728++ { + + if yyj3728 >= len(yyv3728) { + yyv3728 = append(yyv3728, Secret{}) // var yyz3728 Secret + yyc3728 = true + } + yyh3728.ElemContainerState(yyj3728) + if yyj3728 < len(yyv3728) { + if r.TryDecodeAsNil() { + yyv3728[yyj3728] = Secret{} + } else { + yyv3731 := &yyv3728[yyj3728] + yyv3731.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3728 < len(yyv3728) { + yyv3728 = yyv3728[:yyj3728] + yyc3728 = true + } else if yyj3728 == 0 && yyv3728 == nil { + yyv3728 = []Secret{} + yyc3728 = true + } + } + yyh3728.End() + if yyc3728 { + *v = yyv3728 + } +} + +func (x codecSelfer1234) encSliceComponentCondition(v []ComponentCondition, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3732 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3733 := &yyv3732 + yy3733.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3734 := *v + yyh3734, yyl3734 := z.DecSliceHelperStart() + var yyc3734 bool + if yyl3734 == 0 { + if yyv3734 == nil { + yyv3734 = []ComponentCondition{} + yyc3734 = true + } else if len(yyv3734) != 0 { + yyv3734 = yyv3734[:0] + yyc3734 = true + } + } else if yyl3734 > 0 { + var yyrr3734, yyrl3734 int + var yyrt3734 bool + if yyl3734 > cap(yyv3734) { + + yyrg3734 := len(yyv3734) > 0 + yyv23734 := yyv3734 + yyrl3734, yyrt3734 = z.DecInferLen(yyl3734, z.DecBasicHandle().MaxInitLen, 64) + if yyrt3734 { + if yyrl3734 <= cap(yyv3734) { + yyv3734 = yyv3734[:yyrl3734] + } else { + yyv3734 = make([]ComponentCondition, yyrl3734) + } + } else { + yyv3734 = make([]ComponentCondition, yyrl3734) + } + yyc3734 = true + yyrr3734 = len(yyv3734) + if yyrg3734 { + copy(yyv3734, yyv23734) + } + } else if yyl3734 != len(yyv3734) { + yyv3734 = yyv3734[:yyl3734] + yyc3734 = true + } + yyj3734 := 0 + for ; yyj3734 < yyrr3734; yyj3734++ { + yyh3734.ElemContainerState(yyj3734) + if r.TryDecodeAsNil() { + yyv3734[yyj3734] = ComponentCondition{} + } else { + yyv3735 := &yyv3734[yyj3734] + yyv3735.CodecDecodeSelf(d) + } + + } + if yyrt3734 { + for ; yyj3734 < yyl3734; yyj3734++ { + yyv3734 = append(yyv3734, ComponentCondition{}) + yyh3734.ElemContainerState(yyj3734) + if r.TryDecodeAsNil() { + yyv3734[yyj3734] = ComponentCondition{} + } else { + yyv3736 := &yyv3734[yyj3734] + yyv3736.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3734 := 0 + for ; !r.CheckBreak(); yyj3734++ { + + if yyj3734 >= len(yyv3734) { + yyv3734 = append(yyv3734, ComponentCondition{}) // var yyz3734 ComponentCondition + yyc3734 = true + } + yyh3734.ElemContainerState(yyj3734) + if yyj3734 < len(yyv3734) { + if r.TryDecodeAsNil() { + yyv3734[yyj3734] = ComponentCondition{} + } else { + yyv3737 := &yyv3734[yyj3734] + yyv3737.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3734 < len(yyv3734) { + yyv3734 = yyv3734[:yyj3734] + yyc3734 = true + } else if yyj3734 == 0 && yyv3734 == nil { + yyv3734 = []ComponentCondition{} + yyc3734 = true + } + } + yyh3734.End() + if yyc3734 { + *v = yyv3734 + } +} + +func (x codecSelfer1234) encSliceComponentStatus(v []ComponentStatus, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv3738 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy3739 := &yyv3738 + yy3739.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv3740 := *v + yyh3740, yyl3740 := z.DecSliceHelperStart() + var yyc3740 bool + if yyl3740 == 0 { + if yyv3740 == nil { + yyv3740 = []ComponentStatus{} + yyc3740 = true + } else if len(yyv3740) != 0 { + yyv3740 = yyv3740[:0] + yyc3740 = true + } + } else if yyl3740 > 0 { + var yyrr3740, yyrl3740 int + var yyrt3740 bool + if yyl3740 > cap(yyv3740) { + + yyrg3740 := len(yyv3740) > 0 + yyv23740 := yyv3740 + yyrl3740, yyrt3740 = z.DecInferLen(yyl3740, z.DecBasicHandle().MaxInitLen, 216) + if yyrt3740 { + if yyrl3740 <= cap(yyv3740) { + yyv3740 = yyv3740[:yyrl3740] + } else { + yyv3740 = make([]ComponentStatus, yyrl3740) + } + } else { + yyv3740 = make([]ComponentStatus, yyrl3740) + } + yyc3740 = true + yyrr3740 = len(yyv3740) + if yyrg3740 { + copy(yyv3740, yyv23740) + } + } else if yyl3740 != len(yyv3740) { + yyv3740 = yyv3740[:yyl3740] + yyc3740 = true + } + yyj3740 := 0 + for ; yyj3740 < yyrr3740; yyj3740++ { + yyh3740.ElemContainerState(yyj3740) + if r.TryDecodeAsNil() { + yyv3740[yyj3740] = ComponentStatus{} + } else { + yyv3741 := &yyv3740[yyj3740] + yyv3741.CodecDecodeSelf(d) + } + + } + if yyrt3740 { + for ; yyj3740 < yyl3740; yyj3740++ { + yyv3740 = append(yyv3740, ComponentStatus{}) + yyh3740.ElemContainerState(yyj3740) + if r.TryDecodeAsNil() { + yyv3740[yyj3740] = ComponentStatus{} + } else { + yyv3742 := &yyv3740[yyj3740] + yyv3742.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj3740 := 0 + for ; !r.CheckBreak(); yyj3740++ { + + if yyj3740 >= len(yyv3740) { + yyv3740 = append(yyv3740, ComponentStatus{}) // var yyz3740 ComponentStatus + yyc3740 = true + } + yyh3740.ElemContainerState(yyj3740) + if yyj3740 < len(yyv3740) { + if r.TryDecodeAsNil() { + yyv3740[yyj3740] = ComponentStatus{} + } else { + yyv3743 := &yyv3740[yyj3740] + yyv3743.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj3740 < len(yyv3740) { + yyv3740 = yyv3740[:yyj3740] + yyc3740 = true + } else if yyj3740 == 0 && yyv3740 == nil { + yyv3740 = []ComponentStatus{} + yyc3740 = true + } + } + yyh3740.End() + if yyc3740 { + *v = yyv3740 + } +} diff --git a/pkg/api/types.go b/pkg/api/types.go index 34d3e86cd1d..292458f5f6a 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -19,6 +19,8 @@ package api import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/intstr" @@ -1647,6 +1649,23 @@ type DeleteOptions struct { GracePeriodSeconds *int64 `json:"gracePeriodSeconds"` } +// ListOptions is the query options to a standard REST list call, and has future support for +// watch calls. +type ListOptions struct { + unversioned.TypeMeta `json:",inline"` + + // A selector based on labels + LabelSelector labels.Selector + // A selector based on fields + FieldSelector fields.Selector + // If true, watch for changes to this list + Watch bool + // The resource version to watch (no effect on list yet) + ResourceVersion string + // Timeout for the list/watch call. + TimeoutSeconds *int64 +} + // PodLogOptions is the query options for a Pod's logs REST call type PodLogOptions struct { unversioned.TypeMeta diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index fdef3cdc910..71e4b1f0b32 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -23,7 +23,6 @@ import ( api "k8s.io/kubernetes/pkg/api" resource "k8s.io/kubernetes/pkg/api/resource" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" conversion "k8s.io/kubernetes/pkg/conversion" ) @@ -1116,6 +1115,34 @@ func convert_api_List_To_v1_List(in *api.List, out *List, s conversion.Scope) er return autoconvert_api_List_To_v1_List(in, out, s) } +func autoconvert_api_ListOptions_To_v1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*api.ListOptions))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.LabelSelector, &out.LabelSelector, 0); err != nil { + return err + } + if err := s.Convert(&in.FieldSelector, &out.FieldSelector, 0); err != nil { + return err + } + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + return nil +} + +func convert_api_ListOptions_To_v1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { + return autoconvert_api_ListOptions_To_v1_ListOptions(in, out, s) +} + func autoconvert_api_LoadBalancerIngress_To_v1_LoadBalancerIngress(in *api.LoadBalancerIngress, out *LoadBalancerIngress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*api.LoadBalancerIngress))(in) @@ -3026,34 +3053,6 @@ func convert_api_VolumeSource_To_v1_VolumeSource(in *api.VolumeSource, out *Volu return autoconvert_api_VolumeSource_To_v1_VolumeSource(in, out, s) } -func autoconvert_unversioned_ListOptions_To_v1_ListOptions(in *unversioned.ListOptions, out *ListOptions, s conversion.Scope) error { - if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*unversioned.ListOptions))(in) - } - if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { - return err - } - if err := s.Convert(&in.LabelSelector, &out.LabelSelector, 0); err != nil { - return err - } - if err := s.Convert(&in.FieldSelector, &out.FieldSelector, 0); err != nil { - return err - } - out.Watch = in.Watch - out.ResourceVersion = in.ResourceVersion - if in.TimeoutSeconds != nil { - out.TimeoutSeconds = new(int64) - *out.TimeoutSeconds = *in.TimeoutSeconds - } else { - out.TimeoutSeconds = nil - } - return nil -} - -func convert_unversioned_ListOptions_To_v1_ListOptions(in *unversioned.ListOptions, out *ListOptions, s conversion.Scope) error { - return autoconvert_unversioned_ListOptions_To_v1_ListOptions(in, out, s) -} - func autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource(in *AWSElasticBlockStoreVolumeSource, out *api.AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*AWSElasticBlockStoreVolumeSource))(in) @@ -4143,7 +4142,7 @@ func convert_v1_List_To_api_List(in *List, out *api.List, s conversion.Scope) er return autoconvert_v1_List_To_api_List(in, out, s) } -func autoconvert_v1_ListOptions_To_unversioned_ListOptions(in *ListOptions, out *unversioned.ListOptions, s conversion.Scope) error { +func autoconvert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ListOptions))(in) } @@ -4167,8 +4166,8 @@ func autoconvert_v1_ListOptions_To_unversioned_ListOptions(in *ListOptions, out return nil } -func convert_v1_ListOptions_To_unversioned_ListOptions(in *ListOptions, out *unversioned.ListOptions, s conversion.Scope) error { - return autoconvert_v1_ListOptions_To_unversioned_ListOptions(in, out, s) +func convert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { + return autoconvert_v1_ListOptions_To_api_ListOptions(in, out, s) } func autoconvert_v1_LoadBalancerIngress_To_api_LoadBalancerIngress(in *LoadBalancerIngress, out *api.LoadBalancerIngress, s conversion.Scope) error { @@ -6131,6 +6130,7 @@ func init() { autoconvert_api_LimitRangeList_To_v1_LimitRangeList, autoconvert_api_LimitRangeSpec_To_v1_LimitRangeSpec, autoconvert_api_LimitRange_To_v1_LimitRange, + autoconvert_api_ListOptions_To_v1_ListOptions, autoconvert_api_List_To_v1_List, autoconvert_api_LoadBalancerIngress_To_v1_LoadBalancerIngress, autoconvert_api_LoadBalancerStatus_To_v1_LoadBalancerStatus, @@ -6203,7 +6203,6 @@ func init() { autoconvert_api_VolumeMount_To_v1_VolumeMount, autoconvert_api_VolumeSource_To_v1_VolumeSource, autoconvert_api_Volume_To_v1_Volume, - autoconvert_unversioned_ListOptions_To_v1_ListOptions, autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource, autoconvert_v1_Binding_To_api_Binding, autoconvert_v1_Capabilities_To_api_Capabilities, @@ -6249,7 +6248,7 @@ func init() { autoconvert_v1_LimitRangeList_To_api_LimitRangeList, autoconvert_v1_LimitRangeSpec_To_api_LimitRangeSpec, autoconvert_v1_LimitRange_To_api_LimitRange, - autoconvert_v1_ListOptions_To_unversioned_ListOptions, + autoconvert_v1_ListOptions_To_api_ListOptions, autoconvert_v1_List_To_api_List, autoconvert_v1_LoadBalancerIngress_To_api_LoadBalancerIngress, autoconvert_v1_LoadBalancerStatus_To_api_LoadBalancerStatus, diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index 8032b5b4c9f..f56dc7537c3 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -61,11 +61,8 @@ func addKnownTypes() { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, + &api.ListOptions{}, ) - - // Register Unversioned types - // TODO this should not be done here - api.Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.ListOptions{}) } func (*ClusterAutoscaler) IsAnAPIObject() {} diff --git a/pkg/apis/extensions/v1beta1/conversion_generated.go b/pkg/apis/extensions/v1beta1/conversion_generated.go index a6bae192a58..82ebd876a01 100644 --- a/pkg/apis/extensions/v1beta1/conversion_generated.go +++ b/pkg/apis/extensions/v1beta1/conversion_generated.go @@ -527,6 +527,34 @@ func convert_api_Lifecycle_To_v1_Lifecycle(in *api.Lifecycle, out *v1.Lifecycle, return autoconvert_api_Lifecycle_To_v1_Lifecycle(in, out, s) } +func autoconvert_api_ListOptions_To_v1beta1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*api.ListOptions))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.LabelSelector, &out.LabelSelector, 0); err != nil { + return err + } + if err := s.Convert(&in.FieldSelector, &out.FieldSelector, 0); err != nil { + return err + } + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + return nil +} + +func convert_api_ListOptions_To_v1beta1_ListOptions(in *api.ListOptions, out *ListOptions, s conversion.Scope) error { + return autoconvert_api_ListOptions_To_v1beta1_ListOptions(in, out, s) +} + func autoconvert_api_LoadBalancerIngress_To_v1_LoadBalancerIngress(in *api.LoadBalancerIngress, out *v1.LoadBalancerIngress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*api.LoadBalancerIngress))(in) @@ -3895,6 +3923,34 @@ func convert_v1beta1_LabelSelectorRequirement_To_extensions_LabelSelectorRequire return autoconvert_v1beta1_LabelSelectorRequirement_To_extensions_LabelSelectorRequirement(in, out, s) } +func autoconvert_v1beta1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*ListOptions))(in) + } + if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { + return err + } + if err := s.Convert(&in.LabelSelector, &out.LabelSelector, 0); err != nil { + return err + } + if err := s.Convert(&in.FieldSelector, &out.FieldSelector, 0); err != nil { + return err + } + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + return nil +} + +func convert_v1beta1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.ListOptions, s conversion.Scope) error { + return autoconvert_v1beta1_ListOptions_To_api_ListOptions(in, out, s) +} + func autoconvert_v1beta1_NodeUtilization_To_extensions_NodeUtilization(in *NodeUtilization, out *extensions.NodeUtilization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeUtilization))(in) @@ -4128,6 +4184,7 @@ func init() { autoconvert_api_HostPathVolumeSource_To_v1_HostPathVolumeSource, autoconvert_api_ISCSIVolumeSource_To_v1_ISCSIVolumeSource, autoconvert_api_Lifecycle_To_v1_Lifecycle, + autoconvert_api_ListOptions_To_v1beta1_ListOptions, autoconvert_api_LoadBalancerIngress_To_v1_LoadBalancerIngress, autoconvert_api_LoadBalancerStatus_To_v1_LoadBalancerStatus, autoconvert_api_LocalObjectReference_To_v1_LocalObjectReference, @@ -4266,6 +4323,7 @@ func init() { autoconvert_v1beta1_Job_To_extensions_Job, autoconvert_v1beta1_LabelSelectorRequirement_To_extensions_LabelSelectorRequirement, autoconvert_v1beta1_LabelSelector_To_extensions_LabelSelector, + autoconvert_v1beta1_ListOptions_To_api_ListOptions, autoconvert_v1beta1_NodeUtilization_To_extensions_NodeUtilization, autoconvert_v1beta1_ReplicationControllerDummy_To_extensions_ReplicationControllerDummy, autoconvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment, diff --git a/pkg/apis/extensions/v1beta1/deep_copy_generated.go b/pkg/apis/extensions/v1beta1/deep_copy_generated.go index 6eeac6a1cb3..e92b0a23e3e 100644 --- a/pkg/apis/extensions/v1beta1/deep_copy_generated.go +++ b/pkg/apis/extensions/v1beta1/deep_copy_generated.go @@ -1440,6 +1440,23 @@ func deepCopy_v1beta1_LabelSelectorRequirement(in LabelSelectorRequirement, out return nil } +func deepCopy_v1beta1_ListOptions(in ListOptions, out *ListOptions, c *conversion.Cloner) error { + if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { + return err + } + out.LabelSelector = in.LabelSelector + out.FieldSelector = in.FieldSelector + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + out.TimeoutSeconds = new(int64) + *out.TimeoutSeconds = *in.TimeoutSeconds + } else { + out.TimeoutSeconds = nil + } + return nil +} + func deepCopy_v1beta1_NodeUtilization(in NodeUtilization, out *NodeUtilization, c *conversion.Cloner) error { out.Resource = in.Resource out.Value = in.Value @@ -1684,6 +1701,7 @@ func init() { deepCopy_v1beta1_JobStatus, deepCopy_v1beta1_LabelSelector, deepCopy_v1beta1_LabelSelectorRequirement, + deepCopy_v1beta1_ListOptions, deepCopy_v1beta1_NodeUtilization, deepCopy_v1beta1_ReplicationControllerDummy, deepCopy_v1beta1_RollingUpdateDeployment, diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index 547283b3d71..583df8bd1bf 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -54,11 +54,8 @@ func addKnownTypes() { &ThirdPartyResourceDataList{}, &Ingress{}, &IngressList{}, + &ListOptions{}, ) - - // Register Unversioned types - // TODO this should not be done here - api.Scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.ListOptions{}) } func (*ClusterAutoscaler) IsAnAPIObject() {} @@ -79,3 +76,4 @@ func (*ThirdPartyResourceData) IsAnAPIObject() {} func (*ThirdPartyResourceDataList) IsAnAPIObject() {} func (*Ingress) IsAnAPIObject() {} func (*IngressList) IsAnAPIObject() {} +func (*ListOptions) IsAnAPIObject() {} diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 9f6cfd7fbd0..d1dc0ec124d 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -12988,7 +12988,7 @@ func (x *ClusterAutoscalerList) codecDecodeSelfFromArray(l int, d *codec1978.Dec z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x *LabelSelector) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -13002,14 +13002,19 @@ func (x *LabelSelector) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep1083 := !z.EncBinary() yy2arr1083 := z.EncBasicHandle().StructToArray - var yyq1083 [2]bool + var yyq1083 [7]bool _, _, _ = yysep1083, yyq1083, yy2arr1083 const yyr1083 bool = false - yyq1083[0] = len(x.MatchLabels) != 0 - yyq1083[1] = len(x.MatchExpressions) != 0 + yyq1083[0] = x.Kind != "" + yyq1083[1] = x.APIVersion != "" + yyq1083[2] = x.LabelSelector != "" + yyq1083[3] = x.FieldSelector != "" + yyq1083[4] = x.Watch != false + yyq1083[5] = x.ResourceVersion != "" + yyq1083[6] = x.TimeoutSeconds != nil var yynn1083 int if yyr1083 || yy2arr1083 { - r.EncodeArrayStart(2) + r.EncodeArrayStart(7) } else { yynn1083 = 0 for _, b := range yyq1083 { @@ -13023,65 +13028,184 @@ func (x *LabelSelector) CodecEncodeSelf(e *codec1978.Encoder) { if yyr1083 || yy2arr1083 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq1083[0] { - if x.MatchLabels == nil { - r.EncodeNil() + yym1085 := z.EncBinary() + _ = yym1085 + if false { } else { - yym1085 := z.EncBinary() - _ = yym1085 - if false { - } else { - z.F.EncMapStringStringV(x.MatchLabels, false, e) - } + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } else { - r.EncodeNil() + r.EncodeString(codecSelferC_UTF81234, "") } } else { if yyq1083[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("matchLabels")) + r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.MatchLabels == nil { - r.EncodeNil() + yym1086 := z.EncBinary() + _ = yym1086 + if false { } else { - yym1086 := z.EncBinary() - _ = yym1086 - if false { - } else { - z.F.EncMapStringStringV(x.MatchLabels, false, e) - } + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } if yyr1083 || yy2arr1083 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq1083[1] { - if x.MatchExpressions == nil { + yym1088 := z.EncBinary() + _ = yym1088 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq1083[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1089 := z.EncBinary() + _ = yym1089 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } + } + if yyr1083 || yy2arr1083 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1083[2] { + yym1091 := z.EncBinary() + _ = yym1091 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.LabelSelector)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq1083[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("labelSelector")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1092 := z.EncBinary() + _ = yym1092 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.LabelSelector)) + } + } + } + if yyr1083 || yy2arr1083 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1083[3] { + yym1094 := z.EncBinary() + _ = yym1094 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.FieldSelector)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq1083[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("fieldSelector")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1095 := z.EncBinary() + _ = yym1095 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.FieldSelector)) + } + } + } + if yyr1083 || yy2arr1083 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1083[4] { + yym1097 := z.EncBinary() + _ = yym1097 + if false { + } else { + r.EncodeBool(bool(x.Watch)) + } + } else { + r.EncodeBool(false) + } + } else { + if yyq1083[4] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("watch")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1098 := z.EncBinary() + _ = yym1098 + if false { + } else { + r.EncodeBool(bool(x.Watch)) + } + } + } + if yyr1083 || yy2arr1083 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1083[5] { + yym1100 := z.EncBinary() + _ = yym1100 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq1083[5] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("resourceVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1101 := z.EncBinary() + _ = yym1101 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) + } + } + } + if yyr1083 || yy2arr1083 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1083[6] { + if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yym1088 := z.EncBinary() - _ = yym1088 + yy1103 := *x.TimeoutSeconds + yym1104 := z.EncBinary() + _ = yym1104 if false { } else { - h.encSliceLabelSelectorRequirement(([]LabelSelectorRequirement)(x.MatchExpressions), e) + r.EncodeInt(int64(yy1103)) } } } else { r.EncodeNil() } } else { - if yyq1083[1] { + if yyq1083[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("matchExpressions")) + r.EncodeString(codecSelferC_UTF81234, string("timeoutSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.MatchExpressions == nil { + if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yym1089 := z.EncBinary() - _ = yym1089 + yy1105 := *x.TimeoutSeconds + yym1106 := z.EncBinary() + _ = yym1106 if false { } else { - h.encSliceLabelSelectorRequirement(([]LabelSelectorRequirement)(x.MatchExpressions), e) + r.EncodeInt(int64(yy1105)) } } } @@ -13095,29 +13219,29 @@ func (x *LabelSelector) CodecEncodeSelf(e *codec1978.Encoder) { } } -func (x *LabelSelector) CodecDecodeSelf(d *codec1978.Decoder) { +func (x *ListOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1090 := z.DecBinary() - _ = yym1090 + yym1107 := z.DecBinary() + _ = yym1107 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1091 := r.ContainerType() - if yyct1091 == codecSelferValueTypeMap1234 { - yyl1091 := r.ReadMapStart() - if yyl1091 == 0 { + yyct1108 := r.ContainerType() + if yyct1108 == codecSelferValueTypeMap1234 { + yyl1108 := r.ReadMapStart() + if yyl1108 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1091, d) + x.codecDecodeSelfFromMap(yyl1108, d) } - } else if yyct1091 == codecSelferValueTypeArray1234 { - yyl1091 := r.ReadArrayStart() - if yyl1091 == 0 { + } else if yyct1108 == codecSelferValueTypeArray1234 { + yyl1108 := r.ReadArrayStart() + if yyl1108 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1091, d) + x.codecDecodeSelfFromArray(yyl1108, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -13125,16 +13249,16 @@ func (x *LabelSelector) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *LabelSelector) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1092Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1092Slc - var yyhl1092 bool = l >= 0 - for yyj1092 := 0; ; yyj1092++ { - if yyhl1092 { - if yyj1092 >= l { + var yys1109Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1109Slc + var yyhl1109 bool = l >= 0 + for yyj1109 := 0; ; yyj1109++ { + if yyhl1109 { + if yyj1109 >= l { break } } else { @@ -13143,293 +13267,70 @@ func (x *LabelSelector) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1092Slc = r.DecodeBytes(yys1092Slc, true, true) - yys1092 := string(yys1092Slc) + yys1109Slc = r.DecodeBytes(yys1109Slc, true, true) + yys1109 := string(yys1109Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1092 { - case "matchLabels": + switch yys1109 { + case "kind": if r.TryDecodeAsNil() { - x.MatchLabels = nil + x.Kind = "" } else { - yyv1093 := &x.MatchLabels - yym1094 := z.DecBinary() - _ = yym1094 - if false { - } else { - z.F.DecMapStringStringX(yyv1093, false, d) - } + x.Kind = string(r.DecodeString()) } - case "matchExpressions": + case "apiVersion": if r.TryDecodeAsNil() { - x.MatchExpressions = nil + x.APIVersion = "" } else { - yyv1095 := &x.MatchExpressions - yym1096 := z.DecBinary() - _ = yym1096 - if false { - } else { - h.decSliceLabelSelectorRequirement((*[]LabelSelectorRequirement)(yyv1095), d) - } + x.APIVersion = string(r.DecodeString()) } - default: - z.DecStructFieldNotFound(-1, yys1092) - } // end switch yys1092 - } // end for yyj1092 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *LabelSelector) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj1097 int - var yyb1097 bool - var yyhl1097 bool = l >= 0 - yyj1097++ - if yyhl1097 { - yyb1097 = yyj1097 > l - } else { - yyb1097 = r.CheckBreak() - } - if yyb1097 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MatchLabels = nil - } else { - yyv1098 := &x.MatchLabels - yym1099 := z.DecBinary() - _ = yym1099 - if false { - } else { - z.F.DecMapStringStringX(yyv1098, false, d) - } - } - yyj1097++ - if yyhl1097 { - yyb1097 = yyj1097 > l - } else { - yyb1097 = r.CheckBreak() - } - if yyb1097 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MatchExpressions = nil - } else { - yyv1100 := &x.MatchExpressions - yym1101 := z.DecBinary() - _ = yym1101 - if false { - } else { - h.decSliceLabelSelectorRequirement((*[]LabelSelectorRequirement)(yyv1100), d) - } - } - for { - yyj1097++ - if yyhl1097 { - yyb1097 = yyj1097 > l - } else { - yyb1097 = r.CheckBreak() - } - if yyb1097 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1097-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *LabelSelectorRequirement) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym1102 := z.EncBinary() - _ = yym1102 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep1103 := !z.EncBinary() - yy2arr1103 := z.EncBasicHandle().StructToArray - var yyq1103 [3]bool - _, _, _ = yysep1103, yyq1103, yy2arr1103 - const yyr1103 bool = false - yyq1103[2] = len(x.Values) != 0 - var yynn1103 int - if yyr1103 || yy2arr1103 { - r.EncodeArrayStart(3) - } else { - yynn1103 = 2 - for _, b := range yyq1103 { - if b { - yynn1103++ - } - } - r.EncodeMapStart(yynn1103) - yynn1103 = 0 - } - if yyr1103 || yy2arr1103 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1105 := z.EncBinary() - _ = yym1105 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Key)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("key")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1106 := z.EncBinary() - _ = yym1106 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Key)) - } - } - if yyr1103 || yy2arr1103 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - x.Operator.CodecEncodeSelf(e) - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("operator")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - x.Operator.CodecEncodeSelf(e) - } - if yyr1103 || yy2arr1103 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1103[2] { - if x.Values == nil { - r.EncodeNil() - } else { - yym1109 := z.EncBinary() - _ = yym1109 - if false { - } else { - z.F.EncSliceStringV(x.Values, false, e) - } - } - } else { - r.EncodeNil() - } - } else { - if yyq1103[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("values")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Values == nil { - r.EncodeNil() - } else { - yym1110 := z.EncBinary() - _ = yym1110 - if false { - } else { - z.F.EncSliceStringV(x.Values, false, e) - } - } - } - } - if yyr1103 || yy2arr1103 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *LabelSelectorRequirement) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym1111 := z.DecBinary() - _ = yym1111 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct1112 := r.ContainerType() - if yyct1112 == codecSelferValueTypeMap1234 { - yyl1112 := r.ReadMapStart() - if yyl1112 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl1112, d) - } - } else if yyct1112 == codecSelferValueTypeArray1234 { - yyl1112 := r.ReadArrayStart() - if yyl1112 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl1112, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *LabelSelectorRequirement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys1113Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1113Slc - var yyhl1113 bool = l >= 0 - for yyj1113 := 0; ; yyj1113++ { - if yyhl1113 { - if yyj1113 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1113Slc = r.DecodeBytes(yys1113Slc, true, true) - yys1113 := string(yys1113Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1113 { - case "key": + case "labelSelector": if r.TryDecodeAsNil() { - x.Key = "" + x.LabelSelector = "" } else { - x.Key = string(r.DecodeString()) + x.LabelSelector = string(r.DecodeString()) } - case "operator": + case "fieldSelector": if r.TryDecodeAsNil() { - x.Operator = "" + x.FieldSelector = "" } else { - x.Operator = LabelSelectorOperator(r.DecodeString()) + x.FieldSelector = string(r.DecodeString()) } - case "values": + case "watch": if r.TryDecodeAsNil() { - x.Values = nil + x.Watch = false } else { - yyv1116 := &x.Values + x.Watch = bool(r.DecodeBool()) + } + case "resourceVersion": + if r.TryDecodeAsNil() { + x.ResourceVersion = "" + } else { + x.ResourceVersion = string(r.DecodeString()) + } + case "timeoutSeconds": + if r.TryDecodeAsNil() { + if x.TimeoutSeconds != nil { + x.TimeoutSeconds = nil + } + } else { + if x.TimeoutSeconds == nil { + x.TimeoutSeconds = new(int64) + } yym1117 := z.DecBinary() _ = yym1117 if false { } else { - z.F.DecSliceStringX(yyv1116, false, d) + *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys1113) - } // end switch yys1113 - } // end for yyj1113 + z.DecStructFieldNotFound(-1, yys1109) + } // end switch yys1109 + } // end for yyj1109 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } -func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { +func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -13448,9 +13349,9 @@ func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Key = "" + x.Kind = "" } else { - x.Key = string(r.DecodeString()) + x.Kind = string(r.DecodeString()) } yyj1118++ if yyhl1118 { @@ -13464,9 +13365,9 @@ func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Operator = "" + x.APIVersion = "" } else { - x.Operator = LabelSelectorOperator(r.DecodeString()) + x.APIVersion = string(r.DecodeString()) } yyj1118++ if yyhl1118 { @@ -13480,14 +13381,82 @@ func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Values = nil + x.LabelSelector = "" } else { - yyv1121 := &x.Values - yym1122 := z.DecBinary() - _ = yym1122 + x.LabelSelector = string(r.DecodeString()) + } + yyj1118++ + if yyhl1118 { + yyb1118 = yyj1118 > l + } else { + yyb1118 = r.CheckBreak() + } + if yyb1118 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.FieldSelector = "" + } else { + x.FieldSelector = string(r.DecodeString()) + } + yyj1118++ + if yyhl1118 { + yyb1118 = yyj1118 > l + } else { + yyb1118 = r.CheckBreak() + } + if yyb1118 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Watch = false + } else { + x.Watch = bool(r.DecodeBool()) + } + yyj1118++ + if yyhl1118 { + yyb1118 = yyj1118 > l + } else { + yyb1118 = r.CheckBreak() + } + if yyb1118 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ResourceVersion = "" + } else { + x.ResourceVersion = string(r.DecodeString()) + } + yyj1118++ + if yyhl1118 { + yyb1118 = yyj1118 > l + } else { + yyb1118 = r.CheckBreak() + } + if yyb1118 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.TimeoutSeconds != nil { + x.TimeoutSeconds = nil + } + } else { + if x.TimeoutSeconds == nil { + x.TimeoutSeconds = new(int64) + } + yym1126 := z.DecBinary() + _ = yym1126 if false { } else { - z.F.DecSliceStringX(yyv1121, false, d) + *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } for { @@ -13506,12 +13475,530 @@ func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978. z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } +func (x *LabelSelector) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym1127 := z.EncBinary() + _ = yym1127 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep1128 := !z.EncBinary() + yy2arr1128 := z.EncBasicHandle().StructToArray + var yyq1128 [2]bool + _, _, _ = yysep1128, yyq1128, yy2arr1128 + const yyr1128 bool = false + yyq1128[0] = len(x.MatchLabels) != 0 + yyq1128[1] = len(x.MatchExpressions) != 0 + var yynn1128 int + if yyr1128 || yy2arr1128 { + r.EncodeArrayStart(2) + } else { + yynn1128 = 0 + for _, b := range yyq1128 { + if b { + yynn1128++ + } + } + r.EncodeMapStart(yynn1128) + yynn1128 = 0 + } + if yyr1128 || yy2arr1128 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1128[0] { + if x.MatchLabels == nil { + r.EncodeNil() + } else { + yym1130 := z.EncBinary() + _ = yym1130 + if false { + } else { + z.F.EncMapStringStringV(x.MatchLabels, false, e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq1128[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("matchLabels")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MatchLabels == nil { + r.EncodeNil() + } else { + yym1131 := z.EncBinary() + _ = yym1131 + if false { + } else { + z.F.EncMapStringStringV(x.MatchLabels, false, e) + } + } + } + } + if yyr1128 || yy2arr1128 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1128[1] { + if x.MatchExpressions == nil { + r.EncodeNil() + } else { + yym1133 := z.EncBinary() + _ = yym1133 + if false { + } else { + h.encSliceLabelSelectorRequirement(([]LabelSelectorRequirement)(x.MatchExpressions), e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq1128[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("matchExpressions")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MatchExpressions == nil { + r.EncodeNil() + } else { + yym1134 := z.EncBinary() + _ = yym1134 + if false { + } else { + h.encSliceLabelSelectorRequirement(([]LabelSelectorRequirement)(x.MatchExpressions), e) + } + } + } + } + if yyr1128 || yy2arr1128 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LabelSelector) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym1135 := z.DecBinary() + _ = yym1135 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct1136 := r.ContainerType() + if yyct1136 == codecSelferValueTypeMap1234 { + yyl1136 := r.ReadMapStart() + if yyl1136 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl1136, d) + } + } else if yyct1136 == codecSelferValueTypeArray1234 { + yyl1136 := r.ReadArrayStart() + if yyl1136 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl1136, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *LabelSelector) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys1137Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1137Slc + var yyhl1137 bool = l >= 0 + for yyj1137 := 0; ; yyj1137++ { + if yyhl1137 { + if yyj1137 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys1137Slc = r.DecodeBytes(yys1137Slc, true, true) + yys1137 := string(yys1137Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys1137 { + case "matchLabels": + if r.TryDecodeAsNil() { + x.MatchLabels = nil + } else { + yyv1138 := &x.MatchLabels + yym1139 := z.DecBinary() + _ = yym1139 + if false { + } else { + z.F.DecMapStringStringX(yyv1138, false, d) + } + } + case "matchExpressions": + if r.TryDecodeAsNil() { + x.MatchExpressions = nil + } else { + yyv1140 := &x.MatchExpressions + yym1141 := z.DecBinary() + _ = yym1141 + if false { + } else { + h.decSliceLabelSelectorRequirement((*[]LabelSelectorRequirement)(yyv1140), d) + } + } + default: + z.DecStructFieldNotFound(-1, yys1137) + } // end switch yys1137 + } // end for yyj1137 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *LabelSelector) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj1142 int + var yyb1142 bool + var yyhl1142 bool = l >= 0 + yyj1142++ + if yyhl1142 { + yyb1142 = yyj1142 > l + } else { + yyb1142 = r.CheckBreak() + } + if yyb1142 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.MatchLabels = nil + } else { + yyv1143 := &x.MatchLabels + yym1144 := z.DecBinary() + _ = yym1144 + if false { + } else { + z.F.DecMapStringStringX(yyv1143, false, d) + } + } + yyj1142++ + if yyhl1142 { + yyb1142 = yyj1142 > l + } else { + yyb1142 = r.CheckBreak() + } + if yyb1142 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.MatchExpressions = nil + } else { + yyv1145 := &x.MatchExpressions + yym1146 := z.DecBinary() + _ = yym1146 + if false { + } else { + h.decSliceLabelSelectorRequirement((*[]LabelSelectorRequirement)(yyv1145), d) + } + } + for { + yyj1142++ + if yyhl1142 { + yyb1142 = yyj1142 > l + } else { + yyb1142 = r.CheckBreak() + } + if yyb1142 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj1142-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *LabelSelectorRequirement) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym1147 := z.EncBinary() + _ = yym1147 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep1148 := !z.EncBinary() + yy2arr1148 := z.EncBasicHandle().StructToArray + var yyq1148 [3]bool + _, _, _ = yysep1148, yyq1148, yy2arr1148 + const yyr1148 bool = false + yyq1148[2] = len(x.Values) != 0 + var yynn1148 int + if yyr1148 || yy2arr1148 { + r.EncodeArrayStart(3) + } else { + yynn1148 = 2 + for _, b := range yyq1148 { + if b { + yynn1148++ + } + } + r.EncodeMapStart(yynn1148) + yynn1148 = 0 + } + if yyr1148 || yy2arr1148 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1150 := z.EncBinary() + _ = yym1150 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Key)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("key")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym1151 := z.EncBinary() + _ = yym1151 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Key)) + } + } + if yyr1148 || yy2arr1148 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + x.Operator.CodecEncodeSelf(e) + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("operator")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + x.Operator.CodecEncodeSelf(e) + } + if yyr1148 || yy2arr1148 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq1148[2] { + if x.Values == nil { + r.EncodeNil() + } else { + yym1154 := z.EncBinary() + _ = yym1154 + if false { + } else { + z.F.EncSliceStringV(x.Values, false, e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq1148[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("values")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Values == nil { + r.EncodeNil() + } else { + yym1155 := z.EncBinary() + _ = yym1155 + if false { + } else { + z.F.EncSliceStringV(x.Values, false, e) + } + } + } + } + if yyr1148 || yy2arr1148 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LabelSelectorRequirement) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym1156 := z.DecBinary() + _ = yym1156 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct1157 := r.ContainerType() + if yyct1157 == codecSelferValueTypeMap1234 { + yyl1157 := r.ReadMapStart() + if yyl1157 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl1157, d) + } + } else if yyct1157 == codecSelferValueTypeArray1234 { + yyl1157 := r.ReadArrayStart() + if yyl1157 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl1157, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *LabelSelectorRequirement) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys1158Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1158Slc + var yyhl1158 bool = l >= 0 + for yyj1158 := 0; ; yyj1158++ { + if yyhl1158 { + if yyj1158 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys1158Slc = r.DecodeBytes(yys1158Slc, true, true) + yys1158 := string(yys1158Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys1158 { + case "key": + if r.TryDecodeAsNil() { + x.Key = "" + } else { + x.Key = string(r.DecodeString()) + } + case "operator": + if r.TryDecodeAsNil() { + x.Operator = "" + } else { + x.Operator = LabelSelectorOperator(r.DecodeString()) + } + case "values": + if r.TryDecodeAsNil() { + x.Values = nil + } else { + yyv1161 := &x.Values + yym1162 := z.DecBinary() + _ = yym1162 + if false { + } else { + z.F.DecSliceStringX(yyv1161, false, d) + } + } + default: + z.DecStructFieldNotFound(-1, yys1158) + } // end switch yys1158 + } // end for yyj1158 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *LabelSelectorRequirement) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj1163 int + var yyb1163 bool + var yyhl1163 bool = l >= 0 + yyj1163++ + if yyhl1163 { + yyb1163 = yyj1163 > l + } else { + yyb1163 = r.CheckBreak() + } + if yyb1163 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Key = "" + } else { + x.Key = string(r.DecodeString()) + } + yyj1163++ + if yyhl1163 { + yyb1163 = yyj1163 > l + } else { + yyb1163 = r.CheckBreak() + } + if yyb1163 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Operator = "" + } else { + x.Operator = LabelSelectorOperator(r.DecodeString()) + } + yyj1163++ + if yyhl1163 { + yyb1163 = yyj1163 > l + } else { + yyb1163 = r.CheckBreak() + } + if yyb1163 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Values = nil + } else { + yyv1166 := &x.Values + yym1167 := z.DecBinary() + _ = yym1167 + if false { + } else { + z.F.DecSliceStringX(yyv1166, false, d) + } + } + for { + yyj1163++ + if yyhl1163 { + yyb1163 = yyj1163 > l + } else { + yyb1163 = r.CheckBreak() + } + if yyb1163 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj1163-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + func (x LabelSelectorOperator) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1123 := z.EncBinary() - _ = yym1123 + yym1168 := z.EncBinary() + _ = yym1168 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -13523,8 +14010,8 @@ func (x *LabelSelectorOperator) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1124 := z.DecBinary() - _ = yym1124 + yym1169 := z.DecBinary() + _ = yym1169 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -13537,10 +14024,10 @@ func (x codecSelfer1234) encSliceHorizontalPodAutoscaler(v []HorizontalPodAutosc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1125 := range v { + for _, yyv1170 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1126 := &yyv1125 - yy1126.CodecEncodeSelf(e) + yy1171 := &yyv1170 + yy1171.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -13550,83 +14037,83 @@ func (x codecSelfer1234) decSliceHorizontalPodAutoscaler(v *[]HorizontalPodAutos z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1127 := *v - yyh1127, yyl1127 := z.DecSliceHelperStart() - var yyc1127 bool - if yyl1127 == 0 { - if yyv1127 == nil { - yyv1127 = []HorizontalPodAutoscaler{} - yyc1127 = true - } else if len(yyv1127) != 0 { - yyv1127 = yyv1127[:0] - yyc1127 = true + yyv1172 := *v + yyh1172, yyl1172 := z.DecSliceHelperStart() + var yyc1172 bool + if yyl1172 == 0 { + if yyv1172 == nil { + yyv1172 = []HorizontalPodAutoscaler{} + yyc1172 = true + } else if len(yyv1172) != 0 { + yyv1172 = yyv1172[:0] + yyc1172 = true } - } else if yyl1127 > 0 { - var yyrr1127, yyrl1127 int - var yyrt1127 bool - if yyl1127 > cap(yyv1127) { + } else if yyl1172 > 0 { + var yyrr1172, yyrl1172 int + var yyrt1172 bool + if yyl1172 > cap(yyv1172) { - yyrg1127 := len(yyv1127) > 0 - yyv21127 := yyv1127 - yyrl1127, yyrt1127 = z.DecInferLen(yyl1127, z.DecBasicHandle().MaxInitLen, 312) - if yyrt1127 { - if yyrl1127 <= cap(yyv1127) { - yyv1127 = yyv1127[:yyrl1127] + yyrg1172 := len(yyv1172) > 0 + yyv21172 := yyv1172 + yyrl1172, yyrt1172 = z.DecInferLen(yyl1172, z.DecBasicHandle().MaxInitLen, 312) + if yyrt1172 { + if yyrl1172 <= cap(yyv1172) { + yyv1172 = yyv1172[:yyrl1172] } else { - yyv1127 = make([]HorizontalPodAutoscaler, yyrl1127) + yyv1172 = make([]HorizontalPodAutoscaler, yyrl1172) } } else { - yyv1127 = make([]HorizontalPodAutoscaler, yyrl1127) + yyv1172 = make([]HorizontalPodAutoscaler, yyrl1172) } - yyc1127 = true - yyrr1127 = len(yyv1127) - if yyrg1127 { - copy(yyv1127, yyv21127) + yyc1172 = true + yyrr1172 = len(yyv1172) + if yyrg1172 { + copy(yyv1172, yyv21172) } - } else if yyl1127 != len(yyv1127) { - yyv1127 = yyv1127[:yyl1127] - yyc1127 = true + } else if yyl1172 != len(yyv1172) { + yyv1172 = yyv1172[:yyl1172] + yyc1172 = true } - yyj1127 := 0 - for ; yyj1127 < yyrr1127; yyj1127++ { - yyh1127.ElemContainerState(yyj1127) + yyj1172 := 0 + for ; yyj1172 < yyrr1172; yyj1172++ { + yyh1172.ElemContainerState(yyj1172) if r.TryDecodeAsNil() { - yyv1127[yyj1127] = HorizontalPodAutoscaler{} + yyv1172[yyj1172] = HorizontalPodAutoscaler{} } else { - yyv1128 := &yyv1127[yyj1127] - yyv1128.CodecDecodeSelf(d) + yyv1173 := &yyv1172[yyj1172] + yyv1173.CodecDecodeSelf(d) } } - if yyrt1127 { - for ; yyj1127 < yyl1127; yyj1127++ { - yyv1127 = append(yyv1127, HorizontalPodAutoscaler{}) - yyh1127.ElemContainerState(yyj1127) + if yyrt1172 { + for ; yyj1172 < yyl1172; yyj1172++ { + yyv1172 = append(yyv1172, HorizontalPodAutoscaler{}) + yyh1172.ElemContainerState(yyj1172) if r.TryDecodeAsNil() { - yyv1127[yyj1127] = HorizontalPodAutoscaler{} + yyv1172[yyj1172] = HorizontalPodAutoscaler{} } else { - yyv1129 := &yyv1127[yyj1127] - yyv1129.CodecDecodeSelf(d) + yyv1174 := &yyv1172[yyj1172] + yyv1174.CodecDecodeSelf(d) } } } } else { - yyj1127 := 0 - for ; !r.CheckBreak(); yyj1127++ { + yyj1172 := 0 + for ; !r.CheckBreak(); yyj1172++ { - if yyj1127 >= len(yyv1127) { - yyv1127 = append(yyv1127, HorizontalPodAutoscaler{}) // var yyz1127 HorizontalPodAutoscaler - yyc1127 = true + if yyj1172 >= len(yyv1172) { + yyv1172 = append(yyv1172, HorizontalPodAutoscaler{}) // var yyz1172 HorizontalPodAutoscaler + yyc1172 = true } - yyh1127.ElemContainerState(yyj1127) - if yyj1127 < len(yyv1127) { + yyh1172.ElemContainerState(yyj1172) + if yyj1172 < len(yyv1172) { if r.TryDecodeAsNil() { - yyv1127[yyj1127] = HorizontalPodAutoscaler{} + yyv1172[yyj1172] = HorizontalPodAutoscaler{} } else { - yyv1130 := &yyv1127[yyj1127] - yyv1130.CodecDecodeSelf(d) + yyv1175 := &yyv1172[yyj1172] + yyv1175.CodecDecodeSelf(d) } } else { @@ -13634,17 +14121,17 @@ func (x codecSelfer1234) decSliceHorizontalPodAutoscaler(v *[]HorizontalPodAutos } } - if yyj1127 < len(yyv1127) { - yyv1127 = yyv1127[:yyj1127] - yyc1127 = true - } else if yyj1127 == 0 && yyv1127 == nil { - yyv1127 = []HorizontalPodAutoscaler{} - yyc1127 = true + if yyj1172 < len(yyv1172) { + yyv1172 = yyv1172[:yyj1172] + yyc1172 = true + } else if yyj1172 == 0 && yyv1172 == nil { + yyv1172 = []HorizontalPodAutoscaler{} + yyc1172 = true } } - yyh1127.End() - if yyc1127 { - *v = yyv1127 + yyh1172.End() + if yyc1172 { + *v = yyv1172 } } @@ -13653,10 +14140,10 @@ func (x codecSelfer1234) encSliceAPIVersion(v []APIVersion, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1131 := range v { + for _, yyv1176 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1132 := &yyv1131 - yy1132.CodecEncodeSelf(e) + yy1177 := &yyv1176 + yy1177.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -13666,83 +14153,83 @@ func (x codecSelfer1234) decSliceAPIVersion(v *[]APIVersion, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1133 := *v - yyh1133, yyl1133 := z.DecSliceHelperStart() - var yyc1133 bool - if yyl1133 == 0 { - if yyv1133 == nil { - yyv1133 = []APIVersion{} - yyc1133 = true - } else if len(yyv1133) != 0 { - yyv1133 = yyv1133[:0] - yyc1133 = true + yyv1178 := *v + yyh1178, yyl1178 := z.DecSliceHelperStart() + var yyc1178 bool + if yyl1178 == 0 { + if yyv1178 == nil { + yyv1178 = []APIVersion{} + yyc1178 = true + } else if len(yyv1178) != 0 { + yyv1178 = yyv1178[:0] + yyc1178 = true } - } else if yyl1133 > 0 { - var yyrr1133, yyrl1133 int - var yyrt1133 bool - if yyl1133 > cap(yyv1133) { + } else if yyl1178 > 0 { + var yyrr1178, yyrl1178 int + var yyrt1178 bool + if yyl1178 > cap(yyv1178) { - yyrg1133 := len(yyv1133) > 0 - yyv21133 := yyv1133 - yyrl1133, yyrt1133 = z.DecInferLen(yyl1133, z.DecBasicHandle().MaxInitLen, 32) - if yyrt1133 { - if yyrl1133 <= cap(yyv1133) { - yyv1133 = yyv1133[:yyrl1133] + yyrg1178 := len(yyv1178) > 0 + yyv21178 := yyv1178 + yyrl1178, yyrt1178 = z.DecInferLen(yyl1178, z.DecBasicHandle().MaxInitLen, 32) + if yyrt1178 { + if yyrl1178 <= cap(yyv1178) { + yyv1178 = yyv1178[:yyrl1178] } else { - yyv1133 = make([]APIVersion, yyrl1133) + yyv1178 = make([]APIVersion, yyrl1178) } } else { - yyv1133 = make([]APIVersion, yyrl1133) + yyv1178 = make([]APIVersion, yyrl1178) } - yyc1133 = true - yyrr1133 = len(yyv1133) - if yyrg1133 { - copy(yyv1133, yyv21133) + yyc1178 = true + yyrr1178 = len(yyv1178) + if yyrg1178 { + copy(yyv1178, yyv21178) } - } else if yyl1133 != len(yyv1133) { - yyv1133 = yyv1133[:yyl1133] - yyc1133 = true + } else if yyl1178 != len(yyv1178) { + yyv1178 = yyv1178[:yyl1178] + yyc1178 = true } - yyj1133 := 0 - for ; yyj1133 < yyrr1133; yyj1133++ { - yyh1133.ElemContainerState(yyj1133) + yyj1178 := 0 + for ; yyj1178 < yyrr1178; yyj1178++ { + yyh1178.ElemContainerState(yyj1178) if r.TryDecodeAsNil() { - yyv1133[yyj1133] = APIVersion{} + yyv1178[yyj1178] = APIVersion{} } else { - yyv1134 := &yyv1133[yyj1133] - yyv1134.CodecDecodeSelf(d) + yyv1179 := &yyv1178[yyj1178] + yyv1179.CodecDecodeSelf(d) } } - if yyrt1133 { - for ; yyj1133 < yyl1133; yyj1133++ { - yyv1133 = append(yyv1133, APIVersion{}) - yyh1133.ElemContainerState(yyj1133) + if yyrt1178 { + for ; yyj1178 < yyl1178; yyj1178++ { + yyv1178 = append(yyv1178, APIVersion{}) + yyh1178.ElemContainerState(yyj1178) if r.TryDecodeAsNil() { - yyv1133[yyj1133] = APIVersion{} + yyv1178[yyj1178] = APIVersion{} } else { - yyv1135 := &yyv1133[yyj1133] - yyv1135.CodecDecodeSelf(d) + yyv1180 := &yyv1178[yyj1178] + yyv1180.CodecDecodeSelf(d) } } } } else { - yyj1133 := 0 - for ; !r.CheckBreak(); yyj1133++ { + yyj1178 := 0 + for ; !r.CheckBreak(); yyj1178++ { - if yyj1133 >= len(yyv1133) { - yyv1133 = append(yyv1133, APIVersion{}) // var yyz1133 APIVersion - yyc1133 = true + if yyj1178 >= len(yyv1178) { + yyv1178 = append(yyv1178, APIVersion{}) // var yyz1178 APIVersion + yyc1178 = true } - yyh1133.ElemContainerState(yyj1133) - if yyj1133 < len(yyv1133) { + yyh1178.ElemContainerState(yyj1178) + if yyj1178 < len(yyv1178) { if r.TryDecodeAsNil() { - yyv1133[yyj1133] = APIVersion{} + yyv1178[yyj1178] = APIVersion{} } else { - yyv1136 := &yyv1133[yyj1133] - yyv1136.CodecDecodeSelf(d) + yyv1181 := &yyv1178[yyj1178] + yyv1181.CodecDecodeSelf(d) } } else { @@ -13750,17 +14237,17 @@ func (x codecSelfer1234) decSliceAPIVersion(v *[]APIVersion, d *codec1978.Decode } } - if yyj1133 < len(yyv1133) { - yyv1133 = yyv1133[:yyj1133] - yyc1133 = true - } else if yyj1133 == 0 && yyv1133 == nil { - yyv1133 = []APIVersion{} - yyc1133 = true + if yyj1178 < len(yyv1178) { + yyv1178 = yyv1178[:yyj1178] + yyc1178 = true + } else if yyj1178 == 0 && yyv1178 == nil { + yyv1178 = []APIVersion{} + yyc1178 = true } } - yyh1133.End() - if yyc1133 { - *v = yyv1133 + yyh1178.End() + if yyc1178 { + *v = yyv1178 } } @@ -13769,10 +14256,10 @@ func (x codecSelfer1234) encSliceThirdPartyResource(v []ThirdPartyResource, e *c z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1137 := range v { + for _, yyv1182 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1138 := &yyv1137 - yy1138.CodecEncodeSelf(e) + yy1183 := &yyv1182 + yy1183.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -13782,83 +14269,83 @@ func (x codecSelfer1234) decSliceThirdPartyResource(v *[]ThirdPartyResource, d * z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1139 := *v - yyh1139, yyl1139 := z.DecSliceHelperStart() - var yyc1139 bool - if yyl1139 == 0 { - if yyv1139 == nil { - yyv1139 = []ThirdPartyResource{} - yyc1139 = true - } else if len(yyv1139) != 0 { - yyv1139 = yyv1139[:0] - yyc1139 = true + yyv1184 := *v + yyh1184, yyl1184 := z.DecSliceHelperStart() + var yyc1184 bool + if yyl1184 == 0 { + if yyv1184 == nil { + yyv1184 = []ThirdPartyResource{} + yyc1184 = true + } else if len(yyv1184) != 0 { + yyv1184 = yyv1184[:0] + yyc1184 = true } - } else if yyl1139 > 0 { - var yyrr1139, yyrl1139 int - var yyrt1139 bool - if yyl1139 > cap(yyv1139) { + } else if yyl1184 > 0 { + var yyrr1184, yyrl1184 int + var yyrt1184 bool + if yyl1184 > cap(yyv1184) { - yyrg1139 := len(yyv1139) > 0 - yyv21139 := yyv1139 - yyrl1139, yyrt1139 = z.DecInferLen(yyl1139, z.DecBasicHandle().MaxInitLen, 232) - if yyrt1139 { - if yyrl1139 <= cap(yyv1139) { - yyv1139 = yyv1139[:yyrl1139] + yyrg1184 := len(yyv1184) > 0 + yyv21184 := yyv1184 + yyrl1184, yyrt1184 = z.DecInferLen(yyl1184, z.DecBasicHandle().MaxInitLen, 232) + if yyrt1184 { + if yyrl1184 <= cap(yyv1184) { + yyv1184 = yyv1184[:yyrl1184] } else { - yyv1139 = make([]ThirdPartyResource, yyrl1139) + yyv1184 = make([]ThirdPartyResource, yyrl1184) } } else { - yyv1139 = make([]ThirdPartyResource, yyrl1139) + yyv1184 = make([]ThirdPartyResource, yyrl1184) } - yyc1139 = true - yyrr1139 = len(yyv1139) - if yyrg1139 { - copy(yyv1139, yyv21139) + yyc1184 = true + yyrr1184 = len(yyv1184) + if yyrg1184 { + copy(yyv1184, yyv21184) } - } else if yyl1139 != len(yyv1139) { - yyv1139 = yyv1139[:yyl1139] - yyc1139 = true + } else if yyl1184 != len(yyv1184) { + yyv1184 = yyv1184[:yyl1184] + yyc1184 = true } - yyj1139 := 0 - for ; yyj1139 < yyrr1139; yyj1139++ { - yyh1139.ElemContainerState(yyj1139) + yyj1184 := 0 + for ; yyj1184 < yyrr1184; yyj1184++ { + yyh1184.ElemContainerState(yyj1184) if r.TryDecodeAsNil() { - yyv1139[yyj1139] = ThirdPartyResource{} + yyv1184[yyj1184] = ThirdPartyResource{} } else { - yyv1140 := &yyv1139[yyj1139] - yyv1140.CodecDecodeSelf(d) + yyv1185 := &yyv1184[yyj1184] + yyv1185.CodecDecodeSelf(d) } } - if yyrt1139 { - for ; yyj1139 < yyl1139; yyj1139++ { - yyv1139 = append(yyv1139, ThirdPartyResource{}) - yyh1139.ElemContainerState(yyj1139) + if yyrt1184 { + for ; yyj1184 < yyl1184; yyj1184++ { + yyv1184 = append(yyv1184, ThirdPartyResource{}) + yyh1184.ElemContainerState(yyj1184) if r.TryDecodeAsNil() { - yyv1139[yyj1139] = ThirdPartyResource{} + yyv1184[yyj1184] = ThirdPartyResource{} } else { - yyv1141 := &yyv1139[yyj1139] - yyv1141.CodecDecodeSelf(d) + yyv1186 := &yyv1184[yyj1184] + yyv1186.CodecDecodeSelf(d) } } } } else { - yyj1139 := 0 - for ; !r.CheckBreak(); yyj1139++ { + yyj1184 := 0 + for ; !r.CheckBreak(); yyj1184++ { - if yyj1139 >= len(yyv1139) { - yyv1139 = append(yyv1139, ThirdPartyResource{}) // var yyz1139 ThirdPartyResource - yyc1139 = true + if yyj1184 >= len(yyv1184) { + yyv1184 = append(yyv1184, ThirdPartyResource{}) // var yyz1184 ThirdPartyResource + yyc1184 = true } - yyh1139.ElemContainerState(yyj1139) - if yyj1139 < len(yyv1139) { + yyh1184.ElemContainerState(yyj1184) + if yyj1184 < len(yyv1184) { if r.TryDecodeAsNil() { - yyv1139[yyj1139] = ThirdPartyResource{} + yyv1184[yyj1184] = ThirdPartyResource{} } else { - yyv1142 := &yyv1139[yyj1139] - yyv1142.CodecDecodeSelf(d) + yyv1187 := &yyv1184[yyj1184] + yyv1187.CodecDecodeSelf(d) } } else { @@ -13866,17 +14353,17 @@ func (x codecSelfer1234) decSliceThirdPartyResource(v *[]ThirdPartyResource, d * } } - if yyj1139 < len(yyv1139) { - yyv1139 = yyv1139[:yyj1139] - yyc1139 = true - } else if yyj1139 == 0 && yyv1139 == nil { - yyv1139 = []ThirdPartyResource{} - yyc1139 = true + if yyj1184 < len(yyv1184) { + yyv1184 = yyv1184[:yyj1184] + yyc1184 = true + } else if yyj1184 == 0 && yyv1184 == nil { + yyv1184 = []ThirdPartyResource{} + yyc1184 = true } } - yyh1139.End() - if yyc1139 { - *v = yyv1139 + yyh1184.End() + if yyc1184 { + *v = yyv1184 } } @@ -13885,10 +14372,10 @@ func (x codecSelfer1234) encSliceDeployment(v []Deployment, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1143 := range v { + for _, yyv1188 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1144 := &yyv1143 - yy1144.CodecEncodeSelf(e) + yy1189 := &yyv1188 + yy1189.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -13898,83 +14385,83 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1145 := *v - yyh1145, yyl1145 := z.DecSliceHelperStart() - var yyc1145 bool - if yyl1145 == 0 { - if yyv1145 == nil { - yyv1145 = []Deployment{} - yyc1145 = true - } else if len(yyv1145) != 0 { - yyv1145 = yyv1145[:0] - yyc1145 = true + yyv1190 := *v + yyh1190, yyl1190 := z.DecSliceHelperStart() + var yyc1190 bool + if yyl1190 == 0 { + if yyv1190 == nil { + yyv1190 = []Deployment{} + yyc1190 = true + } else if len(yyv1190) != 0 { + yyv1190 = yyv1190[:0] + yyc1190 = true } - } else if yyl1145 > 0 { - var yyrr1145, yyrl1145 int - var yyrt1145 bool - if yyl1145 > cap(yyv1145) { + } else if yyl1190 > 0 { + var yyrr1190, yyrl1190 int + var yyrt1190 bool + if yyl1190 > cap(yyv1190) { - yyrg1145 := len(yyv1145) > 0 - yyv21145 := yyv1145 - yyrl1145, yyrt1145 = z.DecInferLen(yyl1145, z.DecBasicHandle().MaxInitLen, 600) - if yyrt1145 { - if yyrl1145 <= cap(yyv1145) { - yyv1145 = yyv1145[:yyrl1145] + yyrg1190 := len(yyv1190) > 0 + yyv21190 := yyv1190 + yyrl1190, yyrt1190 = z.DecInferLen(yyl1190, z.DecBasicHandle().MaxInitLen, 600) + if yyrt1190 { + if yyrl1190 <= cap(yyv1190) { + yyv1190 = yyv1190[:yyrl1190] } else { - yyv1145 = make([]Deployment, yyrl1145) + yyv1190 = make([]Deployment, yyrl1190) } } else { - yyv1145 = make([]Deployment, yyrl1145) + yyv1190 = make([]Deployment, yyrl1190) } - yyc1145 = true - yyrr1145 = len(yyv1145) - if yyrg1145 { - copy(yyv1145, yyv21145) + yyc1190 = true + yyrr1190 = len(yyv1190) + if yyrg1190 { + copy(yyv1190, yyv21190) } - } else if yyl1145 != len(yyv1145) { - yyv1145 = yyv1145[:yyl1145] - yyc1145 = true + } else if yyl1190 != len(yyv1190) { + yyv1190 = yyv1190[:yyl1190] + yyc1190 = true } - yyj1145 := 0 - for ; yyj1145 < yyrr1145; yyj1145++ { - yyh1145.ElemContainerState(yyj1145) + yyj1190 := 0 + for ; yyj1190 < yyrr1190; yyj1190++ { + yyh1190.ElemContainerState(yyj1190) if r.TryDecodeAsNil() { - yyv1145[yyj1145] = Deployment{} + yyv1190[yyj1190] = Deployment{} } else { - yyv1146 := &yyv1145[yyj1145] - yyv1146.CodecDecodeSelf(d) + yyv1191 := &yyv1190[yyj1190] + yyv1191.CodecDecodeSelf(d) } } - if yyrt1145 { - for ; yyj1145 < yyl1145; yyj1145++ { - yyv1145 = append(yyv1145, Deployment{}) - yyh1145.ElemContainerState(yyj1145) + if yyrt1190 { + for ; yyj1190 < yyl1190; yyj1190++ { + yyv1190 = append(yyv1190, Deployment{}) + yyh1190.ElemContainerState(yyj1190) if r.TryDecodeAsNil() { - yyv1145[yyj1145] = Deployment{} + yyv1190[yyj1190] = Deployment{} } else { - yyv1147 := &yyv1145[yyj1145] - yyv1147.CodecDecodeSelf(d) + yyv1192 := &yyv1190[yyj1190] + yyv1192.CodecDecodeSelf(d) } } } } else { - yyj1145 := 0 - for ; !r.CheckBreak(); yyj1145++ { + yyj1190 := 0 + for ; !r.CheckBreak(); yyj1190++ { - if yyj1145 >= len(yyv1145) { - yyv1145 = append(yyv1145, Deployment{}) // var yyz1145 Deployment - yyc1145 = true + if yyj1190 >= len(yyv1190) { + yyv1190 = append(yyv1190, Deployment{}) // var yyz1190 Deployment + yyc1190 = true } - yyh1145.ElemContainerState(yyj1145) - if yyj1145 < len(yyv1145) { + yyh1190.ElemContainerState(yyj1190) + if yyj1190 < len(yyv1190) { if r.TryDecodeAsNil() { - yyv1145[yyj1145] = Deployment{} + yyv1190[yyj1190] = Deployment{} } else { - yyv1148 := &yyv1145[yyj1145] - yyv1148.CodecDecodeSelf(d) + yyv1193 := &yyv1190[yyj1190] + yyv1193.CodecDecodeSelf(d) } } else { @@ -13982,17 +14469,17 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode } } - if yyj1145 < len(yyv1145) { - yyv1145 = yyv1145[:yyj1145] - yyc1145 = true - } else if yyj1145 == 0 && yyv1145 == nil { - yyv1145 = []Deployment{} - yyc1145 = true + if yyj1190 < len(yyv1190) { + yyv1190 = yyv1190[:yyj1190] + yyc1190 = true + } else if yyj1190 == 0 && yyv1190 == nil { + yyv1190 = []Deployment{} + yyc1190 = true } } - yyh1145.End() - if yyc1145 { - *v = yyv1145 + yyh1190.End() + if yyc1190 { + *v = yyv1190 } } @@ -14001,10 +14488,10 @@ func (x codecSelfer1234) encSliceDaemonSet(v []DaemonSet, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1149 := range v { + for _, yyv1194 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1150 := &yyv1149 - yy1150.CodecEncodeSelf(e) + yy1195 := &yyv1194 + yy1195.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14014,83 +14501,83 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1151 := *v - yyh1151, yyl1151 := z.DecSliceHelperStart() - var yyc1151 bool - if yyl1151 == 0 { - if yyv1151 == nil { - yyv1151 = []DaemonSet{} - yyc1151 = true - } else if len(yyv1151) != 0 { - yyv1151 = yyv1151[:0] - yyc1151 = true + yyv1196 := *v + yyh1196, yyl1196 := z.DecSliceHelperStart() + var yyc1196 bool + if yyl1196 == 0 { + if yyv1196 == nil { + yyv1196 = []DaemonSet{} + yyc1196 = true + } else if len(yyv1196) != 0 { + yyv1196 = yyv1196[:0] + yyc1196 = true } - } else if yyl1151 > 0 { - var yyrr1151, yyrl1151 int - var yyrt1151 bool - if yyl1151 > cap(yyv1151) { + } else if yyl1196 > 0 { + var yyrr1196, yyrl1196 int + var yyrt1196 bool + if yyl1196 > cap(yyv1196) { - yyrg1151 := len(yyv1151) > 0 - yyv21151 := yyv1151 - yyrl1151, yyrt1151 = z.DecInferLen(yyl1151, z.DecBasicHandle().MaxInitLen, 224) - if yyrt1151 { - if yyrl1151 <= cap(yyv1151) { - yyv1151 = yyv1151[:yyrl1151] + yyrg1196 := len(yyv1196) > 0 + yyv21196 := yyv1196 + yyrl1196, yyrt1196 = z.DecInferLen(yyl1196, z.DecBasicHandle().MaxInitLen, 224) + if yyrt1196 { + if yyrl1196 <= cap(yyv1196) { + yyv1196 = yyv1196[:yyrl1196] } else { - yyv1151 = make([]DaemonSet, yyrl1151) + yyv1196 = make([]DaemonSet, yyrl1196) } } else { - yyv1151 = make([]DaemonSet, yyrl1151) + yyv1196 = make([]DaemonSet, yyrl1196) } - yyc1151 = true - yyrr1151 = len(yyv1151) - if yyrg1151 { - copy(yyv1151, yyv21151) + yyc1196 = true + yyrr1196 = len(yyv1196) + if yyrg1196 { + copy(yyv1196, yyv21196) } - } else if yyl1151 != len(yyv1151) { - yyv1151 = yyv1151[:yyl1151] - yyc1151 = true + } else if yyl1196 != len(yyv1196) { + yyv1196 = yyv1196[:yyl1196] + yyc1196 = true } - yyj1151 := 0 - for ; yyj1151 < yyrr1151; yyj1151++ { - yyh1151.ElemContainerState(yyj1151) + yyj1196 := 0 + for ; yyj1196 < yyrr1196; yyj1196++ { + yyh1196.ElemContainerState(yyj1196) if r.TryDecodeAsNil() { - yyv1151[yyj1151] = DaemonSet{} + yyv1196[yyj1196] = DaemonSet{} } else { - yyv1152 := &yyv1151[yyj1151] - yyv1152.CodecDecodeSelf(d) + yyv1197 := &yyv1196[yyj1196] + yyv1197.CodecDecodeSelf(d) } } - if yyrt1151 { - for ; yyj1151 < yyl1151; yyj1151++ { - yyv1151 = append(yyv1151, DaemonSet{}) - yyh1151.ElemContainerState(yyj1151) + if yyrt1196 { + for ; yyj1196 < yyl1196; yyj1196++ { + yyv1196 = append(yyv1196, DaemonSet{}) + yyh1196.ElemContainerState(yyj1196) if r.TryDecodeAsNil() { - yyv1151[yyj1151] = DaemonSet{} + yyv1196[yyj1196] = DaemonSet{} } else { - yyv1153 := &yyv1151[yyj1151] - yyv1153.CodecDecodeSelf(d) + yyv1198 := &yyv1196[yyj1196] + yyv1198.CodecDecodeSelf(d) } } } } else { - yyj1151 := 0 - for ; !r.CheckBreak(); yyj1151++ { + yyj1196 := 0 + for ; !r.CheckBreak(); yyj1196++ { - if yyj1151 >= len(yyv1151) { - yyv1151 = append(yyv1151, DaemonSet{}) // var yyz1151 DaemonSet - yyc1151 = true + if yyj1196 >= len(yyv1196) { + yyv1196 = append(yyv1196, DaemonSet{}) // var yyz1196 DaemonSet + yyc1196 = true } - yyh1151.ElemContainerState(yyj1151) - if yyj1151 < len(yyv1151) { + yyh1196.ElemContainerState(yyj1196) + if yyj1196 < len(yyv1196) { if r.TryDecodeAsNil() { - yyv1151[yyj1151] = DaemonSet{} + yyv1196[yyj1196] = DaemonSet{} } else { - yyv1154 := &yyv1151[yyj1151] - yyv1154.CodecDecodeSelf(d) + yyv1199 := &yyv1196[yyj1196] + yyv1199.CodecDecodeSelf(d) } } else { @@ -14098,17 +14585,17 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) } } - if yyj1151 < len(yyv1151) { - yyv1151 = yyv1151[:yyj1151] - yyc1151 = true - } else if yyj1151 == 0 && yyv1151 == nil { - yyv1151 = []DaemonSet{} - yyc1151 = true + if yyj1196 < len(yyv1196) { + yyv1196 = yyv1196[:yyj1196] + yyc1196 = true + } else if yyj1196 == 0 && yyv1196 == nil { + yyv1196 = []DaemonSet{} + yyc1196 = true } } - yyh1151.End() - if yyc1151 { - *v = yyv1151 + yyh1196.End() + if yyc1196 { + *v = yyv1196 } } @@ -14117,10 +14604,10 @@ func (x codecSelfer1234) encSliceThirdPartyResourceData(v []ThirdPartyResourceDa z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1155 := range v { + for _, yyv1200 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1156 := &yyv1155 - yy1156.CodecEncodeSelf(e) + yy1201 := &yyv1200 + yy1201.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14130,83 +14617,83 @@ func (x codecSelfer1234) decSliceThirdPartyResourceData(v *[]ThirdPartyResourceD z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1157 := *v - yyh1157, yyl1157 := z.DecSliceHelperStart() - var yyc1157 bool - if yyl1157 == 0 { - if yyv1157 == nil { - yyv1157 = []ThirdPartyResourceData{} - yyc1157 = true - } else if len(yyv1157) != 0 { - yyv1157 = yyv1157[:0] - yyc1157 = true + yyv1202 := *v + yyh1202, yyl1202 := z.DecSliceHelperStart() + var yyc1202 bool + if yyl1202 == 0 { + if yyv1202 == nil { + yyv1202 = []ThirdPartyResourceData{} + yyc1202 = true + } else if len(yyv1202) != 0 { + yyv1202 = yyv1202[:0] + yyc1202 = true } - } else if yyl1157 > 0 { - var yyrr1157, yyrl1157 int - var yyrt1157 bool - if yyl1157 > cap(yyv1157) { + } else if yyl1202 > 0 { + var yyrr1202, yyrl1202 int + var yyrt1202 bool + if yyl1202 > cap(yyv1202) { - yyrg1157 := len(yyv1157) > 0 - yyv21157 := yyv1157 - yyrl1157, yyrt1157 = z.DecInferLen(yyl1157, z.DecBasicHandle().MaxInitLen, 216) - if yyrt1157 { - if yyrl1157 <= cap(yyv1157) { - yyv1157 = yyv1157[:yyrl1157] + yyrg1202 := len(yyv1202) > 0 + yyv21202 := yyv1202 + yyrl1202, yyrt1202 = z.DecInferLen(yyl1202, z.DecBasicHandle().MaxInitLen, 216) + if yyrt1202 { + if yyrl1202 <= cap(yyv1202) { + yyv1202 = yyv1202[:yyrl1202] } else { - yyv1157 = make([]ThirdPartyResourceData, yyrl1157) + yyv1202 = make([]ThirdPartyResourceData, yyrl1202) } } else { - yyv1157 = make([]ThirdPartyResourceData, yyrl1157) + yyv1202 = make([]ThirdPartyResourceData, yyrl1202) } - yyc1157 = true - yyrr1157 = len(yyv1157) - if yyrg1157 { - copy(yyv1157, yyv21157) + yyc1202 = true + yyrr1202 = len(yyv1202) + if yyrg1202 { + copy(yyv1202, yyv21202) } - } else if yyl1157 != len(yyv1157) { - yyv1157 = yyv1157[:yyl1157] - yyc1157 = true + } else if yyl1202 != len(yyv1202) { + yyv1202 = yyv1202[:yyl1202] + yyc1202 = true } - yyj1157 := 0 - for ; yyj1157 < yyrr1157; yyj1157++ { - yyh1157.ElemContainerState(yyj1157) + yyj1202 := 0 + for ; yyj1202 < yyrr1202; yyj1202++ { + yyh1202.ElemContainerState(yyj1202) if r.TryDecodeAsNil() { - yyv1157[yyj1157] = ThirdPartyResourceData{} + yyv1202[yyj1202] = ThirdPartyResourceData{} } else { - yyv1158 := &yyv1157[yyj1157] - yyv1158.CodecDecodeSelf(d) + yyv1203 := &yyv1202[yyj1202] + yyv1203.CodecDecodeSelf(d) } } - if yyrt1157 { - for ; yyj1157 < yyl1157; yyj1157++ { - yyv1157 = append(yyv1157, ThirdPartyResourceData{}) - yyh1157.ElemContainerState(yyj1157) + if yyrt1202 { + for ; yyj1202 < yyl1202; yyj1202++ { + yyv1202 = append(yyv1202, ThirdPartyResourceData{}) + yyh1202.ElemContainerState(yyj1202) if r.TryDecodeAsNil() { - yyv1157[yyj1157] = ThirdPartyResourceData{} + yyv1202[yyj1202] = ThirdPartyResourceData{} } else { - yyv1159 := &yyv1157[yyj1157] - yyv1159.CodecDecodeSelf(d) + yyv1204 := &yyv1202[yyj1202] + yyv1204.CodecDecodeSelf(d) } } } } else { - yyj1157 := 0 - for ; !r.CheckBreak(); yyj1157++ { + yyj1202 := 0 + for ; !r.CheckBreak(); yyj1202++ { - if yyj1157 >= len(yyv1157) { - yyv1157 = append(yyv1157, ThirdPartyResourceData{}) // var yyz1157 ThirdPartyResourceData - yyc1157 = true + if yyj1202 >= len(yyv1202) { + yyv1202 = append(yyv1202, ThirdPartyResourceData{}) // var yyz1202 ThirdPartyResourceData + yyc1202 = true } - yyh1157.ElemContainerState(yyj1157) - if yyj1157 < len(yyv1157) { + yyh1202.ElemContainerState(yyj1202) + if yyj1202 < len(yyv1202) { if r.TryDecodeAsNil() { - yyv1157[yyj1157] = ThirdPartyResourceData{} + yyv1202[yyj1202] = ThirdPartyResourceData{} } else { - yyv1160 := &yyv1157[yyj1157] - yyv1160.CodecDecodeSelf(d) + yyv1205 := &yyv1202[yyj1202] + yyv1205.CodecDecodeSelf(d) } } else { @@ -14214,17 +14701,17 @@ func (x codecSelfer1234) decSliceThirdPartyResourceData(v *[]ThirdPartyResourceD } } - if yyj1157 < len(yyv1157) { - yyv1157 = yyv1157[:yyj1157] - yyc1157 = true - } else if yyj1157 == 0 && yyv1157 == nil { - yyv1157 = []ThirdPartyResourceData{} - yyc1157 = true + if yyj1202 < len(yyv1202) { + yyv1202 = yyv1202[:yyj1202] + yyc1202 = true + } else if yyj1202 == 0 && yyv1202 == nil { + yyv1202 = []ThirdPartyResourceData{} + yyc1202 = true } } - yyh1157.End() - if yyc1157 { - *v = yyv1157 + yyh1202.End() + if yyc1202 { + *v = yyv1202 } } @@ -14233,10 +14720,10 @@ func (x codecSelfer1234) encSliceJob(v []Job, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1161 := range v { + for _, yyv1206 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1162 := &yyv1161 - yy1162.CodecEncodeSelf(e) + yy1207 := &yyv1206 + yy1207.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14246,83 +14733,83 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1163 := *v - yyh1163, yyl1163 := z.DecSliceHelperStart() - var yyc1163 bool - if yyl1163 == 0 { - if yyv1163 == nil { - yyv1163 = []Job{} - yyc1163 = true - } else if len(yyv1163) != 0 { - yyv1163 = yyv1163[:0] - yyc1163 = true + yyv1208 := *v + yyh1208, yyl1208 := z.DecSliceHelperStart() + var yyc1208 bool + if yyl1208 == 0 { + if yyv1208 == nil { + yyv1208 = []Job{} + yyc1208 = true + } else if len(yyv1208) != 0 { + yyv1208 = yyv1208[:0] + yyc1208 = true } - } else if yyl1163 > 0 { - var yyrr1163, yyrl1163 int - var yyrt1163 bool - if yyl1163 > cap(yyv1163) { + } else if yyl1208 > 0 { + var yyrr1208, yyrl1208 int + var yyrt1208 bool + if yyl1208 > cap(yyv1208) { - yyrg1163 := len(yyv1163) > 0 - yyv21163 := yyv1163 - yyrl1163, yyrt1163 = z.DecInferLen(yyl1163, z.DecBasicHandle().MaxInitLen, 624) - if yyrt1163 { - if yyrl1163 <= cap(yyv1163) { - yyv1163 = yyv1163[:yyrl1163] + yyrg1208 := len(yyv1208) > 0 + yyv21208 := yyv1208 + yyrl1208, yyrt1208 = z.DecInferLen(yyl1208, z.DecBasicHandle().MaxInitLen, 624) + if yyrt1208 { + if yyrl1208 <= cap(yyv1208) { + yyv1208 = yyv1208[:yyrl1208] } else { - yyv1163 = make([]Job, yyrl1163) + yyv1208 = make([]Job, yyrl1208) } } else { - yyv1163 = make([]Job, yyrl1163) + yyv1208 = make([]Job, yyrl1208) } - yyc1163 = true - yyrr1163 = len(yyv1163) - if yyrg1163 { - copy(yyv1163, yyv21163) + yyc1208 = true + yyrr1208 = len(yyv1208) + if yyrg1208 { + copy(yyv1208, yyv21208) } - } else if yyl1163 != len(yyv1163) { - yyv1163 = yyv1163[:yyl1163] - yyc1163 = true + } else if yyl1208 != len(yyv1208) { + yyv1208 = yyv1208[:yyl1208] + yyc1208 = true } - yyj1163 := 0 - for ; yyj1163 < yyrr1163; yyj1163++ { - yyh1163.ElemContainerState(yyj1163) + yyj1208 := 0 + for ; yyj1208 < yyrr1208; yyj1208++ { + yyh1208.ElemContainerState(yyj1208) if r.TryDecodeAsNil() { - yyv1163[yyj1163] = Job{} + yyv1208[yyj1208] = Job{} } else { - yyv1164 := &yyv1163[yyj1163] - yyv1164.CodecDecodeSelf(d) + yyv1209 := &yyv1208[yyj1208] + yyv1209.CodecDecodeSelf(d) } } - if yyrt1163 { - for ; yyj1163 < yyl1163; yyj1163++ { - yyv1163 = append(yyv1163, Job{}) - yyh1163.ElemContainerState(yyj1163) + if yyrt1208 { + for ; yyj1208 < yyl1208; yyj1208++ { + yyv1208 = append(yyv1208, Job{}) + yyh1208.ElemContainerState(yyj1208) if r.TryDecodeAsNil() { - yyv1163[yyj1163] = Job{} + yyv1208[yyj1208] = Job{} } else { - yyv1165 := &yyv1163[yyj1163] - yyv1165.CodecDecodeSelf(d) + yyv1210 := &yyv1208[yyj1208] + yyv1210.CodecDecodeSelf(d) } } } } else { - yyj1163 := 0 - for ; !r.CheckBreak(); yyj1163++ { + yyj1208 := 0 + for ; !r.CheckBreak(); yyj1208++ { - if yyj1163 >= len(yyv1163) { - yyv1163 = append(yyv1163, Job{}) // var yyz1163 Job - yyc1163 = true + if yyj1208 >= len(yyv1208) { + yyv1208 = append(yyv1208, Job{}) // var yyz1208 Job + yyc1208 = true } - yyh1163.ElemContainerState(yyj1163) - if yyj1163 < len(yyv1163) { + yyh1208.ElemContainerState(yyj1208) + if yyj1208 < len(yyv1208) { if r.TryDecodeAsNil() { - yyv1163[yyj1163] = Job{} + yyv1208[yyj1208] = Job{} } else { - yyv1166 := &yyv1163[yyj1163] - yyv1166.CodecDecodeSelf(d) + yyv1211 := &yyv1208[yyj1208] + yyv1211.CodecDecodeSelf(d) } } else { @@ -14330,17 +14817,17 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { } } - if yyj1163 < len(yyv1163) { - yyv1163 = yyv1163[:yyj1163] - yyc1163 = true - } else if yyj1163 == 0 && yyv1163 == nil { - yyv1163 = []Job{} - yyc1163 = true + if yyj1208 < len(yyv1208) { + yyv1208 = yyv1208[:yyj1208] + yyc1208 = true + } else if yyj1208 == 0 && yyv1208 == nil { + yyv1208 = []Job{} + yyc1208 = true } } - yyh1163.End() - if yyc1163 { - *v = yyv1163 + yyh1208.End() + if yyc1208 { + *v = yyv1208 } } @@ -14349,10 +14836,10 @@ func (x codecSelfer1234) encSliceJobCondition(v []JobCondition, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1167 := range v { + for _, yyv1212 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1168 := &yyv1167 - yy1168.CodecEncodeSelf(e) + yy1213 := &yyv1212 + yy1213.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14362,83 +14849,83 @@ func (x codecSelfer1234) decSliceJobCondition(v *[]JobCondition, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1169 := *v - yyh1169, yyl1169 := z.DecSliceHelperStart() - var yyc1169 bool - if yyl1169 == 0 { - if yyv1169 == nil { - yyv1169 = []JobCondition{} - yyc1169 = true - } else if len(yyv1169) != 0 { - yyv1169 = yyv1169[:0] - yyc1169 = true + yyv1214 := *v + yyh1214, yyl1214 := z.DecSliceHelperStart() + var yyc1214 bool + if yyl1214 == 0 { + if yyv1214 == nil { + yyv1214 = []JobCondition{} + yyc1214 = true + } else if len(yyv1214) != 0 { + yyv1214 = yyv1214[:0] + yyc1214 = true } - } else if yyl1169 > 0 { - var yyrr1169, yyrl1169 int - var yyrt1169 bool - if yyl1169 > cap(yyv1169) { + } else if yyl1214 > 0 { + var yyrr1214, yyrl1214 int + var yyrt1214 bool + if yyl1214 > cap(yyv1214) { - yyrg1169 := len(yyv1169) > 0 - yyv21169 := yyv1169 - yyrl1169, yyrt1169 = z.DecInferLen(yyl1169, z.DecBasicHandle().MaxInitLen, 112) - if yyrt1169 { - if yyrl1169 <= cap(yyv1169) { - yyv1169 = yyv1169[:yyrl1169] + yyrg1214 := len(yyv1214) > 0 + yyv21214 := yyv1214 + yyrl1214, yyrt1214 = z.DecInferLen(yyl1214, z.DecBasicHandle().MaxInitLen, 112) + if yyrt1214 { + if yyrl1214 <= cap(yyv1214) { + yyv1214 = yyv1214[:yyrl1214] } else { - yyv1169 = make([]JobCondition, yyrl1169) + yyv1214 = make([]JobCondition, yyrl1214) } } else { - yyv1169 = make([]JobCondition, yyrl1169) + yyv1214 = make([]JobCondition, yyrl1214) } - yyc1169 = true - yyrr1169 = len(yyv1169) - if yyrg1169 { - copy(yyv1169, yyv21169) + yyc1214 = true + yyrr1214 = len(yyv1214) + if yyrg1214 { + copy(yyv1214, yyv21214) } - } else if yyl1169 != len(yyv1169) { - yyv1169 = yyv1169[:yyl1169] - yyc1169 = true + } else if yyl1214 != len(yyv1214) { + yyv1214 = yyv1214[:yyl1214] + yyc1214 = true } - yyj1169 := 0 - for ; yyj1169 < yyrr1169; yyj1169++ { - yyh1169.ElemContainerState(yyj1169) + yyj1214 := 0 + for ; yyj1214 < yyrr1214; yyj1214++ { + yyh1214.ElemContainerState(yyj1214) if r.TryDecodeAsNil() { - yyv1169[yyj1169] = JobCondition{} + yyv1214[yyj1214] = JobCondition{} } else { - yyv1170 := &yyv1169[yyj1169] - yyv1170.CodecDecodeSelf(d) + yyv1215 := &yyv1214[yyj1214] + yyv1215.CodecDecodeSelf(d) } } - if yyrt1169 { - for ; yyj1169 < yyl1169; yyj1169++ { - yyv1169 = append(yyv1169, JobCondition{}) - yyh1169.ElemContainerState(yyj1169) + if yyrt1214 { + for ; yyj1214 < yyl1214; yyj1214++ { + yyv1214 = append(yyv1214, JobCondition{}) + yyh1214.ElemContainerState(yyj1214) if r.TryDecodeAsNil() { - yyv1169[yyj1169] = JobCondition{} + yyv1214[yyj1214] = JobCondition{} } else { - yyv1171 := &yyv1169[yyj1169] - yyv1171.CodecDecodeSelf(d) + yyv1216 := &yyv1214[yyj1214] + yyv1216.CodecDecodeSelf(d) } } } } else { - yyj1169 := 0 - for ; !r.CheckBreak(); yyj1169++ { + yyj1214 := 0 + for ; !r.CheckBreak(); yyj1214++ { - if yyj1169 >= len(yyv1169) { - yyv1169 = append(yyv1169, JobCondition{}) // var yyz1169 JobCondition - yyc1169 = true + if yyj1214 >= len(yyv1214) { + yyv1214 = append(yyv1214, JobCondition{}) // var yyz1214 JobCondition + yyc1214 = true } - yyh1169.ElemContainerState(yyj1169) - if yyj1169 < len(yyv1169) { + yyh1214.ElemContainerState(yyj1214) + if yyj1214 < len(yyv1214) { if r.TryDecodeAsNil() { - yyv1169[yyj1169] = JobCondition{} + yyv1214[yyj1214] = JobCondition{} } else { - yyv1172 := &yyv1169[yyj1169] - yyv1172.CodecDecodeSelf(d) + yyv1217 := &yyv1214[yyj1214] + yyv1217.CodecDecodeSelf(d) } } else { @@ -14446,17 +14933,17 @@ func (x codecSelfer1234) decSliceJobCondition(v *[]JobCondition, d *codec1978.De } } - if yyj1169 < len(yyv1169) { - yyv1169 = yyv1169[:yyj1169] - yyc1169 = true - } else if yyj1169 == 0 && yyv1169 == nil { - yyv1169 = []JobCondition{} - yyc1169 = true + if yyj1214 < len(yyv1214) { + yyv1214 = yyv1214[:yyj1214] + yyc1214 = true + } else if yyj1214 == 0 && yyv1214 == nil { + yyv1214 = []JobCondition{} + yyc1214 = true } } - yyh1169.End() - if yyc1169 { - *v = yyv1169 + yyh1214.End() + if yyc1214 { + *v = yyv1214 } } @@ -14465,10 +14952,10 @@ func (x codecSelfer1234) encSliceIngress(v []Ingress, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1173 := range v { + for _, yyv1218 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1174 := &yyv1173 - yy1174.CodecEncodeSelf(e) + yy1219 := &yyv1218 + yy1219.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14478,83 +14965,83 @@ func (x codecSelfer1234) decSliceIngress(v *[]Ingress, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1175 := *v - yyh1175, yyl1175 := z.DecSliceHelperStart() - var yyc1175 bool - if yyl1175 == 0 { - if yyv1175 == nil { - yyv1175 = []Ingress{} - yyc1175 = true - } else if len(yyv1175) != 0 { - yyv1175 = yyv1175[:0] - yyc1175 = true + yyv1220 := *v + yyh1220, yyl1220 := z.DecSliceHelperStart() + var yyc1220 bool + if yyl1220 == 0 { + if yyv1220 == nil { + yyv1220 = []Ingress{} + yyc1220 = true + } else if len(yyv1220) != 0 { + yyv1220 = yyv1220[:0] + yyc1220 = true } - } else if yyl1175 > 0 { - var yyrr1175, yyrl1175 int - var yyrt1175 bool - if yyl1175 > cap(yyv1175) { + } else if yyl1220 > 0 { + var yyrr1220, yyrl1220 int + var yyrt1220 bool + if yyl1220 > cap(yyv1220) { - yyrg1175 := len(yyv1175) > 0 - yyv21175 := yyv1175 - yyrl1175, yyrt1175 = z.DecInferLen(yyl1175, z.DecBasicHandle().MaxInitLen, 248) - if yyrt1175 { - if yyrl1175 <= cap(yyv1175) { - yyv1175 = yyv1175[:yyrl1175] + yyrg1220 := len(yyv1220) > 0 + yyv21220 := yyv1220 + yyrl1220, yyrt1220 = z.DecInferLen(yyl1220, z.DecBasicHandle().MaxInitLen, 248) + if yyrt1220 { + if yyrl1220 <= cap(yyv1220) { + yyv1220 = yyv1220[:yyrl1220] } else { - yyv1175 = make([]Ingress, yyrl1175) + yyv1220 = make([]Ingress, yyrl1220) } } else { - yyv1175 = make([]Ingress, yyrl1175) + yyv1220 = make([]Ingress, yyrl1220) } - yyc1175 = true - yyrr1175 = len(yyv1175) - if yyrg1175 { - copy(yyv1175, yyv21175) + yyc1220 = true + yyrr1220 = len(yyv1220) + if yyrg1220 { + copy(yyv1220, yyv21220) } - } else if yyl1175 != len(yyv1175) { - yyv1175 = yyv1175[:yyl1175] - yyc1175 = true + } else if yyl1220 != len(yyv1220) { + yyv1220 = yyv1220[:yyl1220] + yyc1220 = true } - yyj1175 := 0 - for ; yyj1175 < yyrr1175; yyj1175++ { - yyh1175.ElemContainerState(yyj1175) + yyj1220 := 0 + for ; yyj1220 < yyrr1220; yyj1220++ { + yyh1220.ElemContainerState(yyj1220) if r.TryDecodeAsNil() { - yyv1175[yyj1175] = Ingress{} + yyv1220[yyj1220] = Ingress{} } else { - yyv1176 := &yyv1175[yyj1175] - yyv1176.CodecDecodeSelf(d) + yyv1221 := &yyv1220[yyj1220] + yyv1221.CodecDecodeSelf(d) } } - if yyrt1175 { - for ; yyj1175 < yyl1175; yyj1175++ { - yyv1175 = append(yyv1175, Ingress{}) - yyh1175.ElemContainerState(yyj1175) + if yyrt1220 { + for ; yyj1220 < yyl1220; yyj1220++ { + yyv1220 = append(yyv1220, Ingress{}) + yyh1220.ElemContainerState(yyj1220) if r.TryDecodeAsNil() { - yyv1175[yyj1175] = Ingress{} + yyv1220[yyj1220] = Ingress{} } else { - yyv1177 := &yyv1175[yyj1175] - yyv1177.CodecDecodeSelf(d) + yyv1222 := &yyv1220[yyj1220] + yyv1222.CodecDecodeSelf(d) } } } } else { - yyj1175 := 0 - for ; !r.CheckBreak(); yyj1175++ { + yyj1220 := 0 + for ; !r.CheckBreak(); yyj1220++ { - if yyj1175 >= len(yyv1175) { - yyv1175 = append(yyv1175, Ingress{}) // var yyz1175 Ingress - yyc1175 = true + if yyj1220 >= len(yyv1220) { + yyv1220 = append(yyv1220, Ingress{}) // var yyz1220 Ingress + yyc1220 = true } - yyh1175.ElemContainerState(yyj1175) - if yyj1175 < len(yyv1175) { + yyh1220.ElemContainerState(yyj1220) + if yyj1220 < len(yyv1220) { if r.TryDecodeAsNil() { - yyv1175[yyj1175] = Ingress{} + yyv1220[yyj1220] = Ingress{} } else { - yyv1178 := &yyv1175[yyj1175] - yyv1178.CodecDecodeSelf(d) + yyv1223 := &yyv1220[yyj1220] + yyv1223.CodecDecodeSelf(d) } } else { @@ -14562,17 +15049,17 @@ func (x codecSelfer1234) decSliceIngress(v *[]Ingress, d *codec1978.Decoder) { } } - if yyj1175 < len(yyv1175) { - yyv1175 = yyv1175[:yyj1175] - yyc1175 = true - } else if yyj1175 == 0 && yyv1175 == nil { - yyv1175 = []Ingress{} - yyc1175 = true + if yyj1220 < len(yyv1220) { + yyv1220 = yyv1220[:yyj1220] + yyc1220 = true + } else if yyj1220 == 0 && yyv1220 == nil { + yyv1220 = []Ingress{} + yyc1220 = true } } - yyh1175.End() - if yyc1175 { - *v = yyv1175 + yyh1220.End() + if yyc1220 { + *v = yyv1220 } } @@ -14581,10 +15068,10 @@ func (x codecSelfer1234) encSliceIngressRule(v []IngressRule, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1179 := range v { + for _, yyv1224 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1180 := &yyv1179 - yy1180.CodecEncodeSelf(e) + yy1225 := &yyv1224 + yy1225.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14594,83 +15081,83 @@ func (x codecSelfer1234) decSliceIngressRule(v *[]IngressRule, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1181 := *v - yyh1181, yyl1181 := z.DecSliceHelperStart() - var yyc1181 bool - if yyl1181 == 0 { - if yyv1181 == nil { - yyv1181 = []IngressRule{} - yyc1181 = true - } else if len(yyv1181) != 0 { - yyv1181 = yyv1181[:0] - yyc1181 = true + yyv1226 := *v + yyh1226, yyl1226 := z.DecSliceHelperStart() + var yyc1226 bool + if yyl1226 == 0 { + if yyv1226 == nil { + yyv1226 = []IngressRule{} + yyc1226 = true + } else if len(yyv1226) != 0 { + yyv1226 = yyv1226[:0] + yyc1226 = true } - } else if yyl1181 > 0 { - var yyrr1181, yyrl1181 int - var yyrt1181 bool - if yyl1181 > cap(yyv1181) { + } else if yyl1226 > 0 { + var yyrr1226, yyrl1226 int + var yyrt1226 bool + if yyl1226 > cap(yyv1226) { - yyrg1181 := len(yyv1181) > 0 - yyv21181 := yyv1181 - yyrl1181, yyrt1181 = z.DecInferLen(yyl1181, z.DecBasicHandle().MaxInitLen, 24) - if yyrt1181 { - if yyrl1181 <= cap(yyv1181) { - yyv1181 = yyv1181[:yyrl1181] + yyrg1226 := len(yyv1226) > 0 + yyv21226 := yyv1226 + yyrl1226, yyrt1226 = z.DecInferLen(yyl1226, z.DecBasicHandle().MaxInitLen, 24) + if yyrt1226 { + if yyrl1226 <= cap(yyv1226) { + yyv1226 = yyv1226[:yyrl1226] } else { - yyv1181 = make([]IngressRule, yyrl1181) + yyv1226 = make([]IngressRule, yyrl1226) } } else { - yyv1181 = make([]IngressRule, yyrl1181) + yyv1226 = make([]IngressRule, yyrl1226) } - yyc1181 = true - yyrr1181 = len(yyv1181) - if yyrg1181 { - copy(yyv1181, yyv21181) + yyc1226 = true + yyrr1226 = len(yyv1226) + if yyrg1226 { + copy(yyv1226, yyv21226) } - } else if yyl1181 != len(yyv1181) { - yyv1181 = yyv1181[:yyl1181] - yyc1181 = true + } else if yyl1226 != len(yyv1226) { + yyv1226 = yyv1226[:yyl1226] + yyc1226 = true } - yyj1181 := 0 - for ; yyj1181 < yyrr1181; yyj1181++ { - yyh1181.ElemContainerState(yyj1181) + yyj1226 := 0 + for ; yyj1226 < yyrr1226; yyj1226++ { + yyh1226.ElemContainerState(yyj1226) if r.TryDecodeAsNil() { - yyv1181[yyj1181] = IngressRule{} + yyv1226[yyj1226] = IngressRule{} } else { - yyv1182 := &yyv1181[yyj1181] - yyv1182.CodecDecodeSelf(d) + yyv1227 := &yyv1226[yyj1226] + yyv1227.CodecDecodeSelf(d) } } - if yyrt1181 { - for ; yyj1181 < yyl1181; yyj1181++ { - yyv1181 = append(yyv1181, IngressRule{}) - yyh1181.ElemContainerState(yyj1181) + if yyrt1226 { + for ; yyj1226 < yyl1226; yyj1226++ { + yyv1226 = append(yyv1226, IngressRule{}) + yyh1226.ElemContainerState(yyj1226) if r.TryDecodeAsNil() { - yyv1181[yyj1181] = IngressRule{} + yyv1226[yyj1226] = IngressRule{} } else { - yyv1183 := &yyv1181[yyj1181] - yyv1183.CodecDecodeSelf(d) + yyv1228 := &yyv1226[yyj1226] + yyv1228.CodecDecodeSelf(d) } } } } else { - yyj1181 := 0 - for ; !r.CheckBreak(); yyj1181++ { + yyj1226 := 0 + for ; !r.CheckBreak(); yyj1226++ { - if yyj1181 >= len(yyv1181) { - yyv1181 = append(yyv1181, IngressRule{}) // var yyz1181 IngressRule - yyc1181 = true + if yyj1226 >= len(yyv1226) { + yyv1226 = append(yyv1226, IngressRule{}) // var yyz1226 IngressRule + yyc1226 = true } - yyh1181.ElemContainerState(yyj1181) - if yyj1181 < len(yyv1181) { + yyh1226.ElemContainerState(yyj1226) + if yyj1226 < len(yyv1226) { if r.TryDecodeAsNil() { - yyv1181[yyj1181] = IngressRule{} + yyv1226[yyj1226] = IngressRule{} } else { - yyv1184 := &yyv1181[yyj1181] - yyv1184.CodecDecodeSelf(d) + yyv1229 := &yyv1226[yyj1226] + yyv1229.CodecDecodeSelf(d) } } else { @@ -14678,17 +15165,17 @@ func (x codecSelfer1234) decSliceIngressRule(v *[]IngressRule, d *codec1978.Deco } } - if yyj1181 < len(yyv1181) { - yyv1181 = yyv1181[:yyj1181] - yyc1181 = true - } else if yyj1181 == 0 && yyv1181 == nil { - yyv1181 = []IngressRule{} - yyc1181 = true + if yyj1226 < len(yyv1226) { + yyv1226 = yyv1226[:yyj1226] + yyc1226 = true + } else if yyj1226 == 0 && yyv1226 == nil { + yyv1226 = []IngressRule{} + yyc1226 = true } } - yyh1181.End() - if yyc1181 { - *v = yyv1181 + yyh1226.End() + if yyc1226 { + *v = yyv1226 } } @@ -14697,10 +15184,10 @@ func (x codecSelfer1234) encSliceHTTPIngressPath(v []HTTPIngressPath, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1185 := range v { + for _, yyv1230 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1186 := &yyv1185 - yy1186.CodecEncodeSelf(e) + yy1231 := &yyv1230 + yy1231.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14710,83 +15197,83 @@ func (x codecSelfer1234) decSliceHTTPIngressPath(v *[]HTTPIngressPath, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1187 := *v - yyh1187, yyl1187 := z.DecSliceHelperStart() - var yyc1187 bool - if yyl1187 == 0 { - if yyv1187 == nil { - yyv1187 = []HTTPIngressPath{} - yyc1187 = true - } else if len(yyv1187) != 0 { - yyv1187 = yyv1187[:0] - yyc1187 = true + yyv1232 := *v + yyh1232, yyl1232 := z.DecSliceHelperStart() + var yyc1232 bool + if yyl1232 == 0 { + if yyv1232 == nil { + yyv1232 = []HTTPIngressPath{} + yyc1232 = true + } else if len(yyv1232) != 0 { + yyv1232 = yyv1232[:0] + yyc1232 = true } - } else if yyl1187 > 0 { - var yyrr1187, yyrl1187 int - var yyrt1187 bool - if yyl1187 > cap(yyv1187) { + } else if yyl1232 > 0 { + var yyrr1232, yyrl1232 int + var yyrt1232 bool + if yyl1232 > cap(yyv1232) { - yyrg1187 := len(yyv1187) > 0 - yyv21187 := yyv1187 - yyrl1187, yyrt1187 = z.DecInferLen(yyl1187, z.DecBasicHandle().MaxInitLen, 64) - if yyrt1187 { - if yyrl1187 <= cap(yyv1187) { - yyv1187 = yyv1187[:yyrl1187] + yyrg1232 := len(yyv1232) > 0 + yyv21232 := yyv1232 + yyrl1232, yyrt1232 = z.DecInferLen(yyl1232, z.DecBasicHandle().MaxInitLen, 64) + if yyrt1232 { + if yyrl1232 <= cap(yyv1232) { + yyv1232 = yyv1232[:yyrl1232] } else { - yyv1187 = make([]HTTPIngressPath, yyrl1187) + yyv1232 = make([]HTTPIngressPath, yyrl1232) } } else { - yyv1187 = make([]HTTPIngressPath, yyrl1187) + yyv1232 = make([]HTTPIngressPath, yyrl1232) } - yyc1187 = true - yyrr1187 = len(yyv1187) - if yyrg1187 { - copy(yyv1187, yyv21187) + yyc1232 = true + yyrr1232 = len(yyv1232) + if yyrg1232 { + copy(yyv1232, yyv21232) } - } else if yyl1187 != len(yyv1187) { - yyv1187 = yyv1187[:yyl1187] - yyc1187 = true + } else if yyl1232 != len(yyv1232) { + yyv1232 = yyv1232[:yyl1232] + yyc1232 = true } - yyj1187 := 0 - for ; yyj1187 < yyrr1187; yyj1187++ { - yyh1187.ElemContainerState(yyj1187) + yyj1232 := 0 + for ; yyj1232 < yyrr1232; yyj1232++ { + yyh1232.ElemContainerState(yyj1232) if r.TryDecodeAsNil() { - yyv1187[yyj1187] = HTTPIngressPath{} + yyv1232[yyj1232] = HTTPIngressPath{} } else { - yyv1188 := &yyv1187[yyj1187] - yyv1188.CodecDecodeSelf(d) + yyv1233 := &yyv1232[yyj1232] + yyv1233.CodecDecodeSelf(d) } } - if yyrt1187 { - for ; yyj1187 < yyl1187; yyj1187++ { - yyv1187 = append(yyv1187, HTTPIngressPath{}) - yyh1187.ElemContainerState(yyj1187) + if yyrt1232 { + for ; yyj1232 < yyl1232; yyj1232++ { + yyv1232 = append(yyv1232, HTTPIngressPath{}) + yyh1232.ElemContainerState(yyj1232) if r.TryDecodeAsNil() { - yyv1187[yyj1187] = HTTPIngressPath{} + yyv1232[yyj1232] = HTTPIngressPath{} } else { - yyv1189 := &yyv1187[yyj1187] - yyv1189.CodecDecodeSelf(d) + yyv1234 := &yyv1232[yyj1232] + yyv1234.CodecDecodeSelf(d) } } } } else { - yyj1187 := 0 - for ; !r.CheckBreak(); yyj1187++ { + yyj1232 := 0 + for ; !r.CheckBreak(); yyj1232++ { - if yyj1187 >= len(yyv1187) { - yyv1187 = append(yyv1187, HTTPIngressPath{}) // var yyz1187 HTTPIngressPath - yyc1187 = true + if yyj1232 >= len(yyv1232) { + yyv1232 = append(yyv1232, HTTPIngressPath{}) // var yyz1232 HTTPIngressPath + yyc1232 = true } - yyh1187.ElemContainerState(yyj1187) - if yyj1187 < len(yyv1187) { + yyh1232.ElemContainerState(yyj1232) + if yyj1232 < len(yyv1232) { if r.TryDecodeAsNil() { - yyv1187[yyj1187] = HTTPIngressPath{} + yyv1232[yyj1232] = HTTPIngressPath{} } else { - yyv1190 := &yyv1187[yyj1187] - yyv1190.CodecDecodeSelf(d) + yyv1235 := &yyv1232[yyj1232] + yyv1235.CodecDecodeSelf(d) } } else { @@ -14794,17 +15281,17 @@ func (x codecSelfer1234) decSliceHTTPIngressPath(v *[]HTTPIngressPath, d *codec1 } } - if yyj1187 < len(yyv1187) { - yyv1187 = yyv1187[:yyj1187] - yyc1187 = true - } else if yyj1187 == 0 && yyv1187 == nil { - yyv1187 = []HTTPIngressPath{} - yyc1187 = true + if yyj1232 < len(yyv1232) { + yyv1232 = yyv1232[:yyj1232] + yyc1232 = true + } else if yyj1232 == 0 && yyv1232 == nil { + yyv1232 = []HTTPIngressPath{} + yyc1232 = true } } - yyh1187.End() - if yyc1187 { - *v = yyv1187 + yyh1232.End() + if yyc1232 { + *v = yyv1232 } } @@ -14813,10 +15300,10 @@ func (x codecSelfer1234) encSliceNodeUtilization(v []NodeUtilization, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1191 := range v { + for _, yyv1236 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1192 := &yyv1191 - yy1192.CodecEncodeSelf(e) + yy1237 := &yyv1236 + yy1237.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14826,83 +15313,83 @@ func (x codecSelfer1234) decSliceNodeUtilization(v *[]NodeUtilization, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1193 := *v - yyh1193, yyl1193 := z.DecSliceHelperStart() - var yyc1193 bool - if yyl1193 == 0 { - if yyv1193 == nil { - yyv1193 = []NodeUtilization{} - yyc1193 = true - } else if len(yyv1193) != 0 { - yyv1193 = yyv1193[:0] - yyc1193 = true + yyv1238 := *v + yyh1238, yyl1238 := z.DecSliceHelperStart() + var yyc1238 bool + if yyl1238 == 0 { + if yyv1238 == nil { + yyv1238 = []NodeUtilization{} + yyc1238 = true + } else if len(yyv1238) != 0 { + yyv1238 = yyv1238[:0] + yyc1238 = true } - } else if yyl1193 > 0 { - var yyrr1193, yyrl1193 int - var yyrt1193 bool - if yyl1193 > cap(yyv1193) { + } else if yyl1238 > 0 { + var yyrr1238, yyrl1238 int + var yyrt1238 bool + if yyl1238 > cap(yyv1238) { - yyrg1193 := len(yyv1193) > 0 - yyv21193 := yyv1193 - yyrl1193, yyrt1193 = z.DecInferLen(yyl1193, z.DecBasicHandle().MaxInitLen, 24) - if yyrt1193 { - if yyrl1193 <= cap(yyv1193) { - yyv1193 = yyv1193[:yyrl1193] + yyrg1238 := len(yyv1238) > 0 + yyv21238 := yyv1238 + yyrl1238, yyrt1238 = z.DecInferLen(yyl1238, z.DecBasicHandle().MaxInitLen, 24) + if yyrt1238 { + if yyrl1238 <= cap(yyv1238) { + yyv1238 = yyv1238[:yyrl1238] } else { - yyv1193 = make([]NodeUtilization, yyrl1193) + yyv1238 = make([]NodeUtilization, yyrl1238) } } else { - yyv1193 = make([]NodeUtilization, yyrl1193) + yyv1238 = make([]NodeUtilization, yyrl1238) } - yyc1193 = true - yyrr1193 = len(yyv1193) - if yyrg1193 { - copy(yyv1193, yyv21193) + yyc1238 = true + yyrr1238 = len(yyv1238) + if yyrg1238 { + copy(yyv1238, yyv21238) } - } else if yyl1193 != len(yyv1193) { - yyv1193 = yyv1193[:yyl1193] - yyc1193 = true + } else if yyl1238 != len(yyv1238) { + yyv1238 = yyv1238[:yyl1238] + yyc1238 = true } - yyj1193 := 0 - for ; yyj1193 < yyrr1193; yyj1193++ { - yyh1193.ElemContainerState(yyj1193) + yyj1238 := 0 + for ; yyj1238 < yyrr1238; yyj1238++ { + yyh1238.ElemContainerState(yyj1238) if r.TryDecodeAsNil() { - yyv1193[yyj1193] = NodeUtilization{} + yyv1238[yyj1238] = NodeUtilization{} } else { - yyv1194 := &yyv1193[yyj1193] - yyv1194.CodecDecodeSelf(d) + yyv1239 := &yyv1238[yyj1238] + yyv1239.CodecDecodeSelf(d) } } - if yyrt1193 { - for ; yyj1193 < yyl1193; yyj1193++ { - yyv1193 = append(yyv1193, NodeUtilization{}) - yyh1193.ElemContainerState(yyj1193) + if yyrt1238 { + for ; yyj1238 < yyl1238; yyj1238++ { + yyv1238 = append(yyv1238, NodeUtilization{}) + yyh1238.ElemContainerState(yyj1238) if r.TryDecodeAsNil() { - yyv1193[yyj1193] = NodeUtilization{} + yyv1238[yyj1238] = NodeUtilization{} } else { - yyv1195 := &yyv1193[yyj1193] - yyv1195.CodecDecodeSelf(d) + yyv1240 := &yyv1238[yyj1238] + yyv1240.CodecDecodeSelf(d) } } } } else { - yyj1193 := 0 - for ; !r.CheckBreak(); yyj1193++ { + yyj1238 := 0 + for ; !r.CheckBreak(); yyj1238++ { - if yyj1193 >= len(yyv1193) { - yyv1193 = append(yyv1193, NodeUtilization{}) // var yyz1193 NodeUtilization - yyc1193 = true + if yyj1238 >= len(yyv1238) { + yyv1238 = append(yyv1238, NodeUtilization{}) // var yyz1238 NodeUtilization + yyc1238 = true } - yyh1193.ElemContainerState(yyj1193) - if yyj1193 < len(yyv1193) { + yyh1238.ElemContainerState(yyj1238) + if yyj1238 < len(yyv1238) { if r.TryDecodeAsNil() { - yyv1193[yyj1193] = NodeUtilization{} + yyv1238[yyj1238] = NodeUtilization{} } else { - yyv1196 := &yyv1193[yyj1193] - yyv1196.CodecDecodeSelf(d) + yyv1241 := &yyv1238[yyj1238] + yyv1241.CodecDecodeSelf(d) } } else { @@ -14910,17 +15397,17 @@ func (x codecSelfer1234) decSliceNodeUtilization(v *[]NodeUtilization, d *codec1 } } - if yyj1193 < len(yyv1193) { - yyv1193 = yyv1193[:yyj1193] - yyc1193 = true - } else if yyj1193 == 0 && yyv1193 == nil { - yyv1193 = []NodeUtilization{} - yyc1193 = true + if yyj1238 < len(yyv1238) { + yyv1238 = yyv1238[:yyj1238] + yyc1238 = true + } else if yyj1238 == 0 && yyv1238 == nil { + yyv1238 = []NodeUtilization{} + yyc1238 = true } } - yyh1193.End() - if yyc1193 { - *v = yyv1193 + yyh1238.End() + if yyc1238 { + *v = yyv1238 } } @@ -14929,10 +15416,10 @@ func (x codecSelfer1234) encSliceClusterAutoscaler(v []ClusterAutoscaler, e *cod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1197 := range v { + for _, yyv1242 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1198 := &yyv1197 - yy1198.CodecEncodeSelf(e) + yy1243 := &yyv1242 + yy1243.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -14942,83 +15429,83 @@ func (x codecSelfer1234) decSliceClusterAutoscaler(v *[]ClusterAutoscaler, d *co z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1199 := *v - yyh1199, yyl1199 := z.DecSliceHelperStart() - var yyc1199 bool - if yyl1199 == 0 { - if yyv1199 == nil { - yyv1199 = []ClusterAutoscaler{} - yyc1199 = true - } else if len(yyv1199) != 0 { - yyv1199 = yyv1199[:0] - yyc1199 = true + yyv1244 := *v + yyh1244, yyl1244 := z.DecSliceHelperStart() + var yyc1244 bool + if yyl1244 == 0 { + if yyv1244 == nil { + yyv1244 = []ClusterAutoscaler{} + yyc1244 = true + } else if len(yyv1244) != 0 { + yyv1244 = yyv1244[:0] + yyc1244 = true } - } else if yyl1199 > 0 { - var yyrr1199, yyrl1199 int - var yyrt1199 bool - if yyl1199 > cap(yyv1199) { + } else if yyl1244 > 0 { + var yyrr1244, yyrl1244 int + var yyrt1244 bool + if yyl1244 > cap(yyv1244) { - yyrg1199 := len(yyv1199) > 0 - yyv21199 := yyv1199 - yyrl1199, yyrt1199 = z.DecInferLen(yyl1199, z.DecBasicHandle().MaxInitLen, 224) - if yyrt1199 { - if yyrl1199 <= cap(yyv1199) { - yyv1199 = yyv1199[:yyrl1199] + yyrg1244 := len(yyv1244) > 0 + yyv21244 := yyv1244 + yyrl1244, yyrt1244 = z.DecInferLen(yyl1244, z.DecBasicHandle().MaxInitLen, 224) + if yyrt1244 { + if yyrl1244 <= cap(yyv1244) { + yyv1244 = yyv1244[:yyrl1244] } else { - yyv1199 = make([]ClusterAutoscaler, yyrl1199) + yyv1244 = make([]ClusterAutoscaler, yyrl1244) } } else { - yyv1199 = make([]ClusterAutoscaler, yyrl1199) + yyv1244 = make([]ClusterAutoscaler, yyrl1244) } - yyc1199 = true - yyrr1199 = len(yyv1199) - if yyrg1199 { - copy(yyv1199, yyv21199) + yyc1244 = true + yyrr1244 = len(yyv1244) + if yyrg1244 { + copy(yyv1244, yyv21244) } - } else if yyl1199 != len(yyv1199) { - yyv1199 = yyv1199[:yyl1199] - yyc1199 = true + } else if yyl1244 != len(yyv1244) { + yyv1244 = yyv1244[:yyl1244] + yyc1244 = true } - yyj1199 := 0 - for ; yyj1199 < yyrr1199; yyj1199++ { - yyh1199.ElemContainerState(yyj1199) + yyj1244 := 0 + for ; yyj1244 < yyrr1244; yyj1244++ { + yyh1244.ElemContainerState(yyj1244) if r.TryDecodeAsNil() { - yyv1199[yyj1199] = ClusterAutoscaler{} + yyv1244[yyj1244] = ClusterAutoscaler{} } else { - yyv1200 := &yyv1199[yyj1199] - yyv1200.CodecDecodeSelf(d) + yyv1245 := &yyv1244[yyj1244] + yyv1245.CodecDecodeSelf(d) } } - if yyrt1199 { - for ; yyj1199 < yyl1199; yyj1199++ { - yyv1199 = append(yyv1199, ClusterAutoscaler{}) - yyh1199.ElemContainerState(yyj1199) + if yyrt1244 { + for ; yyj1244 < yyl1244; yyj1244++ { + yyv1244 = append(yyv1244, ClusterAutoscaler{}) + yyh1244.ElemContainerState(yyj1244) if r.TryDecodeAsNil() { - yyv1199[yyj1199] = ClusterAutoscaler{} + yyv1244[yyj1244] = ClusterAutoscaler{} } else { - yyv1201 := &yyv1199[yyj1199] - yyv1201.CodecDecodeSelf(d) + yyv1246 := &yyv1244[yyj1244] + yyv1246.CodecDecodeSelf(d) } } } } else { - yyj1199 := 0 - for ; !r.CheckBreak(); yyj1199++ { + yyj1244 := 0 + for ; !r.CheckBreak(); yyj1244++ { - if yyj1199 >= len(yyv1199) { - yyv1199 = append(yyv1199, ClusterAutoscaler{}) // var yyz1199 ClusterAutoscaler - yyc1199 = true + if yyj1244 >= len(yyv1244) { + yyv1244 = append(yyv1244, ClusterAutoscaler{}) // var yyz1244 ClusterAutoscaler + yyc1244 = true } - yyh1199.ElemContainerState(yyj1199) - if yyj1199 < len(yyv1199) { + yyh1244.ElemContainerState(yyj1244) + if yyj1244 < len(yyv1244) { if r.TryDecodeAsNil() { - yyv1199[yyj1199] = ClusterAutoscaler{} + yyv1244[yyj1244] = ClusterAutoscaler{} } else { - yyv1202 := &yyv1199[yyj1199] - yyv1202.CodecDecodeSelf(d) + yyv1247 := &yyv1244[yyj1244] + yyv1247.CodecDecodeSelf(d) } } else { @@ -15026,17 +15513,17 @@ func (x codecSelfer1234) decSliceClusterAutoscaler(v *[]ClusterAutoscaler, d *co } } - if yyj1199 < len(yyv1199) { - yyv1199 = yyv1199[:yyj1199] - yyc1199 = true - } else if yyj1199 == 0 && yyv1199 == nil { - yyv1199 = []ClusterAutoscaler{} - yyc1199 = true + if yyj1244 < len(yyv1244) { + yyv1244 = yyv1244[:yyj1244] + yyc1244 = true + } else if yyj1244 == 0 && yyv1244 == nil { + yyv1244 = []ClusterAutoscaler{} + yyc1244 = true } } - yyh1199.End() - if yyc1199 { - *v = yyv1199 + yyh1244.End() + if yyc1244 { + *v = yyv1244 } } @@ -15045,10 +15532,10 @@ func (x codecSelfer1234) encSliceLabelSelectorRequirement(v []LabelSelectorRequi z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1203 := range v { + for _, yyv1248 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1204 := &yyv1203 - yy1204.CodecEncodeSelf(e) + yy1249 := &yyv1248 + yy1249.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -15058,83 +15545,83 @@ func (x codecSelfer1234) decSliceLabelSelectorRequirement(v *[]LabelSelectorRequ z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1205 := *v - yyh1205, yyl1205 := z.DecSliceHelperStart() - var yyc1205 bool - if yyl1205 == 0 { - if yyv1205 == nil { - yyv1205 = []LabelSelectorRequirement{} - yyc1205 = true - } else if len(yyv1205) != 0 { - yyv1205 = yyv1205[:0] - yyc1205 = true + yyv1250 := *v + yyh1250, yyl1250 := z.DecSliceHelperStart() + var yyc1250 bool + if yyl1250 == 0 { + if yyv1250 == nil { + yyv1250 = []LabelSelectorRequirement{} + yyc1250 = true + } else if len(yyv1250) != 0 { + yyv1250 = yyv1250[:0] + yyc1250 = true } - } else if yyl1205 > 0 { - var yyrr1205, yyrl1205 int - var yyrt1205 bool - if yyl1205 > cap(yyv1205) { + } else if yyl1250 > 0 { + var yyrr1250, yyrl1250 int + var yyrt1250 bool + if yyl1250 > cap(yyv1250) { - yyrg1205 := len(yyv1205) > 0 - yyv21205 := yyv1205 - yyrl1205, yyrt1205 = z.DecInferLen(yyl1205, z.DecBasicHandle().MaxInitLen, 56) - if yyrt1205 { - if yyrl1205 <= cap(yyv1205) { - yyv1205 = yyv1205[:yyrl1205] + yyrg1250 := len(yyv1250) > 0 + yyv21250 := yyv1250 + yyrl1250, yyrt1250 = z.DecInferLen(yyl1250, z.DecBasicHandle().MaxInitLen, 56) + if yyrt1250 { + if yyrl1250 <= cap(yyv1250) { + yyv1250 = yyv1250[:yyrl1250] } else { - yyv1205 = make([]LabelSelectorRequirement, yyrl1205) + yyv1250 = make([]LabelSelectorRequirement, yyrl1250) } } else { - yyv1205 = make([]LabelSelectorRequirement, yyrl1205) + yyv1250 = make([]LabelSelectorRequirement, yyrl1250) } - yyc1205 = true - yyrr1205 = len(yyv1205) - if yyrg1205 { - copy(yyv1205, yyv21205) + yyc1250 = true + yyrr1250 = len(yyv1250) + if yyrg1250 { + copy(yyv1250, yyv21250) } - } else if yyl1205 != len(yyv1205) { - yyv1205 = yyv1205[:yyl1205] - yyc1205 = true + } else if yyl1250 != len(yyv1250) { + yyv1250 = yyv1250[:yyl1250] + yyc1250 = true } - yyj1205 := 0 - for ; yyj1205 < yyrr1205; yyj1205++ { - yyh1205.ElemContainerState(yyj1205) + yyj1250 := 0 + for ; yyj1250 < yyrr1250; yyj1250++ { + yyh1250.ElemContainerState(yyj1250) if r.TryDecodeAsNil() { - yyv1205[yyj1205] = LabelSelectorRequirement{} + yyv1250[yyj1250] = LabelSelectorRequirement{} } else { - yyv1206 := &yyv1205[yyj1205] - yyv1206.CodecDecodeSelf(d) + yyv1251 := &yyv1250[yyj1250] + yyv1251.CodecDecodeSelf(d) } } - if yyrt1205 { - for ; yyj1205 < yyl1205; yyj1205++ { - yyv1205 = append(yyv1205, LabelSelectorRequirement{}) - yyh1205.ElemContainerState(yyj1205) + if yyrt1250 { + for ; yyj1250 < yyl1250; yyj1250++ { + yyv1250 = append(yyv1250, LabelSelectorRequirement{}) + yyh1250.ElemContainerState(yyj1250) if r.TryDecodeAsNil() { - yyv1205[yyj1205] = LabelSelectorRequirement{} + yyv1250[yyj1250] = LabelSelectorRequirement{} } else { - yyv1207 := &yyv1205[yyj1205] - yyv1207.CodecDecodeSelf(d) + yyv1252 := &yyv1250[yyj1250] + yyv1252.CodecDecodeSelf(d) } } } } else { - yyj1205 := 0 - for ; !r.CheckBreak(); yyj1205++ { + yyj1250 := 0 + for ; !r.CheckBreak(); yyj1250++ { - if yyj1205 >= len(yyv1205) { - yyv1205 = append(yyv1205, LabelSelectorRequirement{}) // var yyz1205 LabelSelectorRequirement - yyc1205 = true + if yyj1250 >= len(yyv1250) { + yyv1250 = append(yyv1250, LabelSelectorRequirement{}) // var yyz1250 LabelSelectorRequirement + yyc1250 = true } - yyh1205.ElemContainerState(yyj1205) - if yyj1205 < len(yyv1205) { + yyh1250.ElemContainerState(yyj1250) + if yyj1250 < len(yyv1250) { if r.TryDecodeAsNil() { - yyv1205[yyj1205] = LabelSelectorRequirement{} + yyv1250[yyj1250] = LabelSelectorRequirement{} } else { - yyv1208 := &yyv1205[yyj1205] - yyv1208.CodecDecodeSelf(d) + yyv1253 := &yyv1250[yyj1250] + yyv1253.CodecDecodeSelf(d) } } else { @@ -15142,16 +15629,16 @@ func (x codecSelfer1234) decSliceLabelSelectorRequirement(v *[]LabelSelectorRequ } } - if yyj1205 < len(yyv1205) { - yyv1205 = yyv1205[:yyj1205] - yyc1205 = true - } else if yyj1205 == 0 && yyv1205 == nil { - yyv1205 = []LabelSelectorRequirement{} - yyc1205 = true + if yyj1250 < len(yyv1250) { + yyv1250 = yyv1250[:yyj1250] + yyc1250 = true + } else if yyj1250 == 0 && yyv1250 == nil { + yyv1250 = []LabelSelectorRequirement{} + yyc1250 = true } } - yyh1205.End() - if yyc1205 { - *v = yyv1205 + yyh1250.End() + if yyc1250 { + *v = yyv1250 } } diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index 0a4465e8e2b..d41c252679b 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -663,6 +663,26 @@ type ClusterAutoscalerList struct { Items []ClusterAutoscaler `json:"items"` } +// ListOptions is the query options to a standard REST list call. +type ListOptions struct { + unversioned.TypeMeta `json:",inline"` + + // A selector to restrict the list of returned objects by their labels. + // Defaults to everything. + LabelSelector string `json:"labelSelector,omitempty"` + // A selector to restrict the list of returned objects by their fields. + // Defaults to everything. + FieldSelector string `json:"fieldSelector,omitempty"` + // Watch for changes to the described resources and return them as a stream of + // add, update, and remove notifications. Specify resourceVersion. + Watch bool `json:"watch,omitempty"` + // When specified with a watch call, shows changes that occur after that particular version of a resource. + // Defaults to changes from the beginning of history. + ResourceVersion string `json:"resourceVersion,omitempty"` + // Timeout for the list/watch call. + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` +} + // A label selector is a label query over a set of resources. The result of matchLabels and // matchExpressions are ANDed. An empty label selector matches all objects. A null // label selector matches no objects. diff --git a/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go index 50ee043bf86..af309f5c338 100644 --- a/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go +++ b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go @@ -384,6 +384,19 @@ func (LabelSelectorRequirement) SwaggerDoc() map[string]string { return map_LabelSelectorRequirement } +var map_ListOptions = map[string]string{ + "": "ListOptions is the query options to a standard REST list call.", + "labelSelector": "A selector to restrict the list of returned objects by their labels. Defaults to everything.", + "fieldSelector": "A selector to restrict the list of returned objects by their fields. Defaults to everything.", + "watch": "Watch for changes to the described resources and return them as a stream of add, update, and remove notifications. Specify resourceVersion.", + "resourceVersion": "When specified with a watch call, shows changes that occur after that particular version of a resource. Defaults to changes from the beginning of history.", + "timeoutSeconds": "Timeout for the list/watch call.", +} + +func (ListOptions) SwaggerDoc() map[string]string { + return map_ListOptions +} + var map_NodeUtilization = map[string]string{ "": "NodeUtilization describes what percentage of a particular resource is used on a node.", "value": "The accepted values are from 0 to 1.", diff --git a/pkg/client/cache/listwatch.go b/pkg/client/cache/listwatch.go index 977b84cf5fe..20c3db5ea44 100644 --- a/pkg/client/cache/listwatch.go +++ b/pkg/client/cache/listwatch.go @@ -20,7 +20,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" @@ -28,10 +27,10 @@ import ( ) // ListFunc knows how to list resources -type ListFunc func(options unversioned.ListOptions) (runtime.Object, error) +type ListFunc func(options api.ListOptions) (runtime.Object, error) // WatchFunc knows how to watch resources -type WatchFunc func(options unversioned.ListOptions) (watch.Interface, error) +type WatchFunc func(options api.ListOptions) (watch.Interface, error) // ListWatch knows how to list and watch a set of apiserver resources. It satisfies the ListerWatcher interface. // It is a convenience function for users of NewReflector, etc. @@ -48,7 +47,7 @@ type Getter interface { // NewListWatchFromClient creates a new ListWatch from the specified client, resource, namespace and field selector. func NewListWatchFromClient(c Getter, resource string, namespace string, fieldSelector fields.Selector) *ListWatch { - listFunc := func(options unversioned.ListOptions) (runtime.Object, error) { + listFunc := func(options api.ListOptions) (runtime.Object, error) { return c.Get(). Namespace(namespace). Resource(resource). @@ -57,7 +56,7 @@ func NewListWatchFromClient(c Getter, resource string, namespace string, fieldSe Do(). Get() } - watchFunc := func(options unversioned.ListOptions) (watch.Interface, error) { + watchFunc := func(options api.ListOptions) (watch.Interface, error) { return c.Get(). Prefix("watch"). Namespace(namespace). @@ -69,7 +68,7 @@ func NewListWatchFromClient(c Getter, resource string, namespace string, fieldSe return &ListWatch{ListFunc: listFunc, WatchFunc: watchFunc} } -func timeoutFromListOptions(options unversioned.ListOptions) time.Duration { +func timeoutFromListOptions(options api.ListOptions) time.Duration { if options.TimeoutSeconds != nil { return time.Duration(*options.TimeoutSeconds) * time.Second } @@ -77,11 +76,11 @@ func timeoutFromListOptions(options unversioned.ListOptions) time.Duration { } // List a set of apiserver resources -func (lw *ListWatch) List(options unversioned.ListOptions) (runtime.Object, error) { +func (lw *ListWatch) List(options api.ListOptions) (runtime.Object, error) { return lw.ListFunc(options) } // Watch a set of apiserver resources -func (lw *ListWatch) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (lw *ListWatch) Watch(options api.ListOptions) (watch.Interface, error) { return lw.WatchFunc(options) } diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index b66e5c5d04d..51a88df12eb 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -99,7 +99,7 @@ func TestListWatchesCanList(t *testing.T) { client := client.NewOrDie(&client.Config{Host: server.URL, GroupVersion: testapi.Default.GroupVersion()}) lw := NewListWatchFromClient(client, item.resource, item.namespace, item.fieldSelector) // This test merely tests that the correct request is made. - lw.List(unversioned.ListOptions{}) + lw.List(api.ListOptions{}) handler.ValidateRequest(t, item.location, "GET", nil) } } @@ -165,7 +165,7 @@ func TestListWatchesCanWatch(t *testing.T) { client := client.NewOrDie(&client.Config{Host: server.URL, GroupVersion: testapi.Default.GroupVersion()}) lw := NewListWatchFromClient(client, item.resource, item.namespace, item.fieldSelector) // This test merely tests that the correct request is made. - lw.Watch(unversioned.ListOptions{ResourceVersion: item.rv}) + lw.Watch(api.ListOptions{ResourceVersion: item.rv}) handler.ValidateRequest(t, item.location, "GET", nil) } } diff --git a/pkg/client/cache/reflector.go b/pkg/client/cache/reflector.go index 48e66d72b4b..7c1dd0d28e2 100644 --- a/pkg/client/cache/reflector.go +++ b/pkg/client/cache/reflector.go @@ -31,9 +31,9 @@ import ( "time" "github.com/golang/glog" + "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" @@ -43,9 +43,9 @@ import ( type ListerWatcher interface { // List should return a list type object; the Items field will be extracted, and the // ResourceVersion field will be used to start the watch in the right place. - List(options unversioned.ListOptions) (runtime.Object, error) + List(options api.ListOptions) (runtime.Object, error) // Watch should begin a watch at the specified version. - Watch(options unversioned.ListOptions) (watch.Interface, error) + Watch(options api.ListOptions) (watch.Interface, error) } // Reflector watches a specified resource and causes all changes to be reflected in the given store. @@ -230,7 +230,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error { // Explicitly set "0" as resource version - it's fine for the List() // to be served from cache and potentially be delayed relative to // etcd contents. Reflector framework will catch up via Watch() eventually. - options := unversioned.ListOptions{ResourceVersion: "0"} + options := api.ListOptions{ResourceVersion: "0"} list, err := r.listerWatcher.List(options) if err != nil { return fmt.Errorf("%s: Failed to list %v: %v", r.name, r.expectedType, err) @@ -250,7 +250,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error { r.setLastSyncResourceVersion(resourceVersion) for { - options := unversioned.ListOptions{ + options := api.ListOptions{ ResourceVersion: resourceVersion, // We want to avoid situations when resyncing is breaking the TCP connection // - see comment for 'timeoutForWatch()' for more details. diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/cache/reflector_test.go index f053aed9deb..17c332ca37e 100644 --- a/pkg/client/cache/reflector_test.go +++ b/pkg/client/cache/reflector_test.go @@ -35,10 +35,10 @@ type testLW struct { WatchFunc func(resourceVersion string) (watch.Interface, error) } -func (t *testLW) List(options unversioned.ListOptions) (runtime.Object, error) { +func (t *testLW) List(options api.ListOptions) (runtime.Object, error) { return t.ListFunc() } -func (t *testLW) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (t *testLW) Watch(options api.ListOptions) (watch.Interface, error) { return t.WatchFunc(options.ResourceVersion) } diff --git a/pkg/client/unversioned/componentstatuses.go b/pkg/client/unversioned/componentstatuses.go index 86fe6100680..d63dfda82a9 100644 --- a/pkg/client/unversioned/componentstatuses.go +++ b/pkg/client/unversioned/componentstatuses.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" ) type ComponentStatusesInterface interface { @@ -27,11 +26,11 @@ type ComponentStatusesInterface interface { // ComponentStatusInterface contains methods to retrieve ComponentStatus type ComponentStatusInterface interface { - List(opts unversioned.ListOptions) (*api.ComponentStatusList, error) + List(opts api.ListOptions) (*api.ComponentStatusList, error) Get(name string) (*api.ComponentStatus, error) // TODO: It'd be nice to have watch support at some point - //Watch(opts unversioned.ListOptions) (watch.Interface, error) + //Watch(opts api.ListOptions) (watch.Interface, error) } // componentStatuses implements ComponentStatusesInterface @@ -43,7 +42,7 @@ func newComponentStatuses(c *Client) *componentStatuses { return &componentStatuses{c} } -func (c *componentStatuses) List(opts unversioned.ListOptions) (result *api.ComponentStatusList, err error) { +func (c *componentStatuses) List(opts api.ListOptions) (result *api.ComponentStatusList, err error) { result = &api.ComponentStatusList{} err = c.client.Get(). Resource("componentStatuses"). diff --git a/pkg/client/unversioned/daemon_sets.go b/pkg/client/unversioned/daemon_sets.go index f40ffb42c37..1aabba69a22 100644 --- a/pkg/client/unversioned/daemon_sets.go +++ b/pkg/client/unversioned/daemon_sets.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -29,13 +28,13 @@ type DaemonSetsNamespacer interface { } type DaemonSetInterface interface { - List(opts unversioned.ListOptions) (*extensions.DaemonSetList, error) + List(opts api.ListOptions) (*extensions.DaemonSetList, error) Get(name string) (*extensions.DaemonSet, error) Create(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) Update(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) UpdateStatus(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // daemonSets implements DaemonsSetsNamespacer interface @@ -51,7 +50,7 @@ func newDaemonSets(c *ExtensionsClient, namespace string) *daemonSets { // Ensure statically that daemonSets implements DaemonSetsInterface. var _ DaemonSetInterface = &daemonSets{} -func (c *daemonSets) List(opts unversioned.ListOptions) (result *extensions.DaemonSetList, err error) { +func (c *daemonSets) List(opts api.ListOptions) (result *extensions.DaemonSetList, err error) { result = &extensions.DaemonSetList{} err = c.r.Get().Namespace(c.ns).Resource("daemonsets").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -91,7 +90,7 @@ func (c *daemonSets) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested daemon sets. -func (c *daemonSets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *daemonSets) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/daemon_sets_test.go b/pkg/client/unversioned/daemon_sets_test.go index 939b0637d60..cf187e547cc 100644 --- a/pkg/client/unversioned/daemon_sets_test.go +++ b/pkg/client/unversioned/daemon_sets_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -60,7 +59,7 @@ func TestListDaemonSets(t *testing.T) { }, }, } - receivedDSs, err := c.Setup(t).Extensions().DaemonSets(ns).List(unversioned.ListOptions{}) + receivedDSs, err := c.Setup(t).Extensions().DaemonSets(ns).List(api.ListOptions{}) c.Validate(t, receivedDSs, err) } diff --git a/pkg/client/unversioned/deployment.go b/pkg/client/unversioned/deployment.go index 0b94112c5ab..cf84b19fc72 100644 --- a/pkg/client/unversioned/deployment.go +++ b/pkg/client/unversioned/deployment.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -30,13 +29,13 @@ type DeploymentsNamespacer interface { // DeploymentInterface has methods to work with Deployment resources. type DeploymentInterface interface { - List(opts unversioned.ListOptions) (*extensions.DeploymentList, error) + List(opts api.ListOptions) (*extensions.DeploymentList, error) Get(name string) (*extensions.Deployment, error) Delete(name string, options *api.DeleteOptions) error Create(*extensions.Deployment) (*extensions.Deployment, error) Update(*extensions.Deployment) (*extensions.Deployment, error) UpdateStatus(*extensions.Deployment) (*extensions.Deployment, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // deployments implements DeploymentInterface @@ -54,7 +53,7 @@ func newDeployments(c *ExtensionsClient, namespace string) *deployments { } // List takes label and field selectors, and returns the list of Deployments that match those selectors. -func (c *deployments) List(opts unversioned.ListOptions) (result *extensions.DeploymentList, err error) { +func (c *deployments) List(opts api.ListOptions) (result *extensions.DeploymentList, err error) { result = &extensions.DeploymentList{} err = c.client.Get().Namespace(c.ns).Resource("deployments").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -100,7 +99,7 @@ func (c *deployments) UpdateStatus(deployment *extensions.Deployment) (result *e } // Watch returns a watch.Interface that watches the requested deployments. -func (c *deployments) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *deployments) Watch(opts api.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/deployment_test.go b/pkg/client/unversioned/deployment_test.go index c6345cd144c..5cca6f51a1f 100644 --- a/pkg/client/unversioned/deployment_test.go +++ b/pkg/client/unversioned/deployment_test.go @@ -105,7 +105,7 @@ func TestDeploymentList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: deploymentList}, } - response, err := c.Setup(t).Deployments(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).Deployments(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -174,7 +174,7 @@ func TestDeploymentWatch(t *testing.T) { }, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).Deployments(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).Deployments(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } @@ -205,7 +205,7 @@ func TestListDeploymentsLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} receivedPodList, err := c.Deployments(ns).List(options) c.Validate(t, receivedPodList, err) } diff --git a/pkg/client/unversioned/endpoints.go b/pkg/client/unversioned/endpoints.go index f5d3237d33b..24993efda23 100644 --- a/pkg/client/unversioned/endpoints.go +++ b/pkg/client/unversioned/endpoints.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -32,11 +31,11 @@ type EndpointsNamespacer interface { // EndpointsInterface has methods to work with Endpoints resources type EndpointsInterface interface { Create(endpoints *api.Endpoints) (*api.Endpoints, error) - List(opts unversioned.ListOptions) (*api.EndpointsList, error) + List(opts api.ListOptions) (*api.EndpointsList, error) Get(name string) (*api.Endpoints, error) Delete(name string) error Update(endpoints *api.Endpoints) (*api.Endpoints, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // endpoints implements EndpointsInterface @@ -58,7 +57,7 @@ func (c *endpoints) Create(endpoints *api.Endpoints) (*api.Endpoints, error) { } // List takes a selector, and returns the list of endpoints that match that selector -func (c *endpoints) List(opts unversioned.ListOptions) (result *api.EndpointsList, err error) { +func (c *endpoints) List(opts api.ListOptions) (result *api.EndpointsList, err error) { result = &api.EndpointsList{} err = c.r.Get(). Namespace(c.ns). @@ -82,7 +81,7 @@ func (c *endpoints) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested endpoints for a service. -func (c *endpoints) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *endpoints) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/endpoints_test.go b/pkg/client/unversioned/endpoints_test.go index 322b89224a9..2676c9a81e4 100644 --- a/pkg/client/unversioned/endpoints_test.go +++ b/pkg/client/unversioned/endpoints_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func TestListEndpoints(t *testing.T) { @@ -47,7 +46,7 @@ func TestListEndpoints(t *testing.T) { }, }, } - receivedEndpointsList, err := c.Setup(t).Endpoints(ns).List(unversioned.ListOptions{}) + receivedEndpointsList, err := c.Setup(t).Endpoints(ns).List(api.ListOptions{}) c.Validate(t, receivedEndpointsList, err) } diff --git a/pkg/client/unversioned/events.go b/pkg/client/unversioned/events.go index 3e343134924..8935efcccf7 100644 --- a/pkg/client/unversioned/events.go +++ b/pkg/client/unversioned/events.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" @@ -36,14 +35,14 @@ type EventInterface interface { Create(event *api.Event) (*api.Event, error) Update(event *api.Event) (*api.Event, error) Patch(event *api.Event, data []byte) (*api.Event, error) - List(opts unversioned.ListOptions) (*api.EventList, error) + List(opts api.ListOptions) (*api.EventList, error) Get(name string) (*api.Event, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) // Search finds events about the specified object Search(objOrRef runtime.Object) (*api.EventList, error) Delete(name string) error // DeleteCollection deletes a collection of events. - DeleteCollection(options *api.DeleteOptions, listOptions unversioned.ListOptions) error + DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error // Returns the appropriate field selector based on the API version being used to communicate with the server. // The returned field selector can be used with List and Watch to filter desired events. GetFieldSelector(involvedObjectName, involvedObjectNamespace, involvedObjectKind, involvedObjectUID *string) fields.Selector @@ -118,7 +117,7 @@ func (e *events) Patch(incompleteEvent *api.Event, data []byte) (*api.Event, err } // List returns a list of events matching the selectors. -func (e *events) List(opts unversioned.ListOptions) (*api.EventList, error) { +func (e *events) List(opts api.ListOptions) (*api.EventList, error) { result := &api.EventList{} err := e.client.Get(). NamespaceIfScoped(e.namespace, len(e.namespace) > 0). @@ -142,7 +141,7 @@ func (e *events) Get(name string) (*api.Event, error) { } // Watch starts watching for events matching the given selectors. -func (e *events) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (e *events) Watch(opts api.ListOptions) (watch.Interface, error) { return e.client.Get(). Prefix("watch"). NamespaceIfScoped(e.namespace, len(e.namespace) > 0). @@ -173,7 +172,7 @@ func (e *events) Search(objOrRef runtime.Object) (*api.EventList, error) { refUID = &stringRefUID } fieldSelector := e.GetFieldSelector(&ref.Name, &ref.Namespace, refKind, refUID) - return e.List(unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{fieldSelector}}) + return e.List(api.ListOptions{FieldSelector: fieldSelector}) } // Delete deletes an existing event. @@ -187,7 +186,7 @@ func (e *events) Delete(name string) error { } // DeleteCollection deletes a collection of objects. -func (e *events) DeleteCollection(options *api.DeleteOptions, listOptions unversioned.ListOptions) error { +func (e *events) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { // TODO: to make this reusable in other client libraries if options == nil { return e.client.Delete(). diff --git a/pkg/client/unversioned/events_test.go b/pkg/client/unversioned/events_test.go index 5bca3433a2c..3a6cbec5835 100644 --- a/pkg/client/unversioned/events_test.go +++ b/pkg/client/unversioned/events_test.go @@ -169,7 +169,7 @@ func TestEventList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: eventList}, } - response, err := c.Setup(t).Events(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).Events(ns).List(api.ListOptions{}) if err != nil { t.Errorf("%#v should be nil.", err) diff --git a/pkg/client/unversioned/horizontalpodautoscaler.go b/pkg/client/unversioned/horizontalpodautoscaler.go index fe82ddc9958..f279f3c1004 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/unversioned/horizontalpodautoscaler.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -30,13 +29,13 @@ type HorizontalPodAutoscalersNamespacer interface { // HorizontalPodAutoscalerInterface has methods to work with HorizontalPodAutoscaler resources. type HorizontalPodAutoscalerInterface interface { - List(opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) + List(opts api.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) Get(name string) (*extensions.HorizontalPodAutoscaler, error) Delete(name string, options *api.DeleteOptions) error Create(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) Update(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) UpdateStatus(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // horizontalPodAutoscalers implements HorizontalPodAutoscalersNamespacer interface @@ -54,7 +53,7 @@ func newHorizontalPodAutoscalers(c *ExtensionsClient, namespace string) *horizon } // List takes label and field selectors, and returns the list of horizontalPodAutoscalers that match those selectors. -func (c *horizontalPodAutoscalers) List(opts unversioned.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) { +func (c *horizontalPodAutoscalers) List(opts api.ListOptions) (result *extensions.HorizontalPodAutoscalerList, err error) { result = &extensions.HorizontalPodAutoscalerList{} err = c.client.Get().Namespace(c.ns).Resource("horizontalPodAutoscalers").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -102,7 +101,7 @@ func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *extensi } // Watch returns a watch.Interface that watches the requested horizontalPodAutoscalers. -func (c *horizontalPodAutoscalers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *horizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go index 4c3f0e3b67f..f811f370f10 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler_test.go +++ b/pkg/client/unversioned/horizontalpodautoscaler_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -103,7 +102,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: horizontalPodAutoscalerList}, } - response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -159,6 +158,6 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/ingress.go b/pkg/client/unversioned/ingress.go index 2c273f21ff5..a9bfc5a9594 100644 --- a/pkg/client/unversioned/ingress.go +++ b/pkg/client/unversioned/ingress.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -30,12 +29,12 @@ type IngressNamespacer interface { // IngressInterface exposes methods to work on Ingress resources. type IngressInterface interface { - List(opts unversioned.ListOptions) (*extensions.IngressList, error) + List(opts api.ListOptions) (*extensions.IngressList, error) Get(name string) (*extensions.Ingress, error) Create(ingress *extensions.Ingress) (*extensions.Ingress, error) Update(ingress *extensions.Ingress) (*extensions.Ingress, error) Delete(name string, options *api.DeleteOptions) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error) } @@ -51,7 +50,7 @@ func newIngress(c *ExtensionsClient, namespace string) *ingress { } // List returns a list of ingress that match the label and field selectors. -func (c *ingress) List(opts unversioned.ListOptions) (result *extensions.IngressList, err error) { +func (c *ingress) List(opts api.ListOptions) (result *extensions.IngressList, err error) { result = &extensions.IngressList{} err = c.r.Get().Namespace(c.ns).Resource("ingresses").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -92,7 +91,7 @@ func (c *ingress) Delete(name string, options *api.DeleteOptions) (err error) { } // Watch returns a watch.Interface that watches the requested ingress. -func (c *ingress) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *ingress) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/ingress_test.go b/pkg/client/unversioned/ingress_test.go index 6aeea9d4d36..281b0561432 100644 --- a/pkg/client/unversioned/ingress_test.go +++ b/pkg/client/unversioned/ingress_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -60,7 +59,7 @@ func TestListIngress(t *testing.T) { }, }, } - receivedIngressList, err := c.Setup(t).Extensions().Ingress(ns).List(unversioned.ListOptions{}) + receivedIngressList, err := c.Setup(t).Extensions().Ingress(ns).List(api.ListOptions{}) c.Validate(t, receivedIngressList, err) } diff --git a/pkg/client/unversioned/jobs.go b/pkg/client/unversioned/jobs.go index 4840c7766c7..5ca8909c650 100644 --- a/pkg/client/unversioned/jobs.go +++ b/pkg/client/unversioned/jobs.go @@ -19,7 +19,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -31,12 +30,12 @@ type JobsNamespacer interface { // JobInterface exposes methods to work on Job resources. type JobInterface interface { - List(opts unversioned.ListOptions) (*extensions.JobList, error) + List(opts api.ListOptions) (*extensions.JobList, error) Get(name string) (*extensions.Job, error) Create(job *extensions.Job) (*extensions.Job, error) Update(job *extensions.Job) (*extensions.Job, error) Delete(name string, options *api.DeleteOptions) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) UpdateStatus(job *extensions.Job) (*extensions.Job, error) } @@ -55,7 +54,7 @@ func newJobs(c *ExtensionsClient, namespace string) *jobs { var _ JobInterface = &jobs{} // List returns a list of jobs that match the label and field selectors. -func (c *jobs) List(opts unversioned.ListOptions) (result *extensions.JobList, err error) { +func (c *jobs) List(opts api.ListOptions) (result *extensions.JobList, err error) { result = &extensions.JobList{} err = c.r.Get().Namespace(c.ns).Resource("jobs").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -96,7 +95,7 @@ func (c *jobs) Delete(name string, options *api.DeleteOptions) (err error) { } // Watch returns a watch.Interface that watches the requested jobs. -func (c *jobs) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *jobs) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/jobs_test.go b/pkg/client/unversioned/jobs_test.go index 2268d404e26..4c55f933900 100644 --- a/pkg/client/unversioned/jobs_test.go +++ b/pkg/client/unversioned/jobs_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -60,7 +59,7 @@ func TestListJobs(t *testing.T) { }, }, } - receivedJobList, err := c.Setup(t).Extensions().Jobs(ns).List(unversioned.ListOptions{}) + receivedJobList, err := c.Setup(t).Extensions().Jobs(ns).List(api.ListOptions{}) c.Validate(t, receivedJobList, err) } diff --git a/pkg/client/unversioned/limit_ranges.go b/pkg/client/unversioned/limit_ranges.go index 38b8b1db28b..6820e2c22f5 100644 --- a/pkg/client/unversioned/limit_ranges.go +++ b/pkg/client/unversioned/limit_ranges.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -31,12 +30,12 @@ type LimitRangesNamespacer interface { // LimitRangeInterface has methods to work with LimitRange resources. type LimitRangeInterface interface { - List(opts unversioned.ListOptions) (*api.LimitRangeList, error) + List(opts api.ListOptions) (*api.LimitRangeList, error) Get(name string) (*api.LimitRange, error) Delete(name string) error Create(limitRange *api.LimitRange) (*api.LimitRange, error) Update(limitRange *api.LimitRange) (*api.LimitRange, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // limitRanges implements LimitRangesNamespacer interface @@ -54,7 +53,7 @@ func newLimitRanges(c *Client, namespace string) *limitRanges { } // List takes a selector, and returns the list of limitRanges that match that selector. -func (c *limitRanges) List(opts unversioned.ListOptions) (result *api.LimitRangeList, err error) { +func (c *limitRanges) List(opts api.ListOptions) (result *api.LimitRangeList, err error) { result = &api.LimitRangeList{} err = c.r.Get().Namespace(c.ns).Resource("limitRanges").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -91,7 +90,7 @@ func (c *limitRanges) Update(limitRange *api.LimitRange) (result *api.LimitRange } // Watch returns a watch.Interface that watches the requested resource -func (c *limitRanges) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *limitRanges) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/limit_ranges_test.go b/pkg/client/unversioned/limit_ranges_test.go index 79b45098e81..1c76437439c 100644 --- a/pkg/client/unversioned/limit_ranges_test.go +++ b/pkg/client/unversioned/limit_ranges_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getLimitRangesResourceName() string { @@ -126,7 +125,7 @@ func TestLimitRangeList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: limitRangeList}, } - response, err := c.Setup(t).LimitRanges(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).LimitRanges(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -211,6 +210,6 @@ func TestLimitRangeWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).LimitRanges(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).LimitRanges(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/namespaces.go b/pkg/client/unversioned/namespaces.go index fe9b3e5420e..9b669f7cd34 100644 --- a/pkg/client/unversioned/namespaces.go +++ b/pkg/client/unversioned/namespaces.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -31,10 +30,10 @@ type NamespacesInterface interface { type NamespaceInterface interface { Create(item *api.Namespace) (*api.Namespace, error) Get(name string) (result *api.Namespace, err error) - List(opts unversioned.ListOptions) (*api.NamespaceList, error) + List(opts api.ListOptions) (*api.NamespaceList, error) Delete(name string) error Update(item *api.Namespace) (*api.Namespace, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) Finalize(item *api.Namespace) (*api.Namespace, error) Status(item *api.Namespace) (*api.Namespace, error) } @@ -57,7 +56,7 @@ func (c *namespaces) Create(namespace *api.Namespace) (*api.Namespace, error) { } // List lists all the namespaces in the cluster. -func (c *namespaces) List(opts unversioned.ListOptions) (*api.NamespaceList, error) { +func (c *namespaces) List(opts api.ListOptions) (*api.NamespaceList, error) { result := &api.NamespaceList{} err := c.r.Get(). Resource("namespaces"). @@ -112,7 +111,7 @@ func (c *namespaces) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested namespaces. -func (c *namespaces) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *namespaces) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Resource("namespaces"). diff --git a/pkg/client/unversioned/namespaces_test.go b/pkg/client/unversioned/namespaces_test.go index 33b600a6c0a..b3239e3df22 100644 --- a/pkg/client/unversioned/namespaces_test.go +++ b/pkg/client/unversioned/namespaces_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func TestNamespaceCreate(t *testing.T) { @@ -96,7 +95,7 @@ func TestNamespaceList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: namespaceList}, } - response, err := c.Setup(t).Namespaces().List(unversioned.ListOptions{}) + response, err := c.Setup(t).Namespaces().List(api.ListOptions{}) if err != nil { t.Errorf("%#v should be nil.", err) @@ -178,6 +177,6 @@ func TestNamespaceWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).Namespaces().Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).Namespaces().Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/nodes.go b/pkg/client/unversioned/nodes.go index dde08078290..12570425de4 100644 --- a/pkg/client/unversioned/nodes.go +++ b/pkg/client/unversioned/nodes.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -31,11 +30,11 @@ type NodesInterface interface { type NodeInterface interface { Get(name string) (result *api.Node, err error) Create(node *api.Node) (*api.Node, error) - List(opts unversioned.ListOptions) (*api.NodeList, error) + List(opts api.ListOptions) (*api.NodeList, error) Delete(name string) error Update(*api.Node) (*api.Node, error) UpdateStatus(*api.Node) (*api.Node, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // nodes implements NodesInterface @@ -61,7 +60,7 @@ func (c *nodes) Create(node *api.Node) (*api.Node, error) { } // List takes a selector, and returns the list of nodes that match that selector in the cluster. -func (c *nodes) List(opts unversioned.ListOptions) (*api.NodeList, error) { +func (c *nodes) List(opts api.ListOptions) (*api.NodeList, error) { result := &api.NodeList{} err := c.r.Get().Resource(c.resourceName()).VersionedParams(&opts, api.Scheme).Do().Into(result) return result, err @@ -101,7 +100,7 @@ func (c *nodes) UpdateStatus(node *api.Node) (*api.Node, error) { } // Watch returns a watch.Interface that watches the requested nodes. -func (c *nodes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *nodes) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(api.NamespaceAll). diff --git a/pkg/client/unversioned/nodes_test.go b/pkg/client/unversioned/nodes_test.go index fd68e134ca9..91c8946b67c 100644 --- a/pkg/client/unversioned/nodes_test.go +++ b/pkg/client/unversioned/nodes_test.go @@ -44,7 +44,7 @@ func TestListNodes(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: &api.NodeList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}}, } - response, err := c.Setup(t).Nodes().List(unversioned.ListOptions{}) + response, err := c.Setup(t).Nodes().List(api.ListOptions{}) c.Validate(t, response, err) } @@ -74,7 +74,7 @@ func TestListNodesLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} receivedNodeList, err := c.Nodes().List(options) c.Validate(t, receivedNodeList, err) } diff --git a/pkg/client/unversioned/persistentvolume_test.go b/pkg/client/unversioned/persistentvolume_test.go index ade0d7ed995..c244eaef0d5 100644 --- a/pkg/client/unversioned/persistentvolume_test.go +++ b/pkg/client/unversioned/persistentvolume_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getPersistentVolumesResoureName() string { @@ -110,7 +109,7 @@ func TestPersistentVolumeList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: persistentVolumeList}, } - response, err := c.Setup(t).PersistentVolumes().List(unversioned.ListOptions{}) + response, err := c.Setup(t).PersistentVolumes().List(api.ListOptions{}) c.Validate(t, response, err) } @@ -184,6 +183,6 @@ func TestPersistentVolumeWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).PersistentVolumes().Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).PersistentVolumes().Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/persistentvolumeclaim.go b/pkg/client/unversioned/persistentvolumeclaim.go index 38f9b38afb8..4764e42b052 100644 --- a/pkg/client/unversioned/persistentvolumeclaim.go +++ b/pkg/client/unversioned/persistentvolumeclaim.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -31,13 +30,13 @@ type PersistentVolumeClaimsNamespacer interface { // PersistentVolumeClaimInterface has methods to work with PersistentVolumeClaim resources. type PersistentVolumeClaimInterface interface { - List(opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) + List(opts api.ListOptions) (*api.PersistentVolumeClaimList, error) Get(name string) (*api.PersistentVolumeClaim, error) Create(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) Update(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) UpdateStatus(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // persistentVolumeClaims implements PersistentVolumeClaimsNamespacer interface @@ -51,7 +50,7 @@ func newPersistentVolumeClaims(c *Client, namespace string) *persistentVolumeCla return &persistentVolumeClaims{c, namespace} } -func (c *persistentVolumeClaims) List(opts unversioned.ListOptions) (result *api.PersistentVolumeClaimList, err error) { +func (c *persistentVolumeClaims) List(opts api.ListOptions) (result *api.PersistentVolumeClaimList, err error) { result = &api.PersistentVolumeClaimList{} err = c.client.Get(). @@ -96,7 +95,7 @@ func (c *persistentVolumeClaims) Delete(name string) error { return c.client.Delete().Namespace(c.namespace).Resource("persistentVolumeClaims").Name(name).Do().Error() } -func (c *persistentVolumeClaims) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *persistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Namespace(c.namespace). diff --git a/pkg/client/unversioned/persistentvolumeclaim_test.go b/pkg/client/unversioned/persistentvolumeclaim_test.go index ad004513f99..9747d567ad5 100644 --- a/pkg/client/unversioned/persistentvolumeclaim_test.go +++ b/pkg/client/unversioned/persistentvolumeclaim_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getPersistentVolumeClaimsResoureName() string { @@ -119,7 +118,7 @@ func TestPersistentVolumeClaimList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: persistentVolumeList}, } - response, err := c.Setup(t).PersistentVolumeClaims(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).PersistentVolumeClaims(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -201,6 +200,6 @@ func TestPersistentVolumeClaimWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).PersistentVolumeClaims(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).PersistentVolumeClaims(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/persistentvolumes.go b/pkg/client/unversioned/persistentvolumes.go index 71371c942fc..c9f735c8b31 100644 --- a/pkg/client/unversioned/persistentvolumes.go +++ b/pkg/client/unversioned/persistentvolumes.go @@ -20,7 +20,6 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -30,13 +29,13 @@ type PersistentVolumesInterface interface { // PersistentVolumeInterface has methods to work with PersistentVolume resources. type PersistentVolumeInterface interface { - List(opts unversioned.ListOptions) (*api.PersistentVolumeList, error) + List(opts api.ListOptions) (*api.PersistentVolumeList, error) Get(name string) (*api.PersistentVolume, error) Create(volume *api.PersistentVolume) (*api.PersistentVolume, error) Update(volume *api.PersistentVolume) (*api.PersistentVolume, error) UpdateStatus(persistentVolume *api.PersistentVolume) (*api.PersistentVolume, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // persistentVolumes implements PersistentVolumesInterface @@ -48,7 +47,7 @@ func newPersistentVolumes(c *Client) *persistentVolumes { return &persistentVolumes{c} } -func (c *persistentVolumes) List(opts unversioned.ListOptions) (result *api.PersistentVolumeList, err error) { +func (c *persistentVolumes) List(opts api.ListOptions) (result *api.PersistentVolumeList, err error) { result = &api.PersistentVolumeList{} err = c.client.Get(). Resource("persistentVolumes"). @@ -91,7 +90,7 @@ func (c *persistentVolumes) Delete(name string) error { return c.client.Delete().Resource("persistentVolumes").Name(name).Do().Error() } -func (c *persistentVolumes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *persistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) { return c.client.Get(). Prefix("watch"). Resource("persistentVolumes"). diff --git a/pkg/client/unversioned/pod_templates.go b/pkg/client/unversioned/pod_templates.go index 18c6b37c094..f26d3333ed4 100644 --- a/pkg/client/unversioned/pod_templates.go +++ b/pkg/client/unversioned/pod_templates.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -29,12 +28,12 @@ type PodTemplatesNamespacer interface { // PodTemplateInterface has methods to work with PodTemplate resources. type PodTemplateInterface interface { - List(opts unversioned.ListOptions) (*api.PodTemplateList, error) + List(opts api.ListOptions) (*api.PodTemplateList, error) Get(name string) (*api.PodTemplate, error) Delete(name string, options *api.DeleteOptions) error Create(podTemplate *api.PodTemplate) (*api.PodTemplate, error) Update(podTemplate *api.PodTemplate) (*api.PodTemplate, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // podTemplates implements PodTemplatesNamespacer interface @@ -52,7 +51,7 @@ func newPodTemplates(c *Client, namespace string) *podTemplates { } // List takes label and field selectors, and returns the list of podTemplates that match those selectors. -func (c *podTemplates) List(opts unversioned.ListOptions) (result *api.PodTemplateList, err error) { +func (c *podTemplates) List(opts api.ListOptions) (result *api.PodTemplateList, err error) { result = &api.PodTemplateList{} err = c.r.Get().Namespace(c.ns).Resource("podTemplates").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -93,7 +92,7 @@ func (c *podTemplates) Update(podTemplate *api.PodTemplate) (result *api.PodTemp } // Watch returns a watch.Interface that watches the requested podTemplates. -func (c *podTemplates) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *podTemplates) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/pod_templates_test.go b/pkg/client/unversioned/pod_templates_test.go index f454adb7179..8850033de17 100644 --- a/pkg/client/unversioned/pod_templates_test.go +++ b/pkg/client/unversioned/pod_templates_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getPodTemplatesResoureName() string { @@ -101,7 +100,7 @@ func TestPodTemplateList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: podTemplateList}, } - response, err := c.Setup(t).PodTemplates(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).PodTemplates(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -141,6 +140,6 @@ func TestPodTemplateWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).PodTemplates(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).PodTemplates(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/pods.go b/pkg/client/unversioned/pods.go index 5fbe2471a24..7d01c1bc0f4 100644 --- a/pkg/client/unversioned/pods.go +++ b/pkg/client/unversioned/pods.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -29,12 +28,12 @@ type PodsNamespacer interface { // PodInterface has methods to work with Pod resources. type PodInterface interface { - List(opts unversioned.ListOptions) (*api.PodList, error) + List(opts api.ListOptions) (*api.PodList, error) Get(name string) (*api.Pod, error) Delete(name string, options *api.DeleteOptions) error Create(pod *api.Pod) (*api.Pod, error) Update(pod *api.Pod) (*api.Pod, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) Bind(binding *api.Binding) error UpdateStatus(pod *api.Pod) (*api.Pod, error) GetLogs(name string, opts *api.PodLogOptions) *Request @@ -55,7 +54,7 @@ func newPods(c *Client, namespace string) *pods { } // List takes label and field selectors, and returns the list of pods that match those selectors. -func (c *pods) List(opts unversioned.ListOptions) (result *api.PodList, err error) { +func (c *pods) List(opts api.ListOptions) (result *api.PodList, err error) { result = &api.PodList{} err = c.r.Get().Namespace(c.ns).Resource("pods").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -96,7 +95,7 @@ func (c *pods) Update(pod *api.Pod) (result *api.Pod, err error) { } // Watch returns a watch.Interface that watches the requested pods. -func (c *pods) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *pods) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/pods_test.go b/pkg/client/unversioned/pods_test.go index 4c4666d1b3d..8da0d862710 100644 --- a/pkg/client/unversioned/pods_test.go +++ b/pkg/client/unversioned/pods_test.go @@ -36,7 +36,7 @@ func TestListEmptyPods(t *testing.T) { Request: simple.Request{Method: "GET", Path: testapi.Default.ResourcePath("pods", ns, ""), Query: simple.BuildQueryValues(nil)}, Response: simple.Response{StatusCode: http.StatusOK, Body: &api.PodList{}}, } - podList, err := c.Setup(t).Pods(ns).List(unversioned.ListOptions{}) + podList, err := c.Setup(t).Pods(ns).List(api.ListOptions{}) c.Validate(t, podList, err) } @@ -62,7 +62,7 @@ func TestListPods(t *testing.T) { }, }, } - receivedPodList, err := c.Setup(t).Pods(ns).List(unversioned.ListOptions{}) + receivedPodList, err := c.Setup(t).Pods(ns).List(api.ListOptions{}) c.Validate(t, receivedPodList, err) } @@ -96,7 +96,7 @@ func TestListPodsLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} receivedPodList, err := c.Pods(ns).List(options) c.Validate(t, receivedPodList, err) } diff --git a/pkg/client/unversioned/replication_controllers.go b/pkg/client/unversioned/replication_controllers.go index b1f923e7ebc..828a47ce6ea 100644 --- a/pkg/client/unversioned/replication_controllers.go +++ b/pkg/client/unversioned/replication_controllers.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -29,13 +28,13 @@ type ReplicationControllersNamespacer interface { // ReplicationControllerInterface has methods to work with ReplicationController resources. type ReplicationControllerInterface interface { - List(opts unversioned.ListOptions) (*api.ReplicationControllerList, error) + List(opts api.ListOptions) (*api.ReplicationControllerList, error) Get(name string) (*api.ReplicationController, error) Create(ctrl *api.ReplicationController) (*api.ReplicationController, error) Update(ctrl *api.ReplicationController) (*api.ReplicationController, error) UpdateStatus(ctrl *api.ReplicationController) (*api.ReplicationController, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // replicationControllers implements ReplicationControllersNamespacer interface @@ -50,7 +49,7 @@ func newReplicationControllers(c *Client, namespace string) *replicationControll } // List takes a selector, and returns the list of replication controllers that match that selector. -func (c *replicationControllers) List(opts unversioned.ListOptions) (result *api.ReplicationControllerList, err error) { +func (c *replicationControllers) List(opts api.ListOptions) (result *api.ReplicationControllerList, err error) { result = &api.ReplicationControllerList{} err = c.r.Get().Namespace(c.ns).Resource("replicationControllers").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -90,7 +89,7 @@ func (c *replicationControllers) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested controllers. -func (c *replicationControllers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *replicationControllers) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/replication_controllers_test.go b/pkg/client/unversioned/replication_controllers_test.go index bb81591275d..84ee306097c 100644 --- a/pkg/client/unversioned/replication_controllers_test.go +++ b/pkg/client/unversioned/replication_controllers_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getRCResourceName() string { @@ -60,7 +59,7 @@ func TestListControllers(t *testing.T) { }, }, } - receivedControllerList, err := c.Setup(t).ReplicationControllers(ns).List(unversioned.ListOptions{}) + receivedControllerList, err := c.Setup(t).ReplicationControllers(ns).List(api.ListOptions{}) c.Validate(t, receivedControllerList, err) } diff --git a/pkg/client/unversioned/request_test.go b/pkg/client/unversioned/request_test.go index bc0e02062c0..e82bd57049f 100644 --- a/pkg/client/unversioned/request_test.go +++ b/pkg/client/unversioned/request_test.go @@ -195,7 +195,7 @@ func TestRequestVersionedParams(t *testing.T) { func TestRequestVersionedParamsFromListOptions(t *testing.T) { r := &Request{groupVersion: v1.SchemeGroupVersion} - r.VersionedParams(&unversioned.ListOptions{ResourceVersion: "1"}, api.Scheme) + r.VersionedParams(&api.ListOptions{ResourceVersion: "1"}, api.Scheme) if !reflect.DeepEqual(r.params, url.Values{ "resourceVersion": []string{"1"}, }) { @@ -203,7 +203,7 @@ func TestRequestVersionedParamsFromListOptions(t *testing.T) { } var timeout int64 = 10 - r.VersionedParams(&unversioned.ListOptions{ResourceVersion: "2", TimeoutSeconds: &timeout}, api.Scheme) + r.VersionedParams(&api.ListOptions{ResourceVersion: "2", TimeoutSeconds: &timeout}, api.Scheme) if !reflect.DeepEqual(r.params, url.Values{ "resourceVersion": []string{"1", "2"}, "timeoutSeconds": []string{"10"}, diff --git a/pkg/client/unversioned/resource_quotas.go b/pkg/client/unversioned/resource_quotas.go index 75729d9a03d..1eed04d018b 100644 --- a/pkg/client/unversioned/resource_quotas.go +++ b/pkg/client/unversioned/resource_quotas.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -29,13 +28,13 @@ type ResourceQuotasNamespacer interface { // ResourceQuotaInterface has methods to work with ResourceQuota resources. type ResourceQuotaInterface interface { - List(opts unversioned.ListOptions) (*api.ResourceQuotaList, error) + List(opts api.ListOptions) (*api.ResourceQuotaList, error) Get(name string) (*api.ResourceQuota, error) Delete(name string) error Create(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) Update(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) UpdateStatus(resourceQuota *api.ResourceQuota) (*api.ResourceQuota, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // resourceQuotas implements ResourceQuotasNamespacer interface @@ -53,7 +52,7 @@ func newResourceQuotas(c *Client, namespace string) *resourceQuotas { } // List takes a selector, and returns the list of resourceQuotas that match that selector. -func (c *resourceQuotas) List(opts unversioned.ListOptions) (result *api.ResourceQuotaList, err error) { +func (c *resourceQuotas) List(opts api.ListOptions) (result *api.ResourceQuotaList, err error) { result = &api.ResourceQuotaList{} err = c.r.Get().Namespace(c.ns).Resource("resourceQuotas").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -93,7 +92,7 @@ func (c *resourceQuotas) UpdateStatus(resourceQuota *api.ResourceQuota) (result } // Watch returns a watch.Interface that watches the requested resource -func (c *resourceQuotas) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *resourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/resource_quotas_test.go b/pkg/client/unversioned/resource_quotas_test.go index 2e5cf48f72d..0bbc487ba01 100644 --- a/pkg/client/unversioned/resource_quotas_test.go +++ b/pkg/client/unversioned/resource_quotas_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" ) func getResourceQuotasResoureName() string { @@ -118,7 +117,7 @@ func TestResourceQuotaList(t *testing.T) { }, Response: simple.Response{StatusCode: 200, Body: resourceQuotaList}, } - response, err := c.Setup(t).ResourceQuotas(ns).List(unversioned.ListOptions{}) + response, err := c.Setup(t).ResourceQuotas(ns).List(api.ListOptions{}) c.Validate(t, response, err) } @@ -197,6 +196,6 @@ func TestResourceQuotaWatch(t *testing.T) { Query: url.Values{"resourceVersion": []string{}}}, Response: simple.Response{StatusCode: 200}, } - _, err := c.Setup(t).ResourceQuotas(api.NamespaceAll).Watch(unversioned.ListOptions{}) + _, err := c.Setup(t).ResourceQuotas(api.NamespaceAll).Watch(api.ListOptions{}) c.Validate(t, nil, err) } diff --git a/pkg/client/unversioned/secrets.go b/pkg/client/unversioned/secrets.go index a20b0fb3bc7..3f675a68b29 100644 --- a/pkg/client/unversioned/secrets.go +++ b/pkg/client/unversioned/secrets.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -30,9 +29,9 @@ type SecretsInterface interface { Create(secret *api.Secret) (*api.Secret, error) Update(secret *api.Secret) (*api.Secret, error) Delete(name string) error - List(opts unversioned.ListOptions) (*api.SecretList, error) + List(opts api.ListOptions) (*api.SecretList, error) Get(name string) (*api.Secret, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // events implements Secrets interface @@ -62,7 +61,7 @@ func (s *secrets) Create(secret *api.Secret) (*api.Secret, error) { } // List returns a list of secrets matching the selectors. -func (s *secrets) List(opts unversioned.ListOptions) (*api.SecretList, error) { +func (s *secrets) List(opts api.ListOptions) (*api.SecretList, error) { result := &api.SecretList{} err := s.client.Get(). @@ -89,7 +88,7 @@ func (s *secrets) Get(name string) (*api.Secret, error) { } // Watch starts watching for secrets matching the given selectors. -func (s *secrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (s *secrets) Watch(opts api.ListOptions) (watch.Interface, error) { return s.client.Get(). Prefix("watch"). Namespace(s.namespace). diff --git a/pkg/client/unversioned/service_accounts.go b/pkg/client/unversioned/service_accounts.go index 6a2ccc60075..d826dfc95d5 100644 --- a/pkg/client/unversioned/service_accounts.go +++ b/pkg/client/unversioned/service_accounts.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -30,9 +29,9 @@ type ServiceAccountsInterface interface { Create(serviceAccount *api.ServiceAccount) (*api.ServiceAccount, error) Update(serviceAccount *api.ServiceAccount) (*api.ServiceAccount, error) Delete(name string) error - List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) + List(opts api.ListOptions) (*api.ServiceAccountList, error) Get(name string) (*api.ServiceAccount, error) - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // serviceAccounts implements ServiceAccounts interface @@ -62,7 +61,7 @@ func (s *serviceAccounts) Create(serviceAccount *api.ServiceAccount) (*api.Servi } // List returns a list of serviceAccounts matching the selectors. -func (s *serviceAccounts) List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) { +func (s *serviceAccounts) List(opts api.ListOptions) (*api.ServiceAccountList, error) { result := &api.ServiceAccountList{} err := s.client.Get(). @@ -89,7 +88,7 @@ func (s *serviceAccounts) Get(name string) (*api.ServiceAccount, error) { } // Watch starts watching for serviceAccounts matching the given selectors. -func (s *serviceAccounts) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (s *serviceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) { return s.client.Get(). Prefix("watch"). Namespace(s.namespace). diff --git a/pkg/client/unversioned/services.go b/pkg/client/unversioned/services.go index eabe9cad188..45ef56ad955 100644 --- a/pkg/client/unversioned/services.go +++ b/pkg/client/unversioned/services.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" ) @@ -30,12 +29,12 @@ type ServicesNamespacer interface { // ServiceInterface has methods to work with Service resources. type ServiceInterface interface { - List(opts unversioned.ListOptions) (*api.ServiceList, error) + List(opts api.ListOptions) (*api.ServiceList, error) Get(name string) (*api.Service, error) Create(srv *api.Service) (*api.Service, error) Update(srv *api.Service) (*api.Service, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) ProxyGet(scheme, name, port, path string, params map[string]string) ResponseWrapper } @@ -51,7 +50,7 @@ func newServices(c *Client, namespace string) *services { } // List takes a selector, and returns the list of services that match that selector -func (c *services) List(opts unversioned.ListOptions) (result *api.ServiceList, err error) { +func (c *services) List(opts api.ListOptions) (result *api.ServiceList, err error) { result = &api.ServiceList{} err = c.r.Get(). Namespace(c.ns). @@ -89,7 +88,7 @@ func (c *services) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested services. -func (c *services) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *services) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/services_test.go b/pkg/client/unversioned/services_test.go index ebda5158247..d6136ee2ef4 100644 --- a/pkg/client/unversioned/services_test.go +++ b/pkg/client/unversioned/services_test.go @@ -59,7 +59,7 @@ func TestListServices(t *testing.T) { }, }, } - receivedServiceList, err := c.Setup(t).Services(ns).List(unversioned.ListOptions{}) + receivedServiceList, err := c.Setup(t).Services(ns).List(api.ListOptions{}) t.Logf("received services: %v %#v", err, receivedServiceList) c.Validate(t, receivedServiceList, err) } @@ -96,7 +96,7 @@ func TestListServicesLabels(t *testing.T) { c.Setup(t) c.QueryValidator[labelSelectorQueryParamName] = simple.ValidateLabels selector := labels.Set{"foo": "bar", "name": "baz"}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} receivedServiceList, err := c.Services(ns).List(options) c.Validate(t, receivedServiceList, err) } diff --git a/pkg/client/unversioned/testclient/actions.go b/pkg/client/unversioned/testclient/actions.go index fc6951c84bc..1e5a5e47011 100644 --- a/pkg/client/unversioned/testclient/actions.go +++ b/pkg/client/unversioned/testclient/actions.go @@ -19,7 +19,7 @@ package testclient import ( "strings" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -44,15 +44,15 @@ func NewGetAction(resource, namespace, name string) GetActionImpl { return action } -func NewRootListAction(resource string, opts unversioned.ListOptions) ListActionImpl { +func NewRootListAction(resource string, opts api.ListOptions) ListActionImpl { action := ListActionImpl{} action.Verb = "list" action.Resource = resource - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } @@ -61,16 +61,16 @@ func NewRootListAction(resource string, opts unversioned.ListOptions) ListAction return action } -func NewListAction(resource, namespace string, opts unversioned.ListOptions) ListActionImpl { +func NewListAction(resource, namespace string, opts api.ListOptions) ListActionImpl { action := ListActionImpl{} action.Verb = "list" action.Resource = resource action.Namespace = namespace - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } @@ -166,15 +166,15 @@ func NewDeleteAction(resource, namespace, name string) DeleteActionImpl { return action } -func NewRootDeleteCollectionAction(resource string, opts unversioned.ListOptions) DeleteCollectionActionImpl { +func NewRootDeleteCollectionAction(resource string, opts api.ListOptions) DeleteCollectionActionImpl { action := DeleteCollectionActionImpl{} action.Verb = "delete-collection" action.Resource = resource - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } @@ -183,16 +183,16 @@ func NewRootDeleteCollectionAction(resource string, opts unversioned.ListOptions return action } -func NewDeleteCollectionAction(resource, namespace string, opts unversioned.ListOptions) DeleteCollectionActionImpl { +func NewDeleteCollectionAction(resource, namespace string, opts api.ListOptions) DeleteCollectionActionImpl { action := DeleteCollectionActionImpl{} action.Verb = "delete-collection" action.Resource = resource action.Namespace = namespace - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } @@ -201,15 +201,15 @@ func NewDeleteCollectionAction(resource, namespace string, opts unversioned.List return action } -func NewRootWatchAction(resource string, opts unversioned.ListOptions) WatchActionImpl { +func NewRootWatchAction(resource string, opts api.ListOptions) WatchActionImpl { action := WatchActionImpl{} action.Verb = "watch" action.Resource = resource - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } @@ -218,16 +218,16 @@ func NewRootWatchAction(resource string, opts unversioned.ListOptions) WatchActi return action } -func NewWatchAction(resource, namespace string, opts unversioned.ListOptions) WatchActionImpl { +func NewWatchAction(resource, namespace string, opts api.ListOptions) WatchActionImpl { action := WatchActionImpl{} action.Verb = "watch" action.Resource = resource action.Namespace = namespace - labelSelector := opts.LabelSelector.Selector + labelSelector := opts.LabelSelector if labelSelector == nil { labelSelector = labels.Everything() } - fieldSelector := opts.FieldSelector.Selector + fieldSelector := opts.FieldSelector if fieldSelector == nil { fieldSelector = fields.Everything() } diff --git a/pkg/client/unversioned/testclient/fake_componentstatuses.go b/pkg/client/unversioned/testclient/fake_componentstatuses.go index 535f29d64f0..34bf210d473 100644 --- a/pkg/client/unversioned/testclient/fake_componentstatuses.go +++ b/pkg/client/unversioned/testclient/fake_componentstatuses.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" ) // Fake implements ComponentStatusInterface. @@ -35,7 +34,7 @@ func (c *FakeComponentStatuses) Get(name string) (*api.ComponentStatus, error) { return obj.(*api.ComponentStatus), err } -func (c *FakeComponentStatuses) List(opts unversioned.ListOptions) (result *api.ComponentStatusList, err error) { +func (c *FakeComponentStatuses) List(opts api.ListOptions) (result *api.ComponentStatusList, err error) { obj, err := c.Fake.Invokes(NewRootListAction("componentstatuses", opts), &api.ComponentStatusList{}) if obj == nil { return nil, err diff --git a/pkg/client/unversioned/testclient/fake_daemon_sets.go b/pkg/client/unversioned/testclient/fake_daemon_sets.go index 27483827213..d0e1e73e149 100644 --- a/pkg/client/unversioned/testclient/fake_daemon_sets.go +++ b/pkg/client/unversioned/testclient/fake_daemon_sets.go @@ -17,7 +17,7 @@ limitations under the License. package testclient import ( - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" kclientlib "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/watch" @@ -41,7 +41,7 @@ func (c *FakeDaemonSets) Get(name string) (*extensions.DaemonSet, error) { return obj.(*extensions.DaemonSet), err } -func (c *FakeDaemonSets) List(opts unversioned.ListOptions) (*extensions.DaemonSetList, error) { +func (c *FakeDaemonSets) List(opts api.ListOptions) (*extensions.DaemonSetList, error) { obj, err := c.Fake.Invokes(NewListAction("daemonsets", c.Namespace, opts), &extensions.DaemonSetList{}) if obj == nil { return nil, err @@ -78,6 +78,6 @@ func (c *FakeDaemonSets) Delete(name string) error { return err } -func (c *FakeDaemonSets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeDaemonSets) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("daemonsets", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_deployments.go b/pkg/client/unversioned/testclient/fake_deployments.go index 3b4a2ecd5e3..6df56782c36 100644 --- a/pkg/client/unversioned/testclient/fake_deployments.go +++ b/pkg/client/unversioned/testclient/fake_deployments.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" @@ -40,12 +39,12 @@ func (c *FakeDeployments) Get(name string) (*extensions.Deployment, error) { return obj.(*extensions.Deployment), err } -func (c *FakeDeployments) List(opts unversioned.ListOptions) (*extensions.DeploymentList, error) { +func (c *FakeDeployments) List(opts api.ListOptions) (*extensions.DeploymentList, error) { obj, err := c.Fake.Invokes(NewListAction("deployments", c.Namespace, opts), &extensions.DeploymentList{}) if obj == nil { return nil, err } - label := opts.LabelSelector.Selector + label := opts.LabelSelector if label == nil { label = labels.Everything() } @@ -90,6 +89,6 @@ func (c *FakeDeployments) Delete(name string, options *api.DeleteOptions) error return err } -func (c *FakeDeployments) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeDeployments) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("deployments", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_endpoints.go b/pkg/client/unversioned/testclient/fake_endpoints.go index c88effc3a8e..68f6178f778 100644 --- a/pkg/client/unversioned/testclient/fake_endpoints.go +++ b/pkg/client/unversioned/testclient/fake_endpoints.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeEndpoints) Get(name string) (*api.Endpoints, error) { return obj.(*api.Endpoints), err } -func (c *FakeEndpoints) List(opts unversioned.ListOptions) (*api.EndpointsList, error) { +func (c *FakeEndpoints) List(opts api.ListOptions) (*api.EndpointsList, error) { obj, err := c.Fake.Invokes(NewListAction("endpoints", c.Namespace, opts), &api.EndpointsList{}) if obj == nil { return nil, err @@ -70,6 +69,6 @@ func (c *FakeEndpoints) Delete(name string) error { return err } -func (c *FakeEndpoints) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeEndpoints) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("endpoints", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_events.go b/pkg/client/unversioned/testclient/fake_events.go index be4406e9f97..3da2143fc41 100644 --- a/pkg/client/unversioned/testclient/fake_events.go +++ b/pkg/client/unversioned/testclient/fake_events.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" @@ -46,7 +45,7 @@ func (c *FakeEvents) Get(name string) (*api.Event, error) { } // List returns a list of events matching the selectors. -func (c *FakeEvents) List(opts unversioned.ListOptions) (*api.EventList, error) { +func (c *FakeEvents) List(opts api.ListOptions) (*api.EventList, error) { action := NewRootListAction("events", opts) if c.Namespace != "" { action = NewListAction("events", c.Namespace, opts) @@ -110,7 +109,7 @@ func (c *FakeEvents) Delete(name string) error { return err } -func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions unversioned.ListOptions) error { +func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions api.ListOptions) error { action := NewRootDeleteCollectionAction("events", listOptions) if c.Namespace != "" { action = NewDeleteCollectionAction("events", c.Namespace, listOptions) @@ -120,7 +119,7 @@ func (c *FakeEvents) DeleteCollection(options *api.DeleteOptions, listOptions un } // Watch starts watching for events matching the given selectors. -func (c *FakeEvents) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeEvents) Watch(opts api.ListOptions) (watch.Interface, error) { action := NewRootWatchAction("events", opts) if c.Namespace != "" { action = NewWatchAction("events", c.Namespace, opts) @@ -130,9 +129,9 @@ func (c *FakeEvents) Watch(opts unversioned.ListOptions) (watch.Interface, error // Search returns a list of events matching the specified object. func (c *FakeEvents) Search(objOrRef runtime.Object) (*api.EventList, error) { - action := NewRootListAction("events", unversioned.ListOptions{}) + action := NewRootListAction("events", api.ListOptions{}) if c.Namespace != "" { - action = NewListAction("events", c.Namespace, unversioned.ListOptions{}) + action = NewListAction("events", c.Namespace, api.ListOptions{}) } obj, err := c.Fake.Invokes(action, &api.EventList{}) if obj == nil { diff --git a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go index 28e1c3c3a18..a70a1af99db 100644 --- a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go +++ b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" @@ -40,12 +39,12 @@ func (c *FakeHorizontalPodAutoscalers) Get(name string) (*extensions.HorizontalP return obj.(*extensions.HorizontalPodAutoscaler), err } -func (c *FakeHorizontalPodAutoscalers) List(opts unversioned.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) { +func (c *FakeHorizontalPodAutoscalers) List(opts api.ListOptions) (*extensions.HorizontalPodAutoscalerList, error) { obj, err := c.Fake.Invokes(NewListAction("horizontalpodautoscalers", c.Namespace, opts), &extensions.HorizontalPodAutoscalerList{}) if obj == nil { return nil, err } - label := opts.LabelSelector.Selector + label := opts.LabelSelector if label == nil { label = labels.Everything() } @@ -89,6 +88,6 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOp return err } -func (c *FakeHorizontalPodAutoscalers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeHorizontalPodAutoscalers) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("horizontalpodautoscalers", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_ingress.go b/pkg/client/unversioned/testclient/fake_ingress.go index f05584513de..b15458997f1 100644 --- a/pkg/client/unversioned/testclient/fake_ingress.go +++ b/pkg/client/unversioned/testclient/fake_ingress.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -39,7 +38,7 @@ func (c *FakeIngress) Get(name string) (*extensions.Ingress, error) { return obj.(*extensions.Ingress), err } -func (c *FakeIngress) List(opts unversioned.ListOptions) (*extensions.IngressList, error) { +func (c *FakeIngress) List(opts api.ListOptions) (*extensions.IngressList, error) { obj, err := c.Fake.Invokes(NewListAction("ingresses", c.Namespace, opts), &extensions.IngressList{}) if obj == nil { return nil, err @@ -71,7 +70,7 @@ func (c *FakeIngress) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakeIngress) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeIngress) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("ingresses", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_jobs.go b/pkg/client/unversioned/testclient/fake_jobs.go index dbacfd4fb8c..d6fb79fa1c2 100644 --- a/pkg/client/unversioned/testclient/fake_jobs.go +++ b/pkg/client/unversioned/testclient/fake_jobs.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -39,7 +38,7 @@ func (c *FakeJobs) Get(name string) (*extensions.Job, error) { return obj.(*extensions.Job), err } -func (c *FakeJobs) List(opts unversioned.ListOptions) (*extensions.JobList, error) { +func (c *FakeJobs) List(opts api.ListOptions) (*extensions.JobList, error) { obj, err := c.Fake.Invokes(NewListAction("jobs", c.Namespace, opts), &extensions.JobList{}) if obj == nil { return nil, err @@ -71,7 +70,7 @@ func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakeJobs) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeJobs) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("jobs", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_limit_ranges.go b/pkg/client/unversioned/testclient/fake_limit_ranges.go index 32179700a84..3669f5ff823 100644 --- a/pkg/client/unversioned/testclient/fake_limit_ranges.go +++ b/pkg/client/unversioned/testclient/fake_limit_ranges.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeLimitRanges) Get(name string) (*api.LimitRange, error) { return obj.(*api.LimitRange), err } -func (c *FakeLimitRanges) List(opts unversioned.ListOptions) (*api.LimitRangeList, error) { +func (c *FakeLimitRanges) List(opts api.ListOptions) (*api.LimitRangeList, error) { obj, err := c.Fake.Invokes(NewListAction("limitranges", c.Namespace, opts), &api.LimitRangeList{}) if obj == nil { return nil, err @@ -70,6 +69,6 @@ func (c *FakeLimitRanges) Delete(name string) error { return err } -func (c *FakeLimitRanges) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeLimitRanges) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("limitranges", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_namespaces.go b/pkg/client/unversioned/testclient/fake_namespaces.go index 27edc4e3bba..8c4ac1ac273 100644 --- a/pkg/client/unversioned/testclient/fake_namespaces.go +++ b/pkg/client/unversioned/testclient/fake_namespaces.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -37,7 +36,7 @@ func (c *FakeNamespaces) Get(name string) (*api.Namespace, error) { return obj.(*api.Namespace), err } -func (c *FakeNamespaces) List(opts unversioned.ListOptions) (*api.NamespaceList, error) { +func (c *FakeNamespaces) List(opts api.ListOptions) (*api.NamespaceList, error) { obj, err := c.Fake.Invokes(NewRootListAction("namespaces", opts), &api.NamespaceList{}) if obj == nil { return nil, err @@ -69,7 +68,7 @@ func (c *FakeNamespaces) Delete(name string) error { return err } -func (c *FakeNamespaces) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeNamespaces) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewRootWatchAction("namespaces", opts)) } diff --git a/pkg/client/unversioned/testclient/fake_nodes.go b/pkg/client/unversioned/testclient/fake_nodes.go index 7d59e7fa5b5..b1943366e58 100644 --- a/pkg/client/unversioned/testclient/fake_nodes.go +++ b/pkg/client/unversioned/testclient/fake_nodes.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -37,7 +36,7 @@ func (c *FakeNodes) Get(name string) (*api.Node, error) { return obj.(*api.Node), err } -func (c *FakeNodes) List(opts unversioned.ListOptions) (*api.NodeList, error) { +func (c *FakeNodes) List(opts api.ListOptions) (*api.NodeList, error) { obj, err := c.Fake.Invokes(NewRootListAction("nodes", opts), &api.NodeList{}) if obj == nil { return nil, err @@ -69,7 +68,7 @@ func (c *FakeNodes) Delete(name string) error { return err } -func (c *FakeNodes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeNodes) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewRootWatchAction("nodes", opts)) } diff --git a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go index d37af71932a..cadfb084c33 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -36,7 +35,7 @@ func (c *FakePersistentVolumeClaims) Get(name string) (*api.PersistentVolumeClai return obj.(*api.PersistentVolumeClaim), err } -func (c *FakePersistentVolumeClaims) List(opts unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) { +func (c *FakePersistentVolumeClaims) List(opts api.ListOptions) (*api.PersistentVolumeClaimList, error) { obj, err := c.Fake.Invokes(NewListAction("persistentvolumeclaims", c.Namespace, opts), &api.PersistentVolumeClaimList{}) if obj == nil { return nil, err @@ -68,7 +67,7 @@ func (c *FakePersistentVolumeClaims) Delete(name string) error { return err } -func (c *FakePersistentVolumeClaims) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakePersistentVolumeClaims) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("persistentvolumeclaims", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_persistent_volumes.go b/pkg/client/unversioned/testclient/fake_persistent_volumes.go index 65993f9109a..cb184bc4416 100644 --- a/pkg/client/unversioned/testclient/fake_persistent_volumes.go +++ b/pkg/client/unversioned/testclient/fake_persistent_volumes.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -35,7 +34,7 @@ func (c *FakePersistentVolumes) Get(name string) (*api.PersistentVolume, error) return obj.(*api.PersistentVolume), err } -func (c *FakePersistentVolumes) List(opts unversioned.ListOptions) (*api.PersistentVolumeList, error) { +func (c *FakePersistentVolumes) List(opts api.ListOptions) (*api.PersistentVolumeList, error) { obj, err := c.Fake.Invokes(NewRootListAction("persistentvolumes", opts), &api.PersistentVolumeList{}) if obj == nil { return nil, err @@ -67,7 +66,7 @@ func (c *FakePersistentVolumes) Delete(name string) error { return err } -func (c *FakePersistentVolumes) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakePersistentVolumes) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewRootWatchAction("persistentvolumes", opts)) } diff --git a/pkg/client/unversioned/testclient/fake_pod_templates.go b/pkg/client/unversioned/testclient/fake_pod_templates.go index ef13aa63ad0..47ff3d8ace2 100644 --- a/pkg/client/unversioned/testclient/fake_pod_templates.go +++ b/pkg/client/unversioned/testclient/fake_pod_templates.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakePodTemplates) Get(name string) (*api.PodTemplate, error) { return obj.(*api.PodTemplate), err } -func (c *FakePodTemplates) List(opts unversioned.ListOptions) (*api.PodTemplateList, error) { +func (c *FakePodTemplates) List(opts api.ListOptions) (*api.PodTemplateList, error) { obj, err := c.Fake.Invokes(NewListAction("podtemplates", c.Namespace, opts), &api.PodTemplateList{}) if obj == nil { return nil, err @@ -70,6 +69,6 @@ func (c *FakePodTemplates) Delete(name string, options *api.DeleteOptions) error return err } -func (c *FakePodTemplates) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakePodTemplates) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("podtemplates", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_pods.go b/pkg/client/unversioned/testclient/fake_pods.go index 2827458f267..824356aacd4 100644 --- a/pkg/client/unversioned/testclient/fake_pods.go +++ b/pkg/client/unversioned/testclient/fake_pods.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/watch" @@ -40,12 +39,12 @@ func (c *FakePods) Get(name string) (*api.Pod, error) { return obj.(*api.Pod), err } -func (c *FakePods) List(opts unversioned.ListOptions) (*api.PodList, error) { +func (c *FakePods) List(opts api.ListOptions) (*api.PodList, error) { obj, err := c.Fake.Invokes(NewListAction("pods", c.Namespace, opts), &api.PodList{}) if obj == nil { return nil, err } - label := opts.LabelSelector.Selector + label := opts.LabelSelector if label == nil { label = labels.Everything() } @@ -81,7 +80,7 @@ func (c *FakePods) Delete(name string, options *api.DeleteOptions) error { return err } -func (c *FakePods) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakePods) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("pods", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_replication_controllers.go b/pkg/client/unversioned/testclient/fake_replication_controllers.go index c87a5f70cdc..e44b8261558 100644 --- a/pkg/client/unversioned/testclient/fake_replication_controllers.go +++ b/pkg/client/unversioned/testclient/fake_replication_controllers.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeReplicationControllers) Get(name string) (*api.ReplicationControlle return obj.(*api.ReplicationController), err } -func (c *FakeReplicationControllers) List(opts unversioned.ListOptions) (*api.ReplicationControllerList, error) { +func (c *FakeReplicationControllers) List(opts api.ListOptions) (*api.ReplicationControllerList, error) { obj, err := c.Fake.Invokes(NewListAction("replicationcontrollers", c.Namespace, opts), &api.ReplicationControllerList{}) if obj == nil { return nil, err @@ -78,6 +77,6 @@ func (c *FakeReplicationControllers) Delete(name string) error { return err } -func (c *FakeReplicationControllers) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeReplicationControllers) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("replicationcontrollers", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_resource_quotas.go b/pkg/client/unversioned/testclient/fake_resource_quotas.go index fcb75c5cf71..d5090f0d0fb 100644 --- a/pkg/client/unversioned/testclient/fake_resource_quotas.go +++ b/pkg/client/unversioned/testclient/fake_resource_quotas.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeResourceQuotas) Get(name string) (*api.ResourceQuota, error) { return obj.(*api.ResourceQuota), err } -func (c *FakeResourceQuotas) List(opts unversioned.ListOptions) (*api.ResourceQuotaList, error) { +func (c *FakeResourceQuotas) List(opts api.ListOptions) (*api.ResourceQuotaList, error) { obj, err := c.Fake.Invokes(NewListAction("resourcequotas", c.Namespace, opts), &api.ResourceQuotaList{}) if obj == nil { return nil, err @@ -70,7 +69,7 @@ func (c *FakeResourceQuotas) Delete(name string) error { return err } -func (c *FakeResourceQuotas) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeResourceQuotas) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("resourcequotas", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_secrets.go b/pkg/client/unversioned/testclient/fake_secrets.go index b4349fd6c8e..f54cffb8717 100644 --- a/pkg/client/unversioned/testclient/fake_secrets.go +++ b/pkg/client/unversioned/testclient/fake_secrets.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeSecrets) Get(name string) (*api.Secret, error) { return obj.(*api.Secret), err } -func (c *FakeSecrets) List(opts unversioned.ListOptions) (*api.SecretList, error) { +func (c *FakeSecrets) List(opts api.ListOptions) (*api.SecretList, error) { obj, err := c.Fake.Invokes(NewListAction("secrets", c.Namespace, opts), &api.SecretList{}) if obj == nil { return nil, err @@ -70,6 +69,6 @@ func (c *FakeSecrets) Delete(name string) error { return err } -func (c *FakeSecrets) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeSecrets) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("secrets", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_service_accounts.go b/pkg/client/unversioned/testclient/fake_service_accounts.go index 7e1aa32851f..e40641668e1 100644 --- a/pkg/client/unversioned/testclient/fake_service_accounts.go +++ b/pkg/client/unversioned/testclient/fake_service_accounts.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -38,7 +37,7 @@ func (c *FakeServiceAccounts) Get(name string) (*api.ServiceAccount, error) { return obj.(*api.ServiceAccount), err } -func (c *FakeServiceAccounts) List(opts unversioned.ListOptions) (*api.ServiceAccountList, error) { +func (c *FakeServiceAccounts) List(opts api.ListOptions) (*api.ServiceAccountList, error) { obj, err := c.Fake.Invokes(NewListAction("serviceaccounts", c.Namespace, opts), &api.ServiceAccountList{}) if obj == nil { return nil, err @@ -70,6 +69,6 @@ func (c *FakeServiceAccounts) Delete(name string) error { return err } -func (c *FakeServiceAccounts) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeServiceAccounts) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("serviceaccounts", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_services.go b/pkg/client/unversioned/testclient/fake_services.go index 5604f767756..8c1a7de4a75 100644 --- a/pkg/client/unversioned/testclient/fake_services.go +++ b/pkg/client/unversioned/testclient/fake_services.go @@ -18,7 +18,6 @@ package testclient import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -39,7 +38,7 @@ func (c *FakeServices) Get(name string) (*api.Service, error) { return obj.(*api.Service), err } -func (c *FakeServices) List(opts unversioned.ListOptions) (*api.ServiceList, error) { +func (c *FakeServices) List(opts api.ListOptions) (*api.ServiceList, error) { obj, err := c.Fake.Invokes(NewListAction("services", c.Namespace, opts), &api.ServiceList{}) if obj == nil { return nil, err @@ -71,7 +70,7 @@ func (c *FakeServices) Delete(name string) error { return err } -func (c *FakeServices) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeServices) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("services", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/fake_thirdpartyresources.go b/pkg/client/unversioned/testclient/fake_thirdpartyresources.go index 516724ff0ef..8aa198d70e7 100644 --- a/pkg/client/unversioned/testclient/fake_thirdpartyresources.go +++ b/pkg/client/unversioned/testclient/fake_thirdpartyresources.go @@ -17,7 +17,7 @@ limitations under the License. package testclient import ( - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" kclientlib "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/watch" @@ -41,7 +41,7 @@ func (c *FakeThirdPartyResources) Get(name string) (*extensions.ThirdPartyResour return obj.(*extensions.ThirdPartyResource), err } -func (c *FakeThirdPartyResources) List(opts unversioned.ListOptions) (*extensions.ThirdPartyResourceList, error) { +func (c *FakeThirdPartyResources) List(opts api.ListOptions) (*extensions.ThirdPartyResourceList, error) { obj, err := c.Fake.Invokes(NewListAction("thirdpartyresources", c.Namespace, opts), &extensions.ThirdPartyResourceList{}) if obj == nil { return nil, err @@ -78,6 +78,6 @@ func (c *FakeThirdPartyResources) Delete(name string) error { return err } -func (c *FakeThirdPartyResources) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *FakeThirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) { return c.Fake.InvokesWatch(NewWatchAction("thirdpartyresources", c.Namespace, opts)) } diff --git a/pkg/client/unversioned/testclient/testclient_test.go b/pkg/client/unversioned/testclient/testclient_test.go index 7aabc6cdfb7..cacf76b7dc0 100644 --- a/pkg/client/unversioned/testclient/testclient_test.go +++ b/pkg/client/unversioned/testclient/testclient_test.go @@ -22,7 +22,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/runtime" ) @@ -33,7 +32,7 @@ func TestNewClient(t *testing.T) { } client := &Fake{} client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper())) - list, err := client.Services("test").List(unversioned.ListOptions{}) + list, err := client.Services("test").List(api.ListOptions{}) if err != nil { t.Fatal(err) } @@ -42,7 +41,7 @@ func TestNewClient(t *testing.T) { } // When list is invoked a second time, the same results are returned. - list, err = client.Services("test").List(unversioned.ListOptions{}) + list, err = client.Services("test").List(api.ListOptions{}) if err != nil { t.Fatal(err) } @@ -64,12 +63,12 @@ func TestErrors(t *testing.T) { }) client := &Fake{} client.AddReactor("*", "*", ObjectReaction(o, testapi.Default.RESTMapper())) - _, err := client.Services("test").List(unversioned.ListOptions{}) + _, err := client.Services("test").List(api.ListOptions{}) if !errors.IsNotFound(err) { t.Fatalf("unexpected error: %v", err) } t.Logf("error: %#v", err.(*errors.StatusError).Status()) - _, err = client.Services("test").List(unversioned.ListOptions{}) + _, err = client.Services("test").List(api.ListOptions{}) if !errors.IsForbidden(err) { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/client/unversioned/thirdpartyresources.go b/pkg/client/unversioned/thirdpartyresources.go index b7fbf8dcfed..fedd9fb78e0 100644 --- a/pkg/client/unversioned/thirdpartyresources.go +++ b/pkg/client/unversioned/thirdpartyresources.go @@ -18,7 +18,6 @@ package unversioned import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/watch" ) @@ -29,13 +28,13 @@ type ThirdPartyResourceNamespacer interface { } type ThirdPartyResourceInterface interface { - List(opts unversioned.ListOptions) (*extensions.ThirdPartyResourceList, error) + List(opts api.ListOptions) (*extensions.ThirdPartyResourceList, error) Get(name string) (*extensions.ThirdPartyResource, error) Create(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error) Update(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error) UpdateStatus(ctrl *extensions.ThirdPartyResource) (*extensions.ThirdPartyResource, error) Delete(name string) error - Watch(opts unversioned.ListOptions) (watch.Interface, error) + Watch(opts api.ListOptions) (watch.Interface, error) } // thirdPartyResources implements DaemonsSetsNamespacer interface @@ -51,7 +50,7 @@ func newThirdPartyResources(c *ExtensionsClient, namespace string) *thirdPartyRe // Ensure statically that thirdPartyResources implements ThirdPartyResourcesInterface. var _ ThirdPartyResourceInterface = &thirdPartyResources{} -func (c *thirdPartyResources) List(opts unversioned.ListOptions) (result *extensions.ThirdPartyResourceList, err error) { +func (c *thirdPartyResources) List(opts api.ListOptions) (result *extensions.ThirdPartyResourceList, err error) { result = &extensions.ThirdPartyResourceList{} err = c.r.Get().Namespace(c.ns).Resource("thirdpartyresources").VersionedParams(&opts, api.Scheme).Do().Into(result) return @@ -91,7 +90,7 @@ func (c *thirdPartyResources) Delete(name string) error { } // Watch returns a watch.Interface that watches the requested daemon sets. -func (c *thirdPartyResources) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (c *thirdPartyResources) Watch(opts api.ListOptions) (watch.Interface, error) { return c.r.Get(). Prefix("watch"). Namespace(c.ns). diff --git a/pkg/client/unversioned/thirdpartyresources_test.go b/pkg/client/unversioned/thirdpartyresources_test.go index cccd58a8448..50c4c24a8d1 100644 --- a/pkg/client/unversioned/thirdpartyresources_test.go +++ b/pkg/client/unversioned/thirdpartyresources_test.go @@ -16,18 +16,14 @@ limitations under the License. package unversioned_test -import ( - . "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/client/unversioned/testclient/simple" -) - import ( "testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" + . "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient/simple" ) func getThirdPartyResourceName() string { @@ -58,7 +54,7 @@ func TestListThirdPartyResources(t *testing.T) { }, }, } - receivedDSs, err := c.Setup(t).Extensions().ThirdPartyResources(ns).List(unversioned.ListOptions{}) + receivedDSs, err := c.Setup(t).Extensions().ThirdPartyResources(ns).List(api.ListOptions{}) c.Validate(t, receivedDSs, err) } diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 0e82adad5f2..96dab49cabc 100644 --- a/pkg/controller/daemon/controller.go +++ b/pkg/controller/daemon/controller.go @@ -23,7 +23,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/record" @@ -96,10 +95,10 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle // Manage addition/update of daemon sets. dsc.dsStore.Store, dsc.dsController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(options) }, }, @@ -128,10 +127,10 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle // more pods until all the effects (expectations) of a daemon set's create/delete have been observed. dsc.podStore.Store, dsc.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dsc.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, @@ -146,10 +145,10 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle // Watch for new nodes or updates to nodes - daemon pods are launched on new nodes, and possibly when labels on nodes change, dsc.nodeStore.Store, dsc.nodeController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dsc.kubeClient.Nodes().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return dsc.kubeClient.Nodes().Watch(options) }, }, diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 6a99afcb74d..854e2637c1e 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -23,7 +23,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -59,7 +58,7 @@ func (d *DeploymentController) Run(syncPeriod time.Duration) { } func (d *DeploymentController) reconcileDeployments() []error { - list, err := d.expClient.Deployments(api.NamespaceAll).List(unversioned.ListOptions{}) + list, err := d.expClient.Deployments(api.NamespaceAll).List(api.ListOptions{}) if err != nil { return []error{fmt.Errorf("error listing deployments: %v", err)} } diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 141d071531b..41654ce2c69 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" @@ -62,10 +61,10 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync e.serviceStore.Store, e.serviceController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Services(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.Services(api.NamespaceAll).Watch(options) }, }, @@ -83,10 +82,10 @@ func NewEndpointController(client *client.Client, resyncPeriod controller.Resync e.podStore.Store, e.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.Pods(api.NamespaceAll).Watch(options) }, }, @@ -385,7 +384,7 @@ func (e *EndpointController) syncService(key string) { // some stragglers could have been left behind if the endpoint controller // reboots). func (e *EndpointController) checkLeftoverEndpoints() { - list, err := e.client.Endpoints(api.NamespaceAll).List(unversioned.ListOptions{}) + list, err := e.client.Endpoints(api.NamespaceAll).List(api.ListOptions{}) if err != nil { glog.Errorf("Unable to list endpoints (%v); orphaned endpoints will not be cleaned up. (They're pretty harmless, but you can restart this component if you want another attempt made.)", err) return diff --git a/pkg/controller/framework/fake_controller_source.go b/pkg/controller/framework/fake_controller_source.go index 23e530b0309..fa28171137c 100644 --- a/pkg/controller/framework/fake_controller_source.go +++ b/pkg/controller/framework/fake_controller_source.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/watch" @@ -122,7 +121,7 @@ func (f *FakeControllerSource) Change(e watch.Event, watchProbability float64) { } // List returns a list object, with its resource version set. -func (f *FakeControllerSource) List(options unversioned.ListOptions) (runtime.Object, error) { +func (f *FakeControllerSource) List(options api.ListOptions) (runtime.Object, error) { f.lock.RLock() defer f.lock.RUnlock() list := make([]runtime.Object, 0, len(f.items)) @@ -152,7 +151,7 @@ func (f *FakeControllerSource) List(options unversioned.ListOptions) (runtime.Ob // Watch returns a watch, which will be pre-populated with all changes // after resourceVersion. -func (f *FakeControllerSource) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (f *FakeControllerSource) Watch(options api.ListOptions) (watch.Interface, error) { f.lock.RLock() defer f.lock.RUnlock() rc, err := strconv.Atoi(options.ResourceVersion) diff --git a/pkg/controller/framework/fake_controller_source_test.go b/pkg/controller/framework/fake_controller_source_test.go index 8e01628bd22..01269ce6435 100644 --- a/pkg/controller/framework/fake_controller_source_test.go +++ b/pkg/controller/framework/fake_controller_source_test.go @@ -21,7 +21,6 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/watch" ) @@ -65,13 +64,13 @@ func TestRCNumber(t *testing.T) { source.Modify(pod("foo")) source.Modify(pod("foo")) - w, err := source.Watch(unversioned.ListOptions{ResourceVersion: "1"}) + w, err := source.Watch(api.ListOptions{ResourceVersion: "1"}) if err != nil { t.Fatalf("Unexpected error: %v", err) } go consume(t, w, []string{"2", "3"}, wg) - list, err := source.List(unversioned.ListOptions{}) + list, err := source.List(api.ListOptions{}) if err != nil { t.Fatalf("Unexpected error: %v", err) } @@ -79,13 +78,13 @@ func TestRCNumber(t *testing.T) { t.Errorf("wanted %v, got %v", e, a) } - w2, err := source.Watch(unversioned.ListOptions{ResourceVersion: "2"}) + w2, err := source.Watch(api.ListOptions{ResourceVersion: "2"}) if err != nil { t.Fatalf("Unexpected error: %v", err) } go consume(t, w2, []string{"3"}, wg) - w3, err := source.Watch(unversioned.ListOptions{ResourceVersion: "3"}) + w3, err := source.Watch(api.ListOptions{ResourceVersion: "3"}) if err != nil { t.Fatalf("Unexpected error: %v", err) } diff --git a/pkg/controller/gc/gc_controller.go b/pkg/controller/gc/gc_controller.go index 8e1bfe63c86..a883078c7c3 100644 --- a/pkg/controller/gc/gc_controller.go +++ b/pkg/controller/gc/gc_controller.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -66,12 +65,12 @@ func New(kubeClient client.Interface, resyncPeriod controller.ResyncPeriodFunc, gcc.podStore.Store, gcc.podStoreSyncer = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = terminatedSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = terminatedSelector return gcc.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = terminatedSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = terminatedSelector return gcc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index 5ec006061de..eea1860a595 100644 --- a/pkg/controller/job/controller.go +++ b/pkg/controller/job/controller.go @@ -83,10 +83,10 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn jm.jobStore.Store, jm.jobController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).Watch(options) }, }, @@ -106,10 +106,10 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn jm.podStore.Store, jm.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return jm.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return jm.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 23553c6bafa..0176f7bdeba 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -45,10 +45,10 @@ func NewNamespaceController(kubeClient client.Interface, versions *unversioned.A var controller *framework.Controller _, controller = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.Namespaces().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return kubeClient.Namespaces().Watch(options) }, }, @@ -337,7 +337,7 @@ func syncNamespace(kubeClient client.Interface, versions *unversioned.APIVersion } func deleteLimitRanges(kubeClient client.Interface, ns string) error { - items, err := kubeClient.LimitRanges(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.LimitRanges(ns).List(api.ListOptions{}) if err != nil { return err } @@ -351,7 +351,7 @@ func deleteLimitRanges(kubeClient client.Interface, ns string) error { } func deleteResourceQuotas(kubeClient client.Interface, ns string) error { - resourceQuotas, err := kubeClient.ResourceQuotas(ns).List(unversioned.ListOptions{}) + resourceQuotas, err := kubeClient.ResourceQuotas(ns).List(api.ListOptions{}) if err != nil { return err } @@ -365,7 +365,7 @@ func deleteResourceQuotas(kubeClient client.Interface, ns string) error { } func deleteServiceAccounts(kubeClient client.Interface, ns string) error { - items, err := kubeClient.ServiceAccounts(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.ServiceAccounts(ns).List(api.ListOptions{}) if err != nil { return err } @@ -379,7 +379,7 @@ func deleteServiceAccounts(kubeClient client.Interface, ns string) error { } func deleteServices(kubeClient client.Interface, ns string) error { - items, err := kubeClient.Services(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.Services(ns).List(api.ListOptions{}) if err != nil { return err } @@ -393,7 +393,7 @@ func deleteServices(kubeClient client.Interface, ns string) error { } func deleteReplicationControllers(kubeClient client.Interface, ns string) error { - items, err := kubeClient.ReplicationControllers(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.ReplicationControllers(ns).List(api.ListOptions{}) if err != nil { return err } @@ -407,7 +407,7 @@ func deleteReplicationControllers(kubeClient client.Interface, ns string) error } func deletePods(kubeClient client.Interface, ns string, before unversioned.Time) (int64, error) { - items, err := kubeClient.Pods(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.Pods(ns).List(api.ListOptions{}) if err != nil { return 0, err } @@ -436,11 +436,11 @@ func deletePods(kubeClient client.Interface, ns string, before unversioned.Time) } func deleteEvents(kubeClient client.Interface, ns string) error { - return kubeClient.Events(ns).DeleteCollection(nil, unversioned.ListOptions{}) + return kubeClient.Events(ns).DeleteCollection(nil, api.ListOptions{}) } func deleteSecrets(kubeClient client.Interface, ns string) error { - items, err := kubeClient.Secrets(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.Secrets(ns).List(api.ListOptions{}) if err != nil { return err } @@ -454,7 +454,7 @@ func deleteSecrets(kubeClient client.Interface, ns string) error { } func deletePersistentVolumeClaims(kubeClient client.Interface, ns string) error { - items, err := kubeClient.PersistentVolumeClaims(ns).List(unversioned.ListOptions{}) + items, err := kubeClient.PersistentVolumeClaims(ns).List(api.ListOptions{}) if err != nil { return err } @@ -468,7 +468,7 @@ func deletePersistentVolumeClaims(kubeClient client.Interface, ns string) error } func deleteHorizontalPodAutoscalers(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) + items, err := expClient.HorizontalPodAutoscalers(ns).List(api.ListOptions{}) if err != nil { return err } @@ -482,7 +482,7 @@ func deleteHorizontalPodAutoscalers(expClient client.ExtensionsInterface, ns str } func deleteDaemonSets(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.DaemonSets(ns).List(unversioned.ListOptions{}) + items, err := expClient.DaemonSets(ns).List(api.ListOptions{}) if err != nil { return err } @@ -496,7 +496,7 @@ func deleteDaemonSets(expClient client.ExtensionsInterface, ns string) error { } func deleteJobs(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Jobs(ns).List(unversioned.ListOptions{}) + items, err := expClient.Jobs(ns).List(api.ListOptions{}) if err != nil { return err } @@ -510,7 +510,7 @@ func deleteJobs(expClient client.ExtensionsInterface, ns string) error { } func deleteDeployments(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Deployments(ns).List(unversioned.ListOptions{}) + items, err := expClient.Deployments(ns).List(api.ListOptions{}) if err != nil { return err } @@ -524,7 +524,7 @@ func deleteDeployments(expClient client.ExtensionsInterface, ns string) error { } func deleteIngress(expClient client.ExtensionsInterface, ns string) error { - items, err := expClient.Ingress(ns).List(unversioned.ListOptions{}) + items, err := expClient.Ingress(ns).List(api.ListOptions{}) if err != nil { return err } diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index ba15dca10de..e2c10325007 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -162,10 +162,10 @@ func NewNodeController( nc.podStore.Store, nc.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return nc.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return nc.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, @@ -178,10 +178,10 @@ func NewNodeController( ) nc.nodeStore.Store, nc.nodeController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return nc.kubeClient.Nodes().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return nc.kubeClient.Nodes().Watch(options) }, }, @@ -354,7 +354,7 @@ func forcefullyDeletePod(c client.Interface, pod *api.Pod) { // post "NodeReady==ConditionUnknown". It also evicts all pods if node is not ready or // not reachable for a long period of time. func (nc *NodeController) monitorNodeStatus() error { - nodes, err := nc.kubeClient.Nodes().List(unversioned.ListOptions{}) + nodes, err := nc.kubeClient.Nodes().List(api.ListOptions{}) if err != nil { return err } @@ -692,7 +692,7 @@ func (nc *NodeController) tryUpdateNodeStatus(node *api.Node) (time.Duration, ap // the server could not be contacted. func (nc *NodeController) hasPods(nodeName string) (bool, error) { selector := fields.OneTermEqualSelector(client.PodHost, nodeName) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return false, err @@ -727,7 +727,7 @@ func (nc *NodeController) cancelPodEviction(nodeName string) bool { func (nc *NodeController) deletePods(nodeName string) (bool, error) { remaining := false selector := fields.OneTermEqualSelector(client.PodHost, nodeName) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return remaining, err @@ -767,7 +767,7 @@ func (nc *NodeController) terminatePods(nodeName string, since time.Time) (bool, complete := true selector := fields.OneTermEqualSelector(client.PodHost, nodeName) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} pods, err := nc.kubeClient.Pods(api.NamespaceAll).List(options) if err != nil { return false, nextAttempt, err diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 192cc040312..3ea10699f68 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -89,7 +89,7 @@ func (m *FakeNodeHandler) Get(name string) (*api.Node, error) { return nil, nil } -func (m *FakeNodeHandler) List(opts unversioned.ListOptions) (*api.NodeList, error) { +func (m *FakeNodeHandler) List(opts api.ListOptions) (*api.NodeList, error) { defer func() { m.RequestCount++ }() var nodes []*api.Node for i := 0; i < len(m.UpdatedNodes); i++ { @@ -134,7 +134,7 @@ func (m *FakeNodeHandler) UpdateStatus(node *api.Node) (*api.Node, error) { return node, nil } -func (m *FakeNodeHandler) Watch(opts unversioned.ListOptions) (watch.Interface, error) { +func (m *FakeNodeHandler) Watch(opts api.ListOptions) (watch.Interface, error) { return nil, nil } diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index cdcd154448b..8ca5ea51f21 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -23,7 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" @@ -55,10 +54,10 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time _, volumeController := framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.PersistentVolumes().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumes().Watch(options) }, }, @@ -73,10 +72,10 @@ func NewPersistentVolumeClaimBinder(kubeClient client.Interface, syncPeriod time ) _, claimController := framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.PersistentVolumeClaims(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumeClaims(api.NamespaceAll).Watch(options) }, }, diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go index e0cfa420012..c57e6aecfda 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" @@ -74,10 +73,10 @@ func NewPersistentVolumeProvisionerController(client controllerClient, syncPerio controller.volumeStore, controller.volumeController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.ListPersistentVolumes(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return client.WatchPersistentVolumes(options) }, }, @@ -92,10 +91,10 @@ func NewPersistentVolumeProvisionerController(client controllerClient, syncPerio ) controller.claimStore, controller.claimController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.ListPersistentVolumeClaims(api.NamespaceAll, options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return client.WatchPersistentVolumeClaims(api.NamespaceAll, options) }, }, @@ -345,16 +344,16 @@ func newProvisioner(plugin volume.ProvisionableVolumePlugin, claim *api.Persiste // controllerClient abstracts access to PVs and PVCs. Easy to mock for testing and wrap for real client. type controllerClient interface { CreatePersistentVolume(pv *api.PersistentVolume) (*api.PersistentVolume, error) - ListPersistentVolumes(options unversioned.ListOptions) (*api.PersistentVolumeList, error) - WatchPersistentVolumes(options unversioned.ListOptions) (watch.Interface, error) + ListPersistentVolumes(options api.ListOptions) (*api.PersistentVolumeList, error) + WatchPersistentVolumes(options api.ListOptions) (watch.Interface, error) GetPersistentVolume(name string) (*api.PersistentVolume, error) UpdatePersistentVolume(volume *api.PersistentVolume) (*api.PersistentVolume, error) DeletePersistentVolume(volume *api.PersistentVolume) error UpdatePersistentVolumeStatus(volume *api.PersistentVolume) (*api.PersistentVolume, error) GetPersistentVolumeClaim(namespace, name string) (*api.PersistentVolumeClaim, error) - ListPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) - WatchPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (watch.Interface, error) + ListPersistentVolumeClaims(namespace string, options api.ListOptions) (*api.PersistentVolumeClaimList, error) + WatchPersistentVolumeClaims(namespace string, options api.ListOptions) (watch.Interface, error) UpdatePersistentVolumeClaim(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) UpdatePersistentVolumeClaimStatus(claim *api.PersistentVolumeClaim) (*api.PersistentVolumeClaim, error) @@ -376,11 +375,11 @@ func (c *realControllerClient) GetPersistentVolume(name string) (*api.Persistent return c.client.PersistentVolumes().Get(name) } -func (c *realControllerClient) ListPersistentVolumes(options unversioned.ListOptions) (*api.PersistentVolumeList, error) { +func (c *realControllerClient) ListPersistentVolumes(options api.ListOptions) (*api.PersistentVolumeList, error) { return c.client.PersistentVolumes().List(options) } -func (c *realControllerClient) WatchPersistentVolumes(options unversioned.ListOptions) (watch.Interface, error) { +func (c *realControllerClient) WatchPersistentVolumes(options api.ListOptions) (watch.Interface, error) { return c.client.PersistentVolumes().Watch(options) } @@ -404,11 +403,11 @@ func (c *realControllerClient) GetPersistentVolumeClaim(namespace, name string) return c.client.PersistentVolumeClaims(namespace).Get(name) } -func (c *realControllerClient) ListPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) { +func (c *realControllerClient) ListPersistentVolumeClaims(namespace string, options api.ListOptions) (*api.PersistentVolumeClaimList, error) { return c.client.PersistentVolumeClaims(namespace).List(options) } -func (c *realControllerClient) WatchPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (watch.Interface, error) { +func (c *realControllerClient) WatchPersistentVolumeClaims(namespace string, options api.ListOptions) (watch.Interface, error) { return c.client.PersistentVolumeClaims(namespace).Watch(options) } diff --git a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go index 08eb03383a5..3a15b7ad616 100644 --- a/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go +++ b/pkg/controller/persistentvolume/persistentvolume_provisioner_controller_test.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/util" @@ -185,13 +184,13 @@ func (c *mockControllerClient) CreatePersistentVolume(pv *api.PersistentVolume) return c.volume, nil } -func (c *mockControllerClient) ListPersistentVolumes(options unversioned.ListOptions) (*api.PersistentVolumeList, error) { +func (c *mockControllerClient) ListPersistentVolumes(options api.ListOptions) (*api.PersistentVolumeList, error) { return &api.PersistentVolumeList{ Items: []api.PersistentVolume{*c.volume}, }, nil } -func (c *mockControllerClient) WatchPersistentVolumes(options unversioned.ListOptions) (watch.Interface, error) { +func (c *mockControllerClient) WatchPersistentVolumes(options api.ListOptions) (watch.Interface, error) { return watch.NewFake(), nil } @@ -216,13 +215,13 @@ func (c *mockControllerClient) GetPersistentVolumeClaim(namespace, name string) } } -func (c *mockControllerClient) ListPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (*api.PersistentVolumeClaimList, error) { +func (c *mockControllerClient) ListPersistentVolumeClaims(namespace string, options api.ListOptions) (*api.PersistentVolumeClaimList, error) { return &api.PersistentVolumeClaimList{ Items: []api.PersistentVolumeClaim{*c.claim}, }, nil } -func (c *mockControllerClient) WatchPersistentVolumeClaims(namespace string, options unversioned.ListOptions) (watch.Interface, error) { +func (c *mockControllerClient) WatchPersistentVolumeClaims(namespace string, options api.ListOptions) (watch.Interface, error) { return watch.NewFake(), nil } diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index 629c465e2d4..3d85dac9e6a 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -22,7 +22,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" @@ -64,10 +63,10 @@ func NewPersistentVolumeRecycler(kubeClient client.Interface, syncPeriod time.Du _, volumeController := framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.PersistentVolumes().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return kubeClient.PersistentVolumes().Watch(options) }, }, diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 63219c1c325..979d816b789 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -173,7 +173,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA func (a *HorizontalController) reconcileAutoscalers() error { ns := api.NamespaceAll - list, err := a.client.Extensions().HorizontalPodAutoscalers(ns).List(unversioned.ListOptions{}) + list, err := a.client.Extensions().HorizontalPodAutoscalers(ns).List(api.ListOptions{}) if err != nil { return fmt.Errorf("error listing nodes: %v", err) } diff --git a/pkg/controller/podautoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go index cb8ce9c24fe..b3cf4e14e00 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client.go @@ -25,7 +25,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -120,7 +119,7 @@ func (h *HeapsterMetricsClient) GetCPUUtilization(namespace string, selector map func (h *HeapsterMetricsClient) GetResourceConsumptionAndRequest(resourceName api.ResourceName, namespace string, selector map[string]string) (consumption *ResourceConsumption, request *resource.Quantity, timestamp time.Time, err error) { labelSelector := labels.SelectorFromSet(labels.Set(selector)) podList, err := h.client.Pods(namespace). - List(unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}}) + List(api.ListOptions{LabelSelector: labelSelector}) if err != nil { return nil, nil, time.Time{}, fmt.Errorf("failed to get pod list: %v", err) diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index d61541c8ff3..873f9af17fa 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -24,7 +24,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -107,10 +106,10 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. rm.rcStore.Store, rm.rcController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rm.kubeClient.ReplicationControllers(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return rm.kubeClient.ReplicationControllers(api.NamespaceAll).Watch(options) }, }, @@ -148,10 +147,10 @@ func NewReplicationManager(kubeClient client.Interface, resyncPeriod controller. rm.podStore.Store, rm.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rm.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return rm.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index ef1cec05343..939d00783a6 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -23,7 +23,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" @@ -65,10 +64,10 @@ func NewResourceQuotaController(kubeClient client.Interface, resyncPeriod contro rq.rqIndexer, rq.rqController = framework.NewIndexerInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rq.kubeClient.ResourceQuotas(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return rq.kubeClient.ResourceQuotas(api.NamespaceAll).Watch(options) }, }, @@ -105,10 +104,10 @@ func NewResourceQuotaController(kubeClient client.Interface, resyncPeriod contro // release compute resources from any associated quota. rq.podStore.Store, rq.podController = framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rq.kubeClient.Pods(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return rq.kubeClient.Pods(api.NamespaceAll).Watch(options) }, }, @@ -265,7 +264,7 @@ func (rq *ResourceQuotaController) syncResourceQuota(quota api.ResourceQuota) (e pods := &api.PodList{} if set[api.ResourcePods] || set[api.ResourceMemory] || set[api.ResourceCPU] { - pods, err = rq.kubeClient.Pods(usage.Namespace).List(unversioned.ListOptions{}) + pods, err = rq.kubeClient.Pods(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } @@ -288,31 +287,31 @@ func (rq *ResourceQuotaController) syncResourceQuota(quota api.ResourceQuota) (e case api.ResourcePods: value = resource.NewQuantity(int64(len(filteredPods)), resource.DecimalSI) case api.ResourceServices: - items, err := rq.kubeClient.Services(usage.Namespace).List(unversioned.ListOptions{}) + items, err := rq.kubeClient.Services(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceReplicationControllers: - items, err := rq.kubeClient.ReplicationControllers(usage.Namespace).List(unversioned.ListOptions{}) + items, err := rq.kubeClient.ReplicationControllers(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceQuotas: - items, err := rq.kubeClient.ResourceQuotas(usage.Namespace).List(unversioned.ListOptions{}) + items, err := rq.kubeClient.ResourceQuotas(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourceSecrets: - items, err := rq.kubeClient.Secrets(usage.Namespace).List(unversioned.ListOptions{}) + items, err := rq.kubeClient.Secrets(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } value = resource.NewQuantity(int64(len(items.Items)), resource.DecimalSI) case api.ResourcePersistentVolumeClaims: - items, err := rq.kubeClient.PersistentVolumeClaims(usage.Namespace).List(unversioned.ListOptions{}) + items, err := rq.kubeClient.PersistentVolumeClaims(usage.Namespace).List(api.ListOptions{}) if err != nil { return err } diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 0d89fbc9de4..a54decba46f 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -23,7 +23,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/util" @@ -60,7 +59,7 @@ func (rc *RouteController) reconcileNodeRoutes() error { } // TODO (cjcullen): use pkg/controller/framework.NewInformer to watch this // and reduce the number of lists needed. - nodeList, err := rc.kubeClient.Nodes().List(unversioned.ListOptions{}) + nodeList, err := rc.kubeClient.Nodes().List(api.ListOptions{}) if err != nil { return fmt.Errorf("error listing nodes: %v", err) } diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index b942ecada2a..2cc46eaa3a7 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" @@ -80,12 +79,12 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo } e.serviceAccounts, e.serviceAccountController = framework.NewIndexerInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = accountSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = accountSelector return e.client.ServiceAccounts(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = accountSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = accountSelector return e.client.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, @@ -99,10 +98,10 @@ func NewServiceAccountsController(cl client.Interface, options ServiceAccountsCo e.namespaces, e.namespaceController = framework.NewIndexerInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Namespaces().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.Namespaces().Watch(options) }, }, diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index ebabc4f5c52..8f2b917725c 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -24,7 +24,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/framework" @@ -62,10 +61,10 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * e.serviceAccounts, e.serviceAccountController = framework.NewIndexerInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.ServiceAccounts(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return e.client.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, @@ -82,12 +81,12 @@ func NewTokensController(cl client.Interface, options TokensControllerOptions) * tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) e.secrets, e.secretController = framework.NewIndexerInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = tokenSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = tokenSelector return e.client.Secrets(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = tokenSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = tokenSelector return e.client.Secrets(api.NamespaceAll).Watch(options) }, }, diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index fe61455e9a5..de2c7a667be 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -346,7 +346,7 @@ func GetFirstPod(client *client.Client, namespace string, selector map[string]st for pods == nil || len(pods.Items) == 0 { var err error labelSelector := labels.SelectorFromSet(selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + options := api.ListOptions{LabelSelector: labelSelector} if pods, err = client.Pods(namespace).List(options); err != nil { return nil, err } diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index c204e004176..3f477d3a74f 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -143,11 +143,11 @@ func (d *NamespaceDescriber) Describe(namespace, name string) (string, error) { if err != nil { return "", err } - resourceQuotaList, err := d.ResourceQuotas(name).List(unversioned.ListOptions{}) + resourceQuotaList, err := d.ResourceQuotas(name).List(api.ListOptions{}) if err != nil { return "", err } - limitRangeList, err := d.LimitRanges(name).List(unversioned.ListOptions{}) + limitRangeList, err := d.LimitRanges(name).List(api.ListOptions{}) if err != nil { return "", err } @@ -425,7 +425,7 @@ func (d *PodDescriber) Describe(namespace, name string) (string, error) { if err != nil { eventsInterface := d.Events(namespace) selector := eventsInterface.GetFieldSelector(&name, &namespace, nil, nil) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} events, err2 := eventsInterface.List(options) if err2 == nil && len(events.Items) > 0 { return tabbedString(func(out io.Writer) error { @@ -1236,7 +1236,7 @@ func (d *ServiceAccountDescriber) Describe(namespace, name string) (string, erro tokens := []api.Secret{} tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + options := api.ListOptions{FieldSelector: tokenSelector} secrets, err := d.Secrets(namespace).List(options) if err == nil { for _, s := range secrets.Items { @@ -1320,7 +1320,7 @@ func (d *NodeDescriber) Describe(namespace, name string) (string, error) { // in a policy aware setting, users may have access to a node, but not all pods // in that case, we note that the user does not have access to the pods canViewPods := true - nodeNonTerminatedPodsList, err := d.Pods(namespace).List(unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{fieldSelector}}) + nodeNonTerminatedPodsList, err := d.Pods(namespace).List(api.ListOptions{FieldSelector: fieldSelector}) if err != nil { if !errors.IsForbidden(err) { return "", err @@ -1596,7 +1596,7 @@ func (dd *DeploymentDescriber) Describe(namespace, name string) (string, error) func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.Labels) ([]extensions.DaemonSet, error) { // Get all daemon sets // TODO: this needs a namespace scope as argument - dss, err := c.List(unversioned.ListOptions{}) + dss, err := c.List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting daemon set: %v", err) } @@ -1623,7 +1623,7 @@ func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.La func getReplicationControllersForLabels(c client.ReplicationControllerInterface, labelsToMatch labels.Labels) ([]api.ReplicationController, error) { // Get all replication controllers. // TODO this needs a namespace scope as argument - rcs, err := c.List(unversioned.ListOptions{}) + rcs, err := c.List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting replication controllers: %v", err) } @@ -1654,7 +1654,7 @@ func printReplicationControllersByLabels(matchingRCs []*api.ReplicationControlle } func getPodStatusForController(c client.PodInterface, selector labels.Selector) (running, waiting, succeeded, failed int, err error) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} rcPods, err := c.List(options) if err != nil { return diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 6162087cc59..63e11956cf4 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -364,7 +363,7 @@ func (r *RollingUpdater) pollForReadyPods(interval, timeout time.Duration, oldRc anyReady := false for _, controller := range controllers { selector := labels.Set(controller.Spec.Selector).AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := r.c.Pods(controller.Namespace).List(options) if err != nil { return false, err @@ -647,7 +646,7 @@ func AddDeploymentKeyToReplicationController(oldRc *api.ReplicationController, c // Update all pods managed by the rc to have the new hash label, so they are correctly adopted // TODO: extract the code from the label command and re-use it here. selector := labels.SelectorFromSet(oldRc.Spec.Selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := client.Pods(namespace).List(options) if err != nil { return nil, err @@ -699,7 +698,7 @@ func AddDeploymentKeyToReplicationController(oldRc *api.ReplicationController, c // doesn't see the update to its pod template and creates a new pod with the old labels after // we've finished re-adopting existing pods to the rc. selector = labels.SelectorFromSet(selectorCopy) - options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options = api.ListOptions{LabelSelector: selector} podList, err = client.Pods(namespace).List(options) for ix := range podList.Items { pod := &podList.Items[ix] @@ -741,7 +740,7 @@ func updateWithRetries(rcClient client.ReplicationControllerInterface, rc *api.R } func FindSourceController(r client.ReplicationControllersNamespacer, namespace, name string) (*api.ReplicationController, error) { - list, err := r.ReplicationControllers(namespace).List(unversioned.ListOptions{}) + list, err := r.ReplicationControllers(namespace).List(api.ListOptions{}) if err != nil { return nil, err } diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index e2f8797e713..4a85d8b6687 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -108,7 +108,7 @@ type objInterface interface { // getOverlappingControllers finds rcs that this controller overlaps, as well as rcs overlapping this controller. func getOverlappingControllers(c client.ReplicationControllerInterface, rc *api.ReplicationController) ([]api.ReplicationController, error) { - rcs, err := c.List(unversioned.ListOptions{}) + rcs, err := c.List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting replication controllers: %v", err) } @@ -251,7 +251,7 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra } // at this point only dead pods are left, that should be removed selector, _ := extensions.LabelSelectorAsSelector(job.Spec.Selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := pods.List(options) if err != nil { return err diff --git a/pkg/kubelet/config/apiserver_test.go b/pkg/kubelet/config/apiserver_test.go index 9ae5a6ea596..d7be8a7fed5 100644 --- a/pkg/kubelet/config/apiserver_test.go +++ b/pkg/kubelet/config/apiserver_test.go @@ -20,7 +20,6 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/runtime" @@ -32,11 +31,11 @@ type fakePodLW struct { watchResp watch.Interface } -func (lw fakePodLW) List(options unversioned.ListOptions) (runtime.Object, error) { +func (lw fakePodLW) List(options api.ListOptions) (runtime.Object, error) { return lw.listResp, nil } -func (lw fakePodLW) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (lw fakePodLW) Watch(options api.ListOptions) (watch.Interface, error) { return lw.watchResp, nil } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index d4f98079ff3..46ed6d333fe 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -233,10 +233,10 @@ func NewMainKubelet( // TODO: cache.NewListWatchFromClient is limited as it takes a client implementation rather // than an interface. There is no way to construct a list+watcher using resource name. listWatch := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.Services(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return kubeClient.Services(api.NamespaceAll).Watch(options) }, } @@ -250,12 +250,12 @@ func NewMainKubelet( // than an interface. There is no way to construct a list+watcher using resource name. fieldSelector := fields.Set{client.ObjectNameField: nodeName}.AsSelector() listWatch := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = fieldSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = fieldSelector return kubeClient.Nodes().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = fieldSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = fieldSelector return kubeClient.Nodes().Watch(options) }, } diff --git a/pkg/proxy/config/api_test.go b/pkg/proxy/config/api_test.go index cfa6a35f316..6e5b0e11d48 100644 --- a/pkg/proxy/config/api_test.go +++ b/pkg/proxy/config/api_test.go @@ -21,7 +21,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" @@ -32,11 +31,11 @@ type fakeLW struct { watchResp watch.Interface } -func (lw fakeLW) List(options unversioned.ListOptions) (runtime.Object, error) { +func (lw fakeLW) List(options api.ListOptions) (runtime.Object, error) { return lw.listResp, nil } -func (lw fakeLW) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (lw fakeLW) Watch(options api.ListOptions) (watch.Interface, error) { return lw.watchResp, nil } diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index 6defe84faac..0149fb60ed7 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" @@ -392,7 +391,7 @@ func newCacherListerWatcher(storage Interface, resourcePrefix string, newListFun } // Implements cache.ListerWatcher interface. -func (lw *cacherListerWatcher) List(options unversioned.ListOptions) (runtime.Object, error) { +func (lw *cacherListerWatcher) List(options api.ListOptions) (runtime.Object, error) { list := lw.newListFunc() if err := lw.storage.List(context.TODO(), lw.resourcePrefix, "", Everything, list); err != nil { return nil, err @@ -401,7 +400,7 @@ func (lw *cacherListerWatcher) List(options unversioned.ListOptions) (runtime.Ob } // Implements cache.ListerWatcher interface. -func (lw *cacherListerWatcher) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (lw *cacherListerWatcher) Watch(options api.ListOptions) (watch.Interface, error) { return lw.storage.WatchList(context.TODO(), lw.resourcePrefix, options.ResourceVersion, Everything) } diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index 91140db9577..a96fd1a1ce9 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -249,14 +249,14 @@ func TestWaitUntilFreshAndList(t *testing.T) { } type testLW struct { - ListFunc func(options unversioned.ListOptions) (runtime.Object, error) - WatchFunc func(options unversioned.ListOptions) (watch.Interface, error) + ListFunc func(options api.ListOptions) (runtime.Object, error) + WatchFunc func(options api.ListOptions) (watch.Interface, error) } -func (t *testLW) List(options unversioned.ListOptions) (runtime.Object, error) { +func (t *testLW) List(options api.ListOptions) (runtime.Object, error) { return t.ListFunc(options) } -func (t *testLW) Watch(options unversioned.ListOptions) (watch.Interface, error) { +func (t *testLW) Watch(options api.ListOptions) (watch.Interface, error) { return t.WatchFunc(options) } @@ -271,12 +271,12 @@ func TestReflectorForWatchCache(t *testing.T) { } lw := &testLW{ - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { fw := watch.NewFake() go fw.Stop() return fw, nil }, - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return &api.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}}, nil }, } diff --git a/pkg/util/deployment/deployment.go b/pkg/util/deployment/deployment.go index 1df33e97084..51f0762895a 100644 --- a/pkg/util/deployment/deployment.go +++ b/pkg/util/deployment/deployment.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -34,7 +33,7 @@ func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.Rep namespace := deployment.ObjectMeta.Namespace // 1. Find all pods whose labels match deployment.Spec.Selector selector := labels.SelectorFromSet(deployment.Spec.Selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := c.Pods(namespace).List(options) if err != nil { return nil, fmt.Errorf("error listing pods: %v", err) @@ -42,7 +41,7 @@ func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.Rep // 2. Find the corresponding RCs for pods in podList. // TODO: Right now we list all RCs and then filter. We should add an API for this. oldRCs := map[string]api.ReplicationController{} - rcList, err := c.ReplicationControllers(namespace).List(unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(namespace).List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error listing replication controllers: %v", err) } @@ -75,7 +74,7 @@ func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.Rep // Returns nil if the new RC doesnt exist yet. func GetNewRC(deployment extensions.Deployment, c client.Interface) (*api.ReplicationController, error) { namespace := deployment.ObjectMeta.Namespace - rcList, err := c.ReplicationControllers(namespace).List(unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(namespace).List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error listing replication controllers: %v", err) } @@ -173,7 +172,7 @@ func getPodsForRCs(c client.Interface, replicationControllers []*api.Replication allPods := []api.Pod{} for _, rc := range replicationControllers { selector := labels.SelectorFromSet(rc.Spec.Selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := c.Pods(rc.ObjectMeta.Namespace).List(options) if err != nil { return allPods, fmt.Errorf("error listing pods: %v", err) diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 5b1df005db2..7a92ae7f875 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -21,7 +21,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" @@ -108,12 +107,12 @@ func (c *realRecyclerClient) WatchPod(name, namespace, resourceVersion string, s fieldSelector, _ := fields.ParseSelector("metadata.name=" + name) podLW := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = fieldSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = fieldSelector return c.client.Pods(namespace).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = fieldSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = fieldSelector return c.client.Pods(namespace).Watch(options) }, } diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index 50f465b53fa..775d75cf0e0 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" @@ -97,10 +96,10 @@ func (l *limitRanger) Admit(a admission.Attributes) (err error) { // NewLimitRanger returns an object that enforces limits based on the supplied limit function func NewLimitRanger(client client.Interface, limitFunc LimitFunc) admission.Interface { lw := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.LimitRanges(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return client.LimitRanges(api.NamespaceAll).Watch(options) }, } diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index 2de5d4203eb..f4886d6a9c4 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -23,7 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" @@ -83,10 +82,10 @@ func NewProvision(c client.Interface) admission.Interface { store := cache.NewStore(cache.MetaNamespaceKeyFunc) reflector := cache.NewReflector( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return c.Namespaces().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) }, }, diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index 8d75eabddef..22de7828b3c 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" @@ -90,10 +89,10 @@ func NewExists(c client.Interface) admission.Interface { store := cache.NewStore(cache.MetaNamespaceKeyFunc) reflector := cache.NewReflector( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return c.Namespaces().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) }, }, diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index d169f9aff07..793a1e2c6c5 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" @@ -107,10 +106,10 @@ func NewLifecycle(c client.Interface) admission.Interface { store := cache.NewStore(cache.MetaNamespaceKeyFunc) reflector := cache.NewReflector( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return c.Namespaces().List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return c.Namespaces().Watch(options) }, }, diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index d7f3047ecc2..736819544e8 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -49,10 +49,10 @@ type quota struct { // NewResourceQuota creates a new resource quota admission control handler func NewResourceQuota(client client.Interface) admission.Interface { lw := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.ResourceQuotas(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return client.ResourceQuotas(api.NamespaceAll).Watch(options) }, } diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index 1b991cf06ea..847c78d3c63 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/serviceaccount" @@ -90,10 +89,10 @@ type serviceAccount struct { func NewServiceAccount(cl client.Interface) *serviceAccount { serviceAccountsIndexer, serviceAccountsReflector := cache.NewNamespaceKeyedIndexerAndReflector( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return cl.ServiceAccounts(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return cl.ServiceAccounts(api.NamespaceAll).Watch(options) }, }, @@ -104,12 +103,12 @@ func NewServiceAccount(cl client.Interface) *serviceAccount { tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) secretsIndexer, secretsReflector := cache.NewNamespaceKeyedIndexerAndReflector( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.FieldSelector.Selector = tokenSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.FieldSelector = tokenSelector return cl.Secrets(api.NamespaceAll).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.FieldSelector.Selector = tokenSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.FieldSelector = tokenSelector return cl.Secrets(api.NamespaceAll).Watch(options) }, }, diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index 14a11cbacef..95783e0f1d2 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" . "github.com/onsi/ginkgo" @@ -48,7 +48,7 @@ var _ = Describe("Cadvisor", func() { func CheckCadvisorHealthOnAllNodes(c *client.Client, timeout time.Duration) { By("getting list of nodes") - nodeList, err := c.Nodes().List(unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) var errors []error retries := maxRetries diff --git a/test/e2e/cluster_size_autoscaling.go b/test/e2e/cluster_size_autoscaling.go index fa1f11803f1..5e2a25f1156 100644 --- a/test/e2e/cluster_size_autoscaling.go +++ b/test/e2e/cluster_size_autoscaling.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -42,7 +41,7 @@ var _ = Describe("[Autoscaling] [Skipped]", func() { BeforeEach(func() { SkipUnlessProviderIs("gce") - nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(api.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index 3b6d2eecedb..1f6edca76f1 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -29,7 +29,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -418,7 +417,7 @@ func runCmd(command string, args ...string) (string, string, error) { func validate(f *Framework, svcNameWant, rcNameWant string, ingress api.LoadBalancerIngress, podsWant int) error { Logf("Beginning cluster validation") // Verify RC. - rcs, err := f.Client.ReplicationControllers(f.Namespace.Name).List(unversioned.ListOptions{}) + rcs, err := f.Client.ReplicationControllers(f.Namespace.Name).List(api.ListOptions{}) if err != nil { return fmt.Errorf("error listing RCs: %v", err) } diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index c514457e0d4..ac2b354718d 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" controllerframework "k8s.io/kubernetes/pkg/controller/framework" @@ -170,7 +169,7 @@ func replacePods(pods []*api.Pod, store cache.Store) { // getContainerRestarts returns the count of container restarts across all pods matching the given labelSelector, // and a list of nodenames across which these containers restarted. func getContainerRestarts(c *client.Client, ns string, labelSelector labels.Selector) (int, []string) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + options := api.ListOptions{LabelSelector: labelSelector} pods, err := c.Pods(ns).List(options) expectNoError(err) failedContainers := 0 @@ -220,12 +219,12 @@ var _ = Describe("DaemonRestart", func() { tracker = newPodTracker() newPods, controller = controllerframework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.LabelSelector.Selector = labelSelector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.LabelSelector = labelSelector return framework.Client.Pods(ns).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.LabelSelector.Selector = labelSelector + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.LabelSelector = labelSelector return framework.Client.Pods(ns).Watch(options) }, }, diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index dc2d018a3b3..ce06434719a 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -114,7 +114,7 @@ var _ = Describe("Daemon set", func() { podClient := c.Pods(ns) selector := labels.Set(label).AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := podClient.List(options) Expect(err).NotTo(HaveOccurred()) Expect(len(podList.Items)).To(BeNumerically(">", 0)) @@ -161,7 +161,7 @@ var _ = Describe("Daemon set", func() { By("Change label of node, check that daemon pod is launched.") nodeClient := c.Nodes() - nodeList, err := nodeClient.List(unversioned.ListOptions{}) + nodeList, err := nodeClient.List(api.ListOptions{}) Expect(len(nodeList.Items)).To(BeNumerically(">", 0)) newNode, err := setDaemonSetNodeLabels(c, nodeList.Items[0].Name, nodeSelector) Expect(err).NotTo(HaveOccurred(), "error setting labels on node") @@ -197,7 +197,7 @@ func separateDaemonSetNodeLabels(labels map[string]string) (map[string]string, m func clearDaemonSetNodeLabels(c *client.Client) error { nodeClient := c.Nodes() - nodeList, err := nodeClient.List(unversioned.ListOptions{}) + nodeList, err := nodeClient.List(api.ListOptions{}) if err != nil { return err } @@ -253,7 +253,7 @@ func setDaemonSetNodeLabels(c *client.Client, nodeName string, labels map[string func checkDaemonPodOnNodes(f *Framework, selector map[string]string, nodeNames []string) func() (bool, error) { return func() (bool, error) { selector := labels.Set(selector).AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := f.Client.Pods(f.Namespace.Name).List(options) if err != nil { return false, nil @@ -282,7 +282,7 @@ func checkDaemonPodOnNodes(f *Framework, selector map[string]string, nodeNames [ func checkRunningOnAllNodes(f *Framework, selector map[string]string) func() (bool, error) { return func() (bool, error) { - nodeList, err := f.Client.Nodes().List(unversioned.ListOptions{}) + nodeList, err := f.Client.Nodes().List(api.ListOptions{}) if err != nil { return false, nil } diff --git a/test/e2e/density.go b/test/e2e/density.go index ce33313703e..1436599f39f 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -158,7 +158,7 @@ var _ = Describe("Density [Skipped]", func() { ns = framework.Namespace.Name var err error - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -235,10 +235,10 @@ var _ = Describe("Density [Skipped]", func() { events := make([](*api.Event), 0) _, controller := controllerframework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return c.Events(ns).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return c.Events(ns).Watch(options) }, }, @@ -318,13 +318,12 @@ var _ = Describe("Density [Skipped]", func() { additionalPodsPrefix = "density-latency-pod-" + string(util.NewUUID()) _, controller := controllerframework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - selector := labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) - options.LabelSelector.Selector = selector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.LabelSelector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) return c.Pods(ns).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.LabelSelector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) return c.Pods(ns).Watch(options) }, }, @@ -373,7 +372,7 @@ var _ = Describe("Density [Skipped]", func() { "involvedObject.namespace": ns, "source": "scheduler", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} schedEvents, err := c.Events(ns).List(options) expectNoError(err) for k := range createTimes { diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 3f4be7d3123..1195d02016f 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -190,7 +190,7 @@ var _ = Describe("DNS", func() { systemClient := f.Client.Pods(api.NamespaceSystem) By("Waiting for DNS Service to be Running") - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{dnsServiceLableSelector}} + options := api.ListOptions{LabelSelector: dnsServiceLableSelector} dnsPods, err := systemClient.List(options) if err != nil { Failf("Failed to list all dns service pods") @@ -229,7 +229,7 @@ var _ = Describe("DNS", func() { systemClient := f.Client.Pods(api.NamespaceSystem) By("Waiting for DNS Service to be Running") - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{dnsServiceLableSelector}} + options := api.ListOptions{LabelSelector: dnsServiceLableSelector} dnsPods, err := systemClient.List(options) if err != nil { Failf("Failed to list all dns service pods") diff --git a/test/e2e/es_cluster_logging.go b/test/e2e/es_cluster_logging.go index b85dabd92a8..6af93699e40 100644 --- a/test/e2e/es_cluster_logging.go +++ b/test/e2e/es_cluster_logging.go @@ -24,7 +24,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -85,7 +84,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { // Wait for the Elasticsearch pods to enter the running state. By("Checking to make sure the Elasticsearch pods are running") label := labels.SelectorFromSet(labels.Set(map[string]string{esKey: esValue})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := f.Client.Pods(api.NamespaceSystem).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { @@ -182,7 +181,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { } // Obtain a list of nodes so we can place one synthetic logger on each node. - nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(api.ListOptions{}) if err != nil { Failf("Failed to list nodes: %v", err) } @@ -270,7 +269,7 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) { // Debugging code to report the status of the elasticsearch logging endpoints. selector := labels.Set{esKey: esValue}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} esPods, err := f.Client.Pods(api.NamespaceSystem).List(options) if err != nil { Logf("Attempt to list Elasticsearch nodes encountered a problem -- may retry: %v", err) diff --git a/test/e2e/etcd_failure.go b/test/e2e/etcd_failure.go index bb576d43502..166adf393aa 100644 --- a/test/e2e/etcd_failure.go +++ b/test/e2e/etcd_failure.go @@ -20,7 +20,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -108,7 +107,7 @@ func checkExistingRCRecovers(f *Framework) { By("deleting pods from existing replication controller") expectNoError(wait.Poll(time.Millisecond*500, time.Second*60, func() (bool, error) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rcSelector}} + options := api.ListOptions{LabelSelector: rcSelector} pods, err := podClient.List(options) if err != nil { Logf("apiserver returned error, as expected before recovery: %v", err) @@ -127,7 +126,7 @@ func checkExistingRCRecovers(f *Framework) { By("waiting for replication controller to recover") expectNoError(wait.Poll(time.Millisecond*500, time.Second*60, func() (bool, error) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rcSelector}} + options := api.ListOptions{LabelSelector: rcSelector} pods, err := podClient.List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { diff --git a/test/e2e/events.go b/test/e2e/events.go index 26ca4a26015..ca6e24e8336 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" @@ -74,7 +73,7 @@ var _ = Describe("Events", func() { By("verifying the pod is in kubernetes") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) @@ -94,7 +93,7 @@ var _ = Describe("Events", func() { "involvedObject.namespace": framework.Namespace.Name, "source": "scheduler", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} events, err := framework.Client.Events(framework.Namespace.Name).List(options) if err != nil { return false, err @@ -114,7 +113,7 @@ var _ = Describe("Events", func() { "involvedObject.namespace": framework.Namespace.Name, "source": "kubelet", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} events, err = framework.Client.Events(framework.Namespace.Name).List(options) if err != nil { return false, err diff --git a/test/e2e/example_cluster_dns.go b/test/e2e/example_cluster_dns.go index 22ed667dc0b..5351597932b 100644 --- a/test/e2e/example_cluster_dns.go +++ b/test/e2e/example_cluster_dns.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -104,7 +103,7 @@ var _ = Describe("[Example] ClusterDns", func() { // the application itself may have not been initialized. Just query the application. for _, ns := range namespaces { label := labels.SelectorFromSet(labels.Set(map[string]string{"name": backendRcName})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns.Name).List(options) Expect(err).NotTo(HaveOccurred()) err = podsResponding(c, ns.Name, backendPodName, false, pods) @@ -124,7 +123,7 @@ var _ = Describe("[Example] ClusterDns", func() { // dns error or timeout. // This code is probably unnecessary, but let's stay on the safe side. label := labels.SelectorFromSet(labels.Set(map[string]string{"name": backendPodName})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(namespaces[0].Name).List(options) if err != nil || pods == nil || len(pods.Items) == 0 { diff --git a/test/e2e/example_k8petstore.go b/test/e2e/example_k8petstore.go index 2605aeb59a7..9bae8978f81 100644 --- a/test/e2e/example_k8petstore.go +++ b/test/e2e/example_k8petstore.go @@ -20,7 +20,7 @@ import ( "fmt" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "log" "os" @@ -156,7 +156,7 @@ var _ = Describe("[Example] Pet Store [Skipped]", func() { f := NewFramework("petstore") It(fmt.Sprintf("should scale to persist a nominal number ( %v ) of transactions in %v seconds", k8bpsSmokeTestTransactions, k8bpsSmokeTestTimeout), func() { - minions, err := f.Client.Nodes().List(unversioned.ListOptions{}) + minions, err := f.Client.Nodes().List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) minionCount = len(minions.Items) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 6eb35382aeb..fc371e42a08 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -25,7 +25,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -463,7 +462,7 @@ func forEachPod(c *client.Client, ns, selectorKey, selectorValue string, fn func pods := []*api.Pod{} for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { selector := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := c.Pods(ns).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range podList.Items { diff --git a/test/e2e/framework.go b/test/e2e/framework.go index ee2ec8a2e8f..7ef6dcfb963 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -24,7 +24,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" @@ -109,7 +108,7 @@ func (f *Framework) afterEach() { // Print events if the test failed. if CurrentGinkgoTestDescription().Failed { By(fmt.Sprintf("Collecting events from namespace %q.", f.Namespace.Name)) - events, err := f.Client.Events(f.Namespace.Name).List(unversioned.ListOptions{}) + events, err := f.Client.Events(f.Namespace.Name).List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, e := range events.Items { @@ -183,7 +182,7 @@ func (f *Framework) WaitForAnEndpoint(serviceName string) error { for { // TODO: Endpoints client should take a field selector so we // don't have to list everything. - list, err := f.Client.Endpoints(f.Namespace.Name).List(unversioned.ListOptions{}) + list, err := f.Client.Endpoints(f.Namespace.Name).List(api.ListOptions{}) if err != nil { return err } @@ -198,8 +197,8 @@ func (f *Framework) WaitForAnEndpoint(serviceName string) error { } } - options := unversioned.ListOptions{ - FieldSelector: unversioned.FieldSelector{fields.Set{"metadata.name": serviceName}.AsSelector()}, + options := api.ListOptions{ + FieldSelector: fields.Set{"metadata.name": serviceName}.AsSelector(), ResourceVersion: rv, } w, err := f.Client.Endpoints(f.Namespace.Name).Watch(options) diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index a9e05b71f28..2fd02e5fce3 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -23,7 +23,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/util" ) @@ -55,7 +54,7 @@ var _ = Describe("Garbage collector", func() { // 20 seconds. time.Sleep(30 * time.Second) - pods, err := f.Client.Pods(f.Namespace.Name).List(unversioned.ListOptions{}) + pods, err := f.Client.Pods(f.Namespace.Name).List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) Expect(len(pods.Items)).To(BeNumerically("==", 100)) }) diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 9cc31742b89..04574f85bbf 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -28,7 +28,6 @@ import ( compute "google.golang.org/api/compute/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -211,7 +210,7 @@ func gcloudDelete(resource, name, project string) { // kubectlLogLBController logs kubectl debug output for the L7 controller pod. func kubectlLogLBController(c *client.Client, ns string) { selector := labels.SelectorFromSet(labels.Set(controllerLabels)) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := c.Pods(api.NamespaceAll).List(options) if err != nil { Logf("Cannot log L7 controller output, error listing pods %v", err) @@ -426,7 +425,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller", func() { Logf(desc) } // Delete all Ingress, then wait for the controller to cleanup. - ings, err := client.Extensions().Ingress(ns).List(unversioned.ListOptions{}) + ings, err := client.Extensions().Ingress(ns).List(api.ListOptions{}) if err != nil { Logf("WARNING: Failed to list ingress: %+v", err) } else { @@ -484,7 +483,7 @@ var _ = Describe("GCE L7 LoadBalancer Controller", func() { createIngress(client, ns, appID, appsPerIngress) } - ings, err := client.Extensions().Ingress(ns).List(unversioned.ListOptions{}) + ings, err := client.Extensions().Ingress(ns).List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, ing := range ings.Items { diff --git a/test/e2e/job.go b/test/e2e/job.go index 4f19f8bdfbc..5623b73820b 100644 --- a/test/e2e/job.go +++ b/test/e2e/job.go @@ -21,7 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" @@ -259,7 +258,7 @@ func deleteJob(c *client.Client, ns, name string) error { func waitForAllPodsRunning(c *client.Client, ns, jobName string, parallelism int) error { label := labels.SelectorFromSet(labels.Set(map[string]string{jobSelectorKey: jobName})) return wait.Poll(poll, jobTimeout, func() (bool, error) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns).List(options) if err != nil { return false, err diff --git a/test/e2e/kibana_logging.go b/test/e2e/kibana_logging.go index 3c9c7967fb4..7374f7a3d36 100644 --- a/test/e2e/kibana_logging.go +++ b/test/e2e/kibana_logging.go @@ -20,7 +20,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/labels" . "github.com/onsi/ginkgo" @@ -69,7 +68,7 @@ func ClusterLevelLoggingWithKibana(f *Framework) { // Wait for the Kibana pod(s) to enter the running state. By("Checking to make sure the Kibana pods are running") label := labels.SelectorFromSet(labels.Set(map[string]string{kibanaKey: kibanaValue})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := f.Client.Pods(api.NamespaceSystem).List(options) Expect(err).NotTo(HaveOccurred()) for _, pod := range pods.Items { diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 5a612450f43..f795a35fcdd 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -529,7 +529,7 @@ var _ = Describe("Kubectl client", func() { checkOutput(output, requiredStrings) // Node - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) node := nodes.Items[0] output = runKubectlOrDie("describe", "node", node.Name) @@ -1088,7 +1088,7 @@ func forEachReplicationController(c *client.Client, ns, selectorKey, selectorVal var err error for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} rcs, err = c.ReplicationControllers(ns).List(options) Expect(err).NotTo(HaveOccurred()) if len(rcs.Items) > 0 { diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go index 594e797c350..a03ee0822f9 100644 --- a/test/e2e/kubelet.go +++ b/test/e2e/kubelet.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -94,7 +94,7 @@ var _ = Describe("kubelet", func() { var resourceMonitor *resourceMonitor BeforeEach(func() { - nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(api.ListOptions{}) expectNoError(err) numNodes = len(nodes.Items) nodeNames = sets.NewString() diff --git a/test/e2e/kubelet_perf.go b/test/e2e/kubelet_perf.go index 19c2cb12011..61cd3bd6b76 100644 --- a/test/e2e/kubelet_perf.go +++ b/test/e2e/kubelet_perf.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/sets" @@ -144,7 +144,7 @@ var _ = Describe("Kubelet", func() { var rm *resourceMonitor BeforeEach(func() { - nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(api.ListOptions{}) expectNoError(err) nodeNames = sets.NewString() for _, node := range nodes.Items { diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index e1f6f646fd3..847624ceb03 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -33,7 +33,6 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "github.com/prometheus/common/model" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet/metrics" @@ -271,11 +270,11 @@ func getOneTimeResourceUsageOnNode( } func getKubeSystemContainersResourceUsage(c *client.Client) (resourceUsagePerContainer, error) { - pods, err := c.Pods("kube-system").List(unversioned.ListOptions{}) + pods, err := c.Pods("kube-system").List(api.ListOptions{}) if err != nil { return resourceUsagePerContainer{}, err } - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { return resourceUsagePerContainer{}, err } @@ -686,7 +685,7 @@ func newResourceMonitor(c *client.Client, containerNames []string, pollingInterv } func (r *resourceMonitor) Start() { - nodes, err := r.client.Nodes().List(unversioned.ListOptions{}) + nodes, err := r.client.Nodes().List(api.ListOptions{}) if err != nil { Failf("resourceMonitor: unable to get list of nodes: %v", err) } diff --git a/test/e2e/kubeproxy.go b/test/e2e/kubeproxy.go index 7bae392c980..7f34e6a2778 100644 --- a/test/e2e/kubeproxy.go +++ b/test/e2e/kubeproxy.go @@ -429,7 +429,7 @@ func (config *KubeProxyTestConfig) setup() { } By("Getting node addresses") - nodeList, err := config.f.Client.Nodes().List(unversioned.ListOptions{}) + nodeList, err := config.f.Client.Nodes().List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("Failed to get node list: %v", err)) config.externalAddrs = NodeAddresses(nodeList, api.NodeExternalIP) if len(config.externalAddrs) < 2 { @@ -457,7 +457,7 @@ func (config *KubeProxyTestConfig) setup() { func (config *KubeProxyTestConfig) cleanup() { nsClient := config.getNamespacesClient() - nsList, err := nsClient.List(unversioned.ListOptions{}) + nsList, err := nsClient.List(api.ListOptions{}) if err == nil { for _, ns := range nsList.Items { if strings.Contains(ns.Name, config.f.BaseName) && ns.Name != config.f.Namespace.Name { @@ -468,7 +468,7 @@ func (config *KubeProxyTestConfig) cleanup() { } func (config *KubeProxyTestConfig) createNetProxyPods(podName string, selector map[string]string) []*api.Pod { - nodes, err := config.f.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := config.f.Client.Nodes().List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) // create pods, one for each node diff --git a/test/e2e/latency.go b/test/e2e/latency.go index 69e6ab42b22..4971ebde545 100644 --- a/test/e2e/latency.go +++ b/test/e2e/latency.go @@ -69,7 +69,7 @@ var _ = Describe("Latency [Skipped]", func() { ns = framework.Namespace.Name var err error - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -143,13 +143,12 @@ func runLatencyTest(nodeCount int, c *client.Client, ns string) { stopCh := make(chan struct{}) _, informer := framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - selector := labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) - options.LabelSelector.Selector = selector + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.LabelSelector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) return c.Pods(ns).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.LabelSelector.Selector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.LabelSelector = labels.SelectorFromSet(labels.Set{"name": additionalPodsPrefix}) return c.Pods(ns).Watch(options) }, }, @@ -197,7 +196,7 @@ func runLatencyTest(nodeCount int, c *client.Client, ns string) { "involvedObject.namespace": ns, "source": "scheduler", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} schedEvents, err := c.Events(ns).List(options) expectNoError(err) for k := range createTimestamps { diff --git a/test/e2e/load.go b/test/e2e/load.go index 14a0164e4df..c53b5df1e0b 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -72,7 +72,7 @@ var _ = Describe("Load capacity [Skipped]", func() { BeforeEach(func() { c = framework.Client ns = framework.Namespace.Name - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) nodeCount = len(nodes.Items) Expect(nodeCount).NotTo(BeZero()) @@ -214,8 +214,8 @@ func scaleRC(wg *sync.WaitGroup, config *RCConfig) { expectNoError(ScaleRC(config.Client, config.Namespace, config.Name, newSize, true), fmt.Sprintf("scaling rc %s for the first time", config.Name)) selector := labels.SelectorFromSet(labels.Set(map[string]string{"name": config.Name})) - options := unversioned.ListOptions{ - LabelSelector: unversioned.LabelSelector{selector}, + options := api.ListOptions{ + LabelSelector: selector, ResourceVersion: "0", } _, err := config.Client.Pods(config.Namespace).List(options) diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index 1863de36b25..d8dd94d2c1b 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -44,7 +44,7 @@ var _ = Describe("Mesos", func() { nodeClient := framework.Client.Nodes() rackA := labels.SelectorFromSet(map[string]string{"k8s.mesosphere.io/attribute-rack": "1"}) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{rackA}} + options := api.ListOptions{LabelSelector: rackA} nodes, err := nodeClient.List(options) if err != nil { Failf("Failed to query for node: %v", err) @@ -64,7 +64,7 @@ var _ = Describe("Mesos", func() { client := framework.Client expectNoError(allNodesReady(client, util.ForeverTestTimeout), "all nodes ready") - nodelist, err := client.Nodes().List(unversioned.ListOptions{}) + nodelist, err := client.Nodes().List(api.ListOptions{}) expectNoError(err, "nodes fetched from apiserver") const ns = "static-pods" @@ -109,7 +109,7 @@ var _ = Describe("Mesos", func() { role1 := labels.SelectorFromSet(map[string]string{ "k8s.mesosphere.io/attribute-role": "role1", }) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{role1}} + options := api.ListOptions{LabelSelector: role1} nodes, err := nodeClient.List(options) expectNoError(err) diff --git a/test/e2e/metrics_util.go b/test/e2e/metrics_util.go index d35c501f329..ca01d4be6c2 100644 --- a/test/e2e/metrics_util.go +++ b/test/e2e/metrics_util.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/sets" @@ -178,7 +178,7 @@ func listPodsLatencyThreshold(numNodes int) time.Duration { // Prints top five summary metrics for request types with latency and returns // number of such request types above threshold. func HighLatencyRequests(c *client.Client) (int, error) { - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { return 0, err } diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index b8bcb523ed7..8031c26e68b 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -19,7 +19,7 @@ package e2e import ( "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" . "github.com/onsi/ginkgo" @@ -82,7 +82,7 @@ var _ = Describe("Resource usage of system containers", func() { It("should not exceed expected amount.", func() { By("Getting ResourceConsumption on all nodes") - nodeList, err := c.Nodes().List(unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(api.ListOptions{}) expectNoError(err) resourceUsagePerNode := make(map[string][]resourceUsagePerContainer) diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 5a22369904e..8c7d96bc296 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -23,7 +23,6 @@ import ( influxdb "github.com/influxdb/influxdb/client" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" @@ -78,7 +77,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error // is running (which would be an error except during a rolling update). for _, rcLabel := range rcLabels { selector := labels.Set{"k8s-app": rcLabel}.AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} rcList, err := c.ReplicationControllers(api.NamespaceSystem).List(options) if err != nil { return nil, err @@ -89,7 +88,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error } for _, rc := range rcList.Items { selector := labels.Set(rc.Spec.Selector).AsSelector() - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} podList, err := c.Pods(api.NamespaceSystem).List(options) if err != nil { return nil, err @@ -106,7 +105,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error } func expectedServicesExist(c *client.Client) error { - serviceList, err := c.Services(api.NamespaceSystem).List(unversioned.ListOptions{}) + serviceList, err := c.Services(api.NamespaceSystem).List(api.ListOptions{}) if err != nil { return err } @@ -124,7 +123,7 @@ func expectedServicesExist(c *client.Client) error { } func getAllNodesInCluster(c *client.Client) ([]string, error) { - nodeList, err := c.Nodes().List(unversioned.ListOptions{}) + nodeList, err := c.Nodes().List(api.ListOptions{}) if err != nil { return nil, err } @@ -244,7 +243,7 @@ func testMonitoringUsingHeapsterInfluxdb(c *client.Client) { func printDebugInfo(c *client.Client) { set := labels.Set{"k8s-app": "heapster"} - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{set.AsSelector()}} + options := api.ListOptions{LabelSelector: set.AsSelector()} podList, err := c.Pods(api.NamespaceSystem).List(options) if err != nil { Logf("Error while listing pods %v", err) diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 9aa47b87b46..7775e1b227a 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/api" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/wait" @@ -58,7 +58,7 @@ func extinguish(c *client.Client, totalNS int, maxAllowedAfterDel int, maxSecond expectNoError(wait.Poll(2*time.Second, time.Duration(maxSeconds)*time.Second, func() (bool, error) { var cnt = 0 - nsList, err := c.Namespaces().List(unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(api.ListOptions{}) if err != nil { return false, err } diff --git a/test/e2e/networking.go b/test/e2e/networking.go index 649e605ace5..ab0353a0b89 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -136,7 +136,7 @@ var _ = Describe("Networking", func() { By("Creating a webserver (pending) pod on each node") - nodes, err := f.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := f.Client.Nodes().List(api.ListOptions{}) if err != nil { Failf("Failed to list nodes: %v", err) } diff --git a/test/e2e/nodeoutofdisk.go b/test/e2e/nodeoutofdisk.go index cda3adba620..c690f16890f 100644 --- a/test/e2e/nodeoutofdisk.go +++ b/test/e2e/nodeoutofdisk.go @@ -24,7 +24,6 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -140,7 +139,7 @@ var _ = Describe("NodeOutOfDisk", func() { "source": "scheduler", "reason": "FailedScheduling", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} schedEvents, err := c.Events(ns).List(options) expectNoError(err) @@ -203,7 +202,7 @@ func availCpu(c *client.Client, node *api.Node) (int64, error) { podClient := c.Pods(api.NamespaceAll) selector := fields.Set{"spec.nodeName": node.Name}.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} pods, err := podClient.List(options) if err != nil { return 0, fmt.Errorf("failed to retrieve all the pods on node %s: %v", node.Name, err) diff --git a/test/e2e/pd.go b/test/e2e/pd.go index fc928ed0859..d9c1a1f01ba 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -53,7 +53,7 @@ var _ = Describe("Pod Disks", func() { podClient = framework.Client.Pods(framework.Namespace.Name) - nodes, err := framework.Client.Nodes().List(unversioned.ListOptions{}) + nodes, err := framework.Client.Nodes().List(api.ListOptions{}) expectNoError(err, "Failed to list nodes for e2e cluster.") Expect(len(nodes.Items)).To(BeNumerically(">=", 2), "Requires at least 2 nodes") diff --git a/test/e2e/pods.go b/test/e2e/pods.go index 66f84d4ea23..7a3632a3b55 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -30,7 +30,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/labels" @@ -300,14 +299,14 @@ var _ = Describe("Pods", func() { By("setting up watch") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) } Expect(len(pods.Items)).To(Equal(0)) - options = unversioned.ListOptions{ - LabelSelector: unversioned.LabelSelector{selector}, + options = api.ListOptions{ + LabelSelector: selector, ResourceVersion: pods.ListMeta.ResourceVersion, } w, err := podClient.Watch(options) @@ -327,7 +326,7 @@ var _ = Describe("Pods", func() { By("verifying the pod is in kubernetes") selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options = api.ListOptions{LabelSelector: selector} pods, err = podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) @@ -373,7 +372,7 @@ var _ = Describe("Pods", func() { Expect(lastPod.Spec.TerminationGracePeriodSeconds).ToNot(BeZero()) selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options = api.ListOptions{LabelSelector: selector} pods, err = podClient.List(options) if err != nil { Fail(fmt.Sprintf("Failed to list pods to verify deletion: %v", err)) @@ -429,7 +428,7 @@ var _ = Describe("Pods", func() { By("verifying the pod is in kubernetes") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) @@ -461,7 +460,7 @@ var _ = Describe("Pods", func() { By("verifying the updated pod is in kubernetes") selector = labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options = unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options = api.ListOptions{LabelSelector: selector} pods, err = podClient.List(options) Expect(len(pods.Items)).To(Equal(1)) Logf("Pod update OK") @@ -1049,7 +1048,7 @@ var _ = Describe("Pods", func() { By("verifying the pod is in kubernetes") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) @@ -1124,7 +1123,7 @@ var _ = Describe("Pods", func() { By("verifying the pod is in kubernetes") selector := labels.SelectorFromSet(labels.Set(map[string]string{"time": value})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} pods, err := podClient.List(options) if err != nil { Failf("Failed to query for pods: %v", err) diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index 21520b3209a..8c7e76db42b 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/intstr" @@ -251,7 +250,7 @@ func truncate(b []byte, maxLen int) []byte { } func pickNode(c *client.Client) (string, error) { - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { return "", err } diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index 56b5be880e2..6a856ead8fc 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -22,7 +22,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -62,7 +61,7 @@ var _ = Describe("Reboot", func() { // events for the kube-system namespace on failures namespaceName := api.NamespaceSystem By(fmt.Sprintf("Collecting events from namespace %q.", namespaceName)) - events, err := f.Client.Events(namespaceName).List(unversioned.ListOptions{}) + events, err := f.Client.Events(namespaceName).List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) for _, e := range events.Items { diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index d889a834ca5..231ef6c5d6b 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -233,7 +233,7 @@ func podsCreated(c *client.Client, ns, name string, replicas int) (*api.PodList, // List the pods, making sure we observe all the replicas. label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) for start := time.Now(); time.Since(start) < timeout; time.Sleep(5 * time.Second) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns).List(options) if err != nil { return nil, err @@ -397,7 +397,7 @@ var _ = Describe("Nodes", func() { BeforeEach(func() { c = framework.Client ns = framework.Namespace.Name - systemPods, err := c.Pods(api.NamespaceSystem).List(unversioned.ListOptions{}) + systemPods, err := c.Pods(api.NamespaceSystem).List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) systemPodsNo = len(systemPods.Items) }) @@ -511,7 +511,7 @@ var _ = Describe("Nodes", func() { By("choose a node with at least one pod - we will block some network traffic on this node") label := labels.SelectorFromSet(labels.Set(map[string]string{"name": name})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns).List(options) // list pods after all have been scheduled Expect(err).NotTo(HaveOccurred()) nodeName := pods.Items[0].Spec.NodeName diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index 56ec26fb426..dbf9d3f9e75 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -46,7 +46,7 @@ func getPodsScheduled(pods *api.PodList) (scheduledPods, notScheduledPods []api. // Simplified version of RunRC, that does not create RC, but creates plain Pods and // requires passing whole Pod definition, which is needed to test various Scheduler predicates. func startPods(c *client.Client, replicas int, ns string, podNamePrefix string, pod api.Pod) { - allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) podsScheduledBefore, _ := getPodsScheduled(allPods) @@ -67,7 +67,7 @@ func startPods(c *client.Client, replicas int, ns string, podNamePrefix string, startTime := time.Now() currentlyScheduledPods := 0 for len(podsScheduledBefore)+replicas != currentlyScheduledPods { - allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) scheduledPods := 0 for _, pod := range allPods.Items { @@ -95,7 +95,7 @@ func getRequestedCPU(pod api.Pod) int64 { } func verifyResult(c *client.Client, podName string, ns string) { - allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) scheduledPods, notScheduledPods := getPodsScheduled(allPods) @@ -106,7 +106,7 @@ func verifyResult(c *client.Client, podName string, ns string) { "source": "scheduler", "reason": "FailedScheduling", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} schedEvents, err := c.Events(ns).List(options) expectNoError(err) // If we failed to find event with a capitalized first letter of reason @@ -121,7 +121,7 @@ func verifyResult(c *client.Client, podName string, ns string) { "source": "scheduler", "reason": "failedScheduling", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} schedEvents, err = c.Events(ns).List(options) expectNoError(err) } @@ -142,7 +142,7 @@ func verifyResult(c *client.Client, podName string, ns string) { func cleanupPods(c *client.Client, ns string) { By("Removing all pods in namespace " + ns) - pods, err := c.Pods(ns).List(unversioned.ListOptions{}) + pods, err := c.Pods(ns).List(api.ListOptions{}) expectNoError(err) opt := api.NewDeleteOptions(0) for _, p := range pods.Items { @@ -155,13 +155,13 @@ func waitForStableCluster(c *client.Client) int { timeout := 10 * time.Minute startTime := time.Now() - allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) scheduledPods, currentlyNotScheduledPods := getPodsScheduled(allPods) for len(currentlyNotScheduledPods) != 0 { time.Sleep(2 * time.Second) - allPods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + allPods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) scheduledPods, currentlyNotScheduledPods = getPodsScheduled(allPods) @@ -195,7 +195,7 @@ var _ = Describe("SchedulerPredicates", func() { c = framework.Client ns = framework.Namespace.Name var err error - nodeList, err = c.Nodes().List(unversioned.ListOptions{}) + nodeList, err = c.Nodes().List(api.ListOptions{}) expectNoError(err) }) @@ -275,7 +275,7 @@ var _ = Describe("SchedulerPredicates", func() { } waitForStableCluster(c) - pods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}) + pods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}) expectNoError(err) for _, pod := range pods.Items { _, found := nodeToCapacityMap[pod.Spec.NodeName] diff --git a/test/e2e/service.go b/test/e2e/service.go index 65ce1ab6b2c..48840fdedba 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -30,7 +30,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" @@ -1051,7 +1050,7 @@ func validateEndpointsOrFail(c *client.Client, namespace, serviceName string, ex i++ } - if pods, err := c.Pods(api.NamespaceAll).List(unversioned.ListOptions{}); err == nil { + if pods, err := c.Pods(api.NamespaceAll).List(api.ListOptions{}); err == nil { for _, pod := range pods.Items { Logf("Pod %s\t%s\t%s\t%s", pod.Namespace, pod.Name, pod.Spec.NodeName, pod.DeletionTimestamp) } @@ -1103,7 +1102,7 @@ func collectAddresses(nodes *api.NodeList, addressType api.NodeAddressType) []st } func getNodePublicIps(c *client.Client) ([]string, error) { - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { return nil, err } diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index d399d27e2db..0169e546440 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -21,7 +21,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/util" @@ -42,7 +41,7 @@ var _ = Describe("ServiceAccounts", func() { expectNoError(wait.Poll(time.Millisecond*500, time.Second*10, func() (bool, error) { By("getting the auto-created API token") tokenSelector := fields.SelectorFromSet(map[string]string{client.SecretType: string(api.SecretTypeServiceAccountToken)}) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{tokenSelector}} + options := api.ListOptions{FieldSelector: tokenSelector} secrets, err := f.Client.Secrets(f.Namespace.Name).List(options) if err != nil { return false, err diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 500f773dcc9..2f10065ece9 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -23,7 +23,6 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" @@ -277,10 +276,10 @@ func (eq *endpointQueries) added(e *api.Endpoints) { func startEndpointWatcher(f *Framework, q *endpointQueries) { _, controller := framework.NewInformer( &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { + ListFunc: func(options api.ListOptions) (runtime.Object, error) { return f.Client.Endpoints(f.Namespace.Name).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { return f.Client.Endpoints(f.Namespace.Name).Watch(options) }, }, diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/serviceloadbalancers.go index 290897a7897..5a5938c44be 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/serviceloadbalancers.go @@ -23,7 +23,6 @@ import ( "path/filepath" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -111,7 +110,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) { // Find the pods of the rc we just created. labelSelector := labels.SelectorFromSet( labels.Set(map[string]string{"name": h.rcName})) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{labelSelector}} + options := api.ListOptions{LabelSelector: labelSelector} pods, err := h.client.Pods(h.rcNamespace).List(options) if err != nil { return err diff --git a/test/e2e/util.go b/test/e2e/util.go index e27ebdb1a08..6e431d517ba 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -161,14 +161,14 @@ type podStore struct { func newPodStore(c *client.Client, namespace string, label labels.Selector, field fields.Selector) *podStore { lw := &cache.ListWatch{ - ListFunc: func(options unversioned.ListOptions) (runtime.Object, error) { - options.LabelSelector.Selector = label - options.FieldSelector.Selector = field + ListFunc: func(options api.ListOptions) (runtime.Object, error) { + options.LabelSelector = label + options.FieldSelector = field return c.Pods(namespace).List(options) }, - WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) { - options.LabelSelector.Selector = label - options.FieldSelector.Selector = field + WatchFunc: func(options api.ListOptions) (watch.Interface, error) { + options.LabelSelector = label + options.FieldSelector = field return c.Pods(namespace).Watch(options) }, } @@ -368,7 +368,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro // We get the new list of pods and replication controllers in every // iteration because more pods come online during startup and we want to // ensure they are also checked. - rcList, err := c.ReplicationControllers(ns).List(unversioned.ListOptions{}) + rcList, err := c.ReplicationControllers(ns).List(api.ListOptions{}) if err != nil { Logf("Error getting replication controllers in namespace '%s': %v", ns, err) return false, nil @@ -378,7 +378,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro replicas += rc.Spec.Replicas } - podList, err := c.Pods(ns).List(unversioned.ListOptions{}) + podList, err := c.Pods(ns).List(api.ListOptions{}) if err != nil { Logf("Error getting pods in namespace '%s': %v", ns, err) return false, nil @@ -422,7 +422,7 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro // Returns the list of deleted namespaces or an error. func deleteNamespaces(c *client.Client, deleteFilter, skipFilter []string) ([]string, error) { By("Deleting namespaces") - nsList, err := c.Namespaces().List(unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(api.ListOptions{}) Expect(err).NotTo(HaveOccurred()) var deleted []string var wg sync.WaitGroup @@ -469,7 +469,7 @@ func waitForNamespacesDeleted(c *client.Client, namespaces []string, timeout tim //Now POLL until all namespaces have been eradicated. return wait.Poll(2*time.Second, timeout, func() (bool, error) { - nsList, err := c.Namespaces().List(unversioned.ListOptions{}) + nsList, err := c.Namespaces().List(api.ListOptions{}) if err != nil { return false, err } @@ -601,7 +601,7 @@ func checkTestingNSDeletedExcept(c *client.Client, skip string) error { Logf("Waiting for terminating namespaces to be deleted...") for start := time.Now(); time.Since(start) < timeout; time.Sleep(15 * time.Second) { - namespaces, err := c.Namespaces().List(unversioned.ListOptions{}) + namespaces, err := c.Namespaces().List(api.ListOptions{}) if err != nil { Logf("Listing namespaces failed: %v", err) continue @@ -643,7 +643,7 @@ func deleteNS(c *client.Client, namespace string, timeout time.Duration) error { // check for pods that were not deleted remaining := []string{} missingTimestamp := false - if pods, perr := c.Pods(namespace).List(unversioned.ListOptions{}); perr == nil { + if pods, perr := c.Pods(namespace).List(api.ListOptions{}); perr == nil { for _, pod := range pods.Items { Logf("Pod %s %s on node %s remains, has deletion timestamp %s", namespace, pod.Name, pod.Spec.NodeName, pod.DeletionTimestamp) remaining = append(remaining, pod.Name) @@ -731,7 +731,7 @@ func waitForRCPodOnNode(c *client.Client, ns, rcName, node string) (*api.Pod, er var p *api.Pod = nil err := wait.PollImmediate(10*time.Second, 5*time.Minute, func() (bool, error) { Logf("Waiting for pod %s to appear on node %s", rcName, node) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns).List(options) if err != nil { return false, err @@ -751,7 +751,7 @@ func waitForRCPodOnNode(c *client.Client, ns, rcName, node string) (*api.Pod, er func waitForPodToDisappear(c *client.Client, ns, podName string, label labels.Selector, interval, timeout time.Duration) error { return wait.PollImmediate(interval, timeout, func() (bool, error) { Logf("Waiting for pod %s to disappear", podName) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err := c.Pods(ns).List(options) if err != nil { return false, err @@ -814,7 +814,7 @@ func waitForService(c *client.Client, namespace, name string, exist bool, interv func waitForServiceEndpointsNum(c *client.Client, namespace, serviceName string, expectNum int, interval, timeout time.Duration) error { return wait.Poll(interval, timeout, func() (bool, error) { Logf("Waiting for amount of service:%s endpoints to %d", serviceName, expectNum) - list, err := c.Endpoints(namespace).List(unversioned.ListOptions{}) + list, err := c.Endpoints(namespace).List(api.ListOptions{}) if err != nil { return false, err } @@ -882,7 +882,7 @@ type podResponseChecker struct { // checkAllResponses issues GETs to all pods in the context and verify they reply with pod name. func (r podResponseChecker) checkAllResponses() (done bool, err error) { successes := 0 - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{r.label}} + options := api.ListOptions{LabelSelector: r.label} currentPods, err := r.c.Pods(r.ns).List(options) Expect(err).NotTo(HaveOccurred()) for i, pod := range r.pods.Items { @@ -1623,7 +1623,7 @@ func (config *RCConfig) start() error { if oldRunning != config.Replicas { // List only pods from a given replication controller. - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} if pods, err := config.Client.Pods(api.NamespaceAll).List(options); err == nil { for _, pod := range pods.Items { @@ -1653,7 +1653,7 @@ func dumpPodDebugInfo(c *client.Client, pods []*api.Pod) { } func dumpAllPodInfo(c *client.Client) { - pods, err := c.Pods("").List(unversioned.ListOptions{}) + pods, err := c.Pods("").List(api.ListOptions{}) if err != nil { Logf("unable to fetch pod debug info: %v", err) } @@ -1661,7 +1661,7 @@ func dumpAllPodInfo(c *client.Client) { } func dumpAllNodeInfo(c *client.Client) { - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { Logf("unable to fetch node list: %v", err) return @@ -1715,7 +1715,7 @@ func getNodeEvents(c *client.Client, nodeName string) []api.Event { "involvedObject.namespace": api.NamespaceAll, "source": "kubelet", }.AsSelector() - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{selector}} + options := api.ListOptions{FieldSelector: selector} events, err := c.Events(api.NamespaceSystem).List(options) if err != nil { Logf("Unexpected error retrieving node events %v", err) @@ -1781,7 +1781,7 @@ waitLoop: // Wait up to 10 minutes for getting pods with certain label func waitForPodsWithLabel(c *client.Client, ns string, label labels.Selector) (pods *api.PodList, err error) { for t := time.Now(); time.Since(t) < podListTimeout; time.Sleep(poll) { - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{label}} + options := api.ListOptions{LabelSelector: label} pods, err = c.Pods(ns).List(options) Expect(err).NotTo(HaveOccurred()) if len(pods.Items) > 0 { @@ -1834,7 +1834,7 @@ func DeleteRC(c *client.Client, ns, name string) error { func waitForRCPodsGone(c *client.Client, rc *api.ReplicationController) error { return wait.PollImmediate(poll, 2*time.Minute, func() (bool, error) { selector := labels.SelectorFromSet(rc.Spec.Selector) - options := unversioned.ListOptions{LabelSelector: unversioned.LabelSelector{selector}} + options := api.ListOptions{LabelSelector: selector} if pods, err := c.Pods(rc.Namespace).List(options); err == nil && len(pods.Items) == 0 { return true, nil } @@ -1915,9 +1915,9 @@ func listNodes(c *client.Client, label labels.Selector, field fields.Selector) ( var nodes *api.NodeList var errLast error if wait.PollImmediate(poll, singleCallTimeout, func() (bool, error) { - options := unversioned.ListOptions{ - LabelSelector: unversioned.LabelSelector{label}, - FieldSelector: unversioned.FieldSelector{field}, + options := api.ListOptions{ + LabelSelector: label, + FieldSelector: field, } nodes, errLast = c.Nodes().List(options) return errLast == nil, nil @@ -2008,7 +2008,7 @@ func NodeAddresses(nodelist *api.NodeList, addrType api.NodeAddressType) []strin // if it can't find an external IP for every node, though it still returns all // hosts that it found in that case. func NodeSSHHosts(c *client.Client) ([]string, error) { - nodelist, err := c.Nodes().List(unversioned.ListOptions{}) + nodelist, err := c.Nodes().List(api.ListOptions{}) if err != nil { return nil, fmt.Errorf("error getting nodes: %v", err) } @@ -2256,7 +2256,7 @@ func allNodesReady(c *client.Client, timeout time.Duration) error { var notReady []api.Node err := wait.PollImmediate(poll, timeout, func() (bool, error) { notReady = nil - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { return false, err } @@ -2375,7 +2375,7 @@ func waitForApiserverUp(c *client.Client) error { // waitForClusterSize waits until the cluster has desired size and there is no not-ready nodes in it. func waitForClusterSize(c *client.Client, size int, timeout time.Duration) error { for start := time.Now(); time.Since(start) < timeout; time.Sleep(20 * time.Second) { - nodes, err := c.Nodes().List(unversioned.ListOptions{}) + nodes, err := c.Nodes().List(api.ListOptions{}) if err != nil { Logf("Failed to list nodes: %v", err) continue @@ -2569,7 +2569,7 @@ func getNodePortURL(client *client.Client, ns, name string, svcPort int) (string if err != nil { return "", err } - nodes, err := client.Nodes().List(unversioned.ListOptions{}) + nodes, err := client.Nodes().List(api.ListOptions{}) if err != nil { return "", err } diff --git a/test/integration/client_test.go b/test/integration/client_test.go index f25e63a2c6f..8412fa0ad16 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" @@ -54,7 +53,7 @@ func TestClient(t *testing.T) { t.Errorf("expected %#v, got %#v", e, a) } - pods, err := client.Pods(ns).List(unversioned.ListOptions{}) + pods, err := client.Pods(ns).List(api.ListOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -92,7 +91,7 @@ func TestClient(t *testing.T) { } // pod is shown, but not scheduled - pods, err = client.Pods(ns).List(unversioned.ListOptions{}) + pods, err = client.Pods(ns).List(api.ListOptions{}) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -244,8 +243,8 @@ func TestMultiWatch(t *testing.T) { t.Fatalf("Couldn't make %v: %v", name, err) } go func(name, rv string) { - options := unversioned.ListOptions{ - LabelSelector: unversioned.LabelSelector{labels.Set{"watchlabel": name}.AsSelector()}, + options := api.ListOptions{ + LabelSelector: labels.Set{"watchlabel": name}.AsSelector(), ResourceVersion: rv, } w, err := client.Pods(ns).Watch(options) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 815d1728b50..6bbfdd62eec 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -29,7 +29,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" @@ -249,7 +248,7 @@ func StartPods(numPods int, host string, restClient *client.Client) error { glog.Infof("StartPods took %v with numPods %d", time.Since(start), numPods) }() hostField := fields.OneTermEqualSelector(client.PodHost, host) - options := unversioned.ListOptions{FieldSelector: unversioned.FieldSelector{hostField}} + options := api.ListOptions{FieldSelector: hostField} pods, err := restClient.Pods(TestNS).List(options) if err != nil || len(pods.Items) == numPods { return err diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go index fb58485b8c8..eeafbbbdc9a 100644 --- a/test/integration/metrics_test.go +++ b/test/integration/metrics_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/test/integration/framework" @@ -109,7 +108,7 @@ func TestApiserverMetrics(t *testing.T) { // Make a request to the apiserver to ensure there's at least one data point // for the metrics we're expecting -- otherwise, they won't be exported. client := client.NewOrDie(&client.Config{Host: s.URL, GroupVersion: testapi.Default.GroupVersion()}) - if _, err := client.Pods(api.NamespaceDefault).List(unversioned.ListOptions{}); err != nil { + if _, err := client.Pods(api.NamespaceDefault).List(api.ListOptions{}); err != nil { t.Fatalf("unexpected error getting pods: %v", err) } diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index 2b7daf67fd9..8884bf875c4 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" persistentvolumecontroller "k8s.io/kubernetes/pkg/controller/persistentvolume" @@ -81,7 +80,7 @@ func TestPersistentVolumeRecycler(t *testing.T) { }, } - w, _ := testClient.PersistentVolumes().Watch(unversioned.ListOptions{}) + w, _ := testClient.PersistentVolumes().Watch(api.ListOptions{}) defer w.Stop() _, _ = testClient.PersistentVolumes().Create(pv) @@ -107,7 +106,7 @@ func TestPersistentVolumeRecycler(t *testing.T) { // change the reclamation policy of the PV for the next test pv.Spec.PersistentVolumeReclaimPolicy = api.PersistentVolumeReclaimDelete - w, _ = testClient.PersistentVolumes().Watch(unversioned.ListOptions{}) + w, _ = testClient.PersistentVolumes().Watch(api.ListOptions{}) defer w.Stop() _, _ = testClient.PersistentVolumes().Create(pv) diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index 9c3aaa9b67e..405ac319c1b 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -34,7 +34,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/authorizer" @@ -171,7 +170,7 @@ func TestServiceAccountTokenAutoCreate(t *testing.T) { tokensToCleanup := sets.NewString(token1Name, token2Name, token3Name) err = wait.Poll(time.Second, 10*time.Second, func() (bool, error) { // Get all secrets in the namespace - secrets, err := c.Secrets(ns).List(unversioned.ListOptions{}) + secrets, err := c.Secrets(ns).List(api.ListOptions{}) // Retrieval errors should fail if err != nil { return false, err @@ -512,11 +511,11 @@ func doServiceAccountAPIRequests(t *testing.T, c *client.Client, ns string, auth readOps := []testOperation{ func() error { - _, err := c.Secrets(ns).List(unversioned.ListOptions{}) + _, err := c.Secrets(ns).List(api.ListOptions{}) return err }, func() error { - _, err := c.Pods(ns).List(unversioned.ListOptions{}) + _, err := c.Pods(ns).List(api.ListOptions{}) return err }, } diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index 6a0658e7cb4..8d4c527641c 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -32,7 +32,6 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -67,7 +66,7 @@ func main() { var nodes *api.NodeList for start := time.Now(); time.Since(start) < nodeListTimeout; time.Sleep(2 * time.Second) { - nodes, err = c.Nodes().List(unversioned.ListOptions{}) + nodes, err = c.Nodes().List(api.ListOptions{}) if err == nil { break } diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 60ea3814d0f..57b06661097 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -87,7 +87,7 @@ func main() { var nodes *api.NodeList for start := time.Now(); time.Since(start) < nodeListTimeout; time.Sleep(2 * time.Second) { - nodes, err = c.Nodes().List(unversioned.ListOptions{}) + nodes, err = c.Nodes().List(api.ListOptions{}) if err == nil { break }