diff --git a/cluster/common.sh b/cluster/common.sh index 49844a55e4..240d7a8f19 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -772,7 +772,6 @@ KUBERNETES_CONTAINER_RUNTIME: $(yaml-quote ${CONTAINER_RUNTIME:-rkt}) RKT_VERSION: $(yaml-quote ${RKT_VERSION:-}) RKT_PATH: $(yaml-quote ${RKT_PATH:-}) RKT_STAGE1_IMAGE: $(yaml-quote ${RKT_STAGE1_IMAGE:-}) -KUBERNETES_CONFIGURE_CBR0: $(yaml-quote ${KUBERNETES_CONFIGURE_CBR0:-true}) EOF fi if [[ "${ENABLE_CLUSTER_AUTOSCALER}" == "true" ]]; then diff --git a/cluster/gce/coreos/master-docker.yaml b/cluster/gce/coreos/master-docker.yaml index 0f9a76cfe1..a25ab811cc 100644 --- a/cluster/gce/coreos/master-docker.yaml +++ b/cluster/gce/coreos/master-docker.yaml @@ -122,7 +122,6 @@ coreos: --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --container-runtime=docker \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --pod-cidr=${MASTER_IP_RANGE} \ --register-schedulable=false \ --reconcile-cidr=false diff --git a/cluster/gce/coreos/master-rkt.yaml b/cluster/gce/coreos/master-rkt.yaml index ac26528054..f5082969eb 100644 --- a/cluster/gce/coreos/master-rkt.yaml +++ b/cluster/gce/coreos/master-rkt.yaml @@ -182,7 +182,6 @@ coreos: --container-runtime=rkt \ --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE_IMAGE} \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --pod-cidr=${MASTER_IP_RANGE} \ --register-schedulable=false \ --reconcile-cidr=false diff --git a/cluster/gce/coreos/node-docker.yaml b/cluster/gce/coreos/node-docker.yaml index 5e313fa967..a436d18703 100644 --- a/cluster/gce/coreos/node-docker.yaml +++ b/cluster/gce/coreos/node-docker.yaml @@ -102,7 +102,6 @@ coreos: --cluster-domain=${DNS_DOMAIN} \ --logtostderr=true \ --container-runtime=docker \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --network-plugin=${NETWORK_PROVIDER} \ --reconcile-cidr=true Restart=always diff --git a/cluster/gce/coreos/node-rkt.yaml b/cluster/gce/coreos/node-rkt.yaml index 2f180aa8e9..5d8bbbbed0 100644 --- a/cluster/gce/coreos/node-rkt.yaml +++ b/cluster/gce/coreos/node-rkt.yaml @@ -148,7 +148,6 @@ coreos: --container-runtime=rkt \ --rkt-path=/opt/rkt/rkt \ --rkt-stage1-image=${RKT_STAGE1_IMAGE} \ - --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \ --network-plugin=kubenet \ --reconcile-cidr=true Restart=always diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 7474831ae3..32de3d840a 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -529,9 +529,6 @@ function start-kubelet { if [[ -n "${EVICTION_HARD:-}" ]]; then flags+=" --eviction-hard=${EVICTION_HARD}" fi - if [[ "${ALLOCATE_NODE_CIDRS:-}" == "true" ]]; then - flags+=" --configure-cbr0=${ALLOCATE_NODE_CIDRS}" - fi if [[ -n "${FEATURE_GATES:-}" ]]; then flags+=" --feature-gates=${FEATURE_GATES}" fi diff --git a/cluster/gce/trusty/configure-helper.sh b/cluster/gce/trusty/configure-helper.sh index 262289f32b..02056a1ab5 100644 --- a/cluster/gce/trusty/configure-helper.sh +++ b/cluster/gce/trusty/configure-helper.sh @@ -176,9 +176,6 @@ assemble_kubelet_flags() { if [ -n "${NODE_LABELS:-}" ]; then KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --node-labels=${NODE_LABELS}" fi - if [ "${ALLOCATE_NODE_CIDRS:-}" = "true" ]; then - KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --configure-cbr0=${ALLOCATE_NODE_CIDRS}" - fi # Add the unconditional flags KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --cloud-provider=gce --allow-privileged=true --cgroup-root=/ --system-cgroups=/system --kubelet-cgroups=/kubelet --babysit-daemons=true --config=/etc/kubernetes/manifests --cluster-dns=${DNS_SERVER_IP} --cluster-domain=${DNS_DOMAIN}" echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 684aefb543..e836f0c3fc 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -87,11 +87,6 @@ {% set kubelet_root = " --root-dir=" + grains.kubelet_root -%} {% endif -%} -{% set configure_cbr0 = "" -%} -{% if pillar['allocate_node_cidrs'] is defined -%} - {% set configure_cbr0 = "--configure-cbr0=" + pillar['allocate_node_cidrs'] -%} -{% endif -%} - {% set non_masquerade_cidr = "" -%} {% if pillar.get('non_masquerade_cidr','') -%} {% set non_masquerade_cidr = "--non-masquerade-cidr=" + pillar.non_masquerade_cidr -%} @@ -199,4 +194,4 @@ {% endif -%} # test_args has to be kept at the end, so they'll overwrite any prior configuration -DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{cloud_config}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{ reconcile_cidr_args }} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{babysit_daemons}} {{eviction_hard}} {{feature_gates}} {{test_args}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{cloud_config}} {{config}} {{manifest_url}} --allow-privileged={{pillar['allow_privileged']}} {{log_level}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{non_masquerade_cidr}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{ master_kubelet_args }} {{cpu_cfs_quota}} {{network_plugin}} {{kubelet_port}} {{ reconcile_cidr_args }} {{ hairpin_mode }} {{enable_custom_metrics}} {{runtime_container}} {{kubelet_container}} {{node_labels}} {{babysit_daemons}} {{eviction_hard}} {{feature_gates}} {{test_args}}" diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 282cf24d07..63d5694b02 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -177,8 +177,6 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.StringVar(&s.RktAPIEndpoint, "rkt-api-endpoint", s.RktAPIEndpoint, "The endpoint of the rkt API service to communicate with. Only used if --container-runtime='rkt'.") fs.StringVar(&s.RktStage1Image, "rkt-stage1-image", s.RktStage1Image, "image to use as stage1. Local paths and http/https URLs are supported. If empty, the 'stage1.aci' in the same directory as '--rkt-path' will be used.") fs.MarkDeprecated("rkt-stage1-image", "Will be removed in a future version. The default stage1 image will be specified by the rkt configurations, see https://github.com/coreos/rkt/blob/master/Documentation/configuration.md for more details.") - fs.BoolVar(&s.ConfigureCBR0, "configure-cbr0", s.ConfigureCBR0, "If true, kubelet will configure cbr0 based on Node.Spec.PodCIDR.") - fs.MarkDeprecated("configure-cbr0", "Will be removed in a future version. Please use kubenet or other network plugins.") fs.StringVar(&s.HairpinMode, "hairpin-mode", s.HairpinMode, "How should the kubelet setup hairpin NAT. This allows endpoints of a Service to loadbalance back to themselves if they should try to access their own Service. Valid values are \"promiscuous-bridge\", \"hairpin-veth\" and \"none\".") fs.BoolVar(&s.BabysitDaemons, "babysit-daemons", s.BabysitDaemons, "If true, the node has babysitter process monitoring docker and kubelet.") fs.MarkDeprecated("babysit-daemons", "Will be removed in a future version.") @@ -202,10 +200,10 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.Float64Var(&s.ChaosChance, "chaos-chance", s.ChaosChance, "If > 0.0, introduce random client errors and latency. Intended for testing. [default=0.0]") fs.BoolVar(&s.Containerized, "containerized", s.Containerized, "Experimental support for running kubelet in a container. Intended for testing. [default=false]") fs.Int64Var(&s.MaxOpenFiles, "max-open-files", s.MaxOpenFiles, "Number of files that can be opened by Kubelet process. [default=1000000]") - fs.BoolVar(&s.ReconcileCIDR, "reconcile-cidr", s.ReconcileCIDR, "Reconcile node CIDR with the CIDR specified by the API server. No-op if register-node or configure-cbr0 is false. [default=true]") + fs.BoolVar(&s.ReconcileCIDR, "reconcile-cidr", s.ReconcileCIDR, "Reconcile node CIDR with the CIDR specified by the API server. Won't have any effect if register-node is false. [default=true]") fs.Var(&s.SystemReserved, "system-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for non-kubernetes components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") fs.Var(&s.KubeReserved, "kube-reserved", "A set of ResourceName=ResourceQuantity (e.g. cpu=200m,memory=150G) pairs that describe resources reserved for kubernetes system components. Currently only cpu and memory are supported. See http://kubernetes.io/docs/user-guide/compute-resources for more detail. [default=none]") - fs.BoolVar(&s.RegisterSchedulable, "register-schedulable", s.RegisterSchedulable, "Register the node as schedulable. No-op if register-node is false. [default=true]") + fs.BoolVar(&s.RegisterSchedulable, "register-schedulable", s.RegisterSchedulable, "Register the node as schedulable. Won't have any effect if register-node is false. [default=true]") fs.StringVar(&s.ContentType, "kube-api-content-type", s.ContentType, "Content type of requests sent to apiserver.") fs.Int32Var(&s.KubeAPIQPS, "kube-api-qps", s.KubeAPIQPS, "QPS to use while talking with kubernetes apiserver") fs.Int32Var(&s.KubeAPIBurst, "kube-api-burst", s.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver") diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 1655cd29e1..8d88bedb0b 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -92,7 +92,6 @@ concurrent-resource-quota-syncs concurrent-service-syncs concurrent-serviceaccount-token-syncs config-sync-period -configure-cbr0 configure-cloud-routes conntrack-max conntrack-max-per-core diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index f08bcbf095..81bbc8295e 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -1259,7 +1259,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep135 := !z.EncBinary() yy2arr135 := z.EncBasicHandle().StructToArray - var yyq135 [108]bool + var yyq135 [107]bool _, _, _ = yysep135, yyq135, yy2arr135 const yyr135 bool = false yyq135[0] = x.Kind != "" @@ -1276,21 +1276,21 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yyq135[65] = x.RktPath != "" yyq135[66] = x.RktAPIEndpoint != "" yyq135[67] = x.RktStage1Image != "" - yyq135[87] = true - yyq135[88] = x.NodeIP != "" - yyq135[92] = x.EvictionHard != "" - yyq135[93] = x.EvictionSoft != "" - yyq135[94] = x.EvictionSoftGracePeriod != "" - yyq135[95] = true - yyq135[96] = x.EvictionMaxPodGracePeriod != 0 - yyq135[97] = x.EvictionMinimumReclaim != "" - yyq135[106] = len(x.AllowedUnsafeSysctls) != 0 - yyq135[107] = x.ExperimentalRuntimeIntegrationType != "" + yyq135[86] = true + yyq135[87] = x.NodeIP != "" + yyq135[91] = x.EvictionHard != "" + yyq135[92] = x.EvictionSoft != "" + yyq135[93] = x.EvictionSoftGracePeriod != "" + yyq135[94] = true + yyq135[95] = x.EvictionMaxPodGracePeriod != 0 + yyq135[96] = x.EvictionMinimumReclaim != "" + yyq135[105] = len(x.AllowedUnsafeSysctls) != 0 + yyq135[106] = x.ExperimentalRuntimeIntegrationType != "" var yynn135 int if yyr135 || yy2arr135 { - r.EncodeArrayStart(108) + r.EncodeArrayStart(107) } else { - yynn135 = 84 + yynn135 = 83 for _, b := range yyq135 { if b { yynn135++ @@ -2815,17 +2815,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym365 if false { } else { - r.EncodeBool(bool(x.ConfigureCBR0)) + r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) + r.EncodeString(codecSelferC_UTF81234, string("hairpinMode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym366 := z.EncBinary() _ = yym366 if false { } else { - r.EncodeBool(bool(x.ConfigureCBR0)) + r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) } } if yyr135 || yy2arr135 { @@ -2834,17 +2834,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym368 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) + r.EncodeBool(bool(x.BabysitDaemons)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hairpinMode")) + r.EncodeString(codecSelferC_UTF81234, string("babysitDaemons")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym369 := z.EncBinary() _ = yym369 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) + r.EncodeBool(bool(x.BabysitDaemons)) } } if yyr135 || yy2arr135 { @@ -2853,17 +2853,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym371 if false { } else { - r.EncodeBool(bool(x.BabysitDaemons)) + r.EncodeInt(int64(x.MaxPods)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("babysitDaemons")) + r.EncodeString(codecSelferC_UTF81234, string("maxPods")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym372 := z.EncBinary() _ = yym372 if false { } else { - r.EncodeBool(bool(x.BabysitDaemons)) + r.EncodeInt(int64(x.MaxPods)) } } if yyr135 || yy2arr135 { @@ -2872,17 +2872,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym374 if false { } else { - r.EncodeInt(int64(x.MaxPods)) + r.EncodeInt(int64(x.NvidiaGPUs)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxPods")) + r.EncodeString(codecSelferC_UTF81234, string("nvidiaGPUs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym375 := z.EncBinary() _ = yym375 if false { } else { - r.EncodeInt(int64(x.MaxPods)) + r.EncodeInt(int64(x.NvidiaGPUs)) } } if yyr135 || yy2arr135 { @@ -2891,17 +2891,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym377 if false { } else { - r.EncodeInt(int64(x.NvidiaGPUs)) + r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nvidiaGPUs")) + r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym378 := z.EncBinary() _ = yym378 if false { } else { - r.EncodeInt(int64(x.NvidiaGPUs)) + r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } if yyr135 || yy2arr135 { @@ -2910,17 +2910,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym380 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) + r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym381 := z.EncBinary() _ = yym381 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) + r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } if yyr135 || yy2arr135 { @@ -2929,17 +2929,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym383 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) + r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) + r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym384 := z.EncBinary() _ = yym384 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) + r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } if yyr135 || yy2arr135 { @@ -2948,17 +2948,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym386 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) + r.EncodeBool(bool(x.CPUCFSQuota)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) + r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym387 := z.EncBinary() _ = yym387 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) + r.EncodeBool(bool(x.CPUCFSQuota)) } } if yyr135 || yy2arr135 { @@ -2967,17 +2967,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym389 if false { } else { - r.EncodeBool(bool(x.CPUCFSQuota)) + r.EncodeBool(bool(x.Containerized)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) + r.EncodeString(codecSelferC_UTF81234, string("containerized")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym390 := z.EncBinary() _ = yym390 if false { } else { - r.EncodeBool(bool(x.CPUCFSQuota)) + r.EncodeBool(bool(x.Containerized)) } } if yyr135 || yy2arr135 { @@ -2986,17 +2986,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym392 if false { } else { - r.EncodeBool(bool(x.Containerized)) + r.EncodeInt(int64(x.MaxOpenFiles)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("containerized")) + r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym393 := z.EncBinary() _ = yym393 if false { } else { - r.EncodeBool(bool(x.Containerized)) + r.EncodeInt(int64(x.MaxOpenFiles)) } } if yyr135 || yy2arr135 { @@ -3005,17 +3005,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym395 if false { } else { - r.EncodeInt(int64(x.MaxOpenFiles)) + r.EncodeBool(bool(x.ReconcileCIDR)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) + r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym396 := z.EncBinary() _ = yym396 if false { } else { - r.EncodeInt(int64(x.MaxOpenFiles)) + r.EncodeBool(bool(x.ReconcileCIDR)) } } if yyr135 || yy2arr135 { @@ -3024,17 +3024,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym398 if false { } else { - r.EncodeBool(bool(x.ReconcileCIDR)) + r.EncodeBool(bool(x.RegisterSchedulable)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) + r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym399 := z.EncBinary() _ = yym399 if false { } else { - r.EncodeBool(bool(x.ReconcileCIDR)) + r.EncodeBool(bool(x.RegisterSchedulable)) } } if yyr135 || yy2arr135 { @@ -3043,17 +3043,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym401 if false { } else { - r.EncodeBool(bool(x.RegisterSchedulable)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) + r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym402 := z.EncBinary() _ = yym402 if false { } else { - r.EncodeBool(bool(x.RegisterSchedulable)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } if yyr135 || yy2arr135 { @@ -3062,17 +3062,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym404 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeInt(int64(x.KubeAPIQPS)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("contentType")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym405 := z.EncBinary() _ = yym405 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeInt(int64(x.KubeAPIQPS)) } } if yyr135 || yy2arr135 { @@ -3081,17 +3081,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym407 if false { } else { - r.EncodeInt(int64(x.KubeAPIQPS)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym408 := z.EncBinary() _ = yym408 if false { } else { - r.EncodeInt(int64(x.KubeAPIQPS)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } if yyr135 || yy2arr135 { @@ -3099,25 +3099,6 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym410 := z.EncBinary() _ = yym410 if false { - } else { - r.EncodeInt(int64(x.KubeAPIBurst)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym411 := z.EncBinary() - _ = yym411 - if false { - } else { - r.EncodeInt(int64(x.KubeAPIBurst)) - } - } - if yyr135 || yy2arr135 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym413 := z.EncBinary() - _ = yym413 - if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) } @@ -3125,8 +3106,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym414 := z.EncBinary() - _ = yym414 + yym411 := z.EncBinary() + _ = yym411 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) @@ -3134,42 +3115,42 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[87] { - yy416 := &x.OutOfDiskTransitionFrequency - yym417 := z.EncBinary() - _ = yym417 + if yyq135[86] { + yy413 := &x.OutOfDiskTransitionFrequency + yym414 := z.EncBinary() + _ = yym414 if false { - } else if z.HasExtensions() && z.EncExt(yy416) { - } else if !yym417 && z.IsJSONHandle() { - z.EncJSONMarshal(yy416) + } else if z.HasExtensions() && z.EncExt(yy413) { + } else if !yym414 && z.IsJSONHandle() { + z.EncJSONMarshal(yy413) } else { - z.EncFallback(yy416) + z.EncFallback(yy413) } } else { r.EncodeNil() } } else { - if yyq135[87] { + if yyq135[86] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("outOfDiskTransitionFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy418 := &x.OutOfDiskTransitionFrequency - yym419 := z.EncBinary() - _ = yym419 + yy415 := &x.OutOfDiskTransitionFrequency + yym416 := z.EncBinary() + _ = yym416 if false { - } else if z.HasExtensions() && z.EncExt(yy418) { - } else if !yym419 && z.IsJSONHandle() { - z.EncJSONMarshal(yy418) + } else if z.HasExtensions() && z.EncExt(yy415) { + } else if !yym416 && z.IsJSONHandle() { + z.EncJSONMarshal(yy415) } else { - z.EncFallback(yy418) + z.EncFallback(yy415) } } } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[88] { - yym421 := z.EncBinary() - _ = yym421 + if yyq135[87] { + yym418 := z.EncBinary() + _ = yym418 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -3178,12 +3159,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq135[88] { + if yyq135[87] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeIP")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym422 := z.EncBinary() - _ = yym422 + yym419 := z.EncBinary() + _ = yym419 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -3195,8 +3176,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym424 := z.EncBinary() - _ = yym424 + yym421 := z.EncBinary() + _ = yym421 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -3209,8 +3190,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym425 := z.EncBinary() - _ = yym425 + yym422 := z.EncBinary() + _ = yym422 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -3219,8 +3200,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym427 := z.EncBinary() - _ = yym427 + yym424 := z.EncBinary() + _ = yym424 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -3229,8 +3210,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nonMasqueradeCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym428 := z.EncBinary() - _ = yym428 + yym425 := z.EncBinary() + _ = yym425 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -3238,8 +3219,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym430 := z.EncBinary() - _ = yym430 + yym427 := z.EncBinary() + _ = yym427 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -3248,13 +3229,38 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableCustomMetrics")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym431 := z.EncBinary() - _ = yym431 + yym428 := z.EncBinary() + _ = yym428 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) } } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[91] { + yym430 := z.EncBinary() + _ = yym430 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq135[91] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("evictionHard")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym431 := z.EncBinary() + _ = yym431 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) + } + } + } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq135[92] { @@ -3262,7 +3268,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym433 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -3270,13 +3276,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq135[92] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionHard")) + r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym434 := z.EncBinary() _ = yym434 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) } } } @@ -3287,7 +3293,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym436 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) } } else { r.EncodeString(codecSelferC_UTF81234, "") @@ -3295,71 +3301,71 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq135[93] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) + r.EncodeString(codecSelferC_UTF81234, string("evictionSoftGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym437 := z.EncBinary() _ = yym437 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) } } } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq135[94] { - yym439 := z.EncBinary() - _ = yym439 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq135[94] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionSoftGracePeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy439 := &x.EvictionPressureTransitionPeriod yym440 := z.EncBinary() _ = yym440 if false { + } else if z.HasExtensions() && z.EncExt(yy439) { + } else if !yym440 && z.IsJSONHandle() { + z.EncJSONMarshal(yy439) } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) - } - } - } - if yyr135 || yy2arr135 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[95] { - yy442 := &x.EvictionPressureTransitionPeriod - yym443 := z.EncBinary() - _ = yym443 - if false { - } else if z.HasExtensions() && z.EncExt(yy442) { - } else if !yym443 && z.IsJSONHandle() { - z.EncJSONMarshal(yy442) - } else { - z.EncFallback(yy442) + z.EncFallback(yy439) } } else { r.EncodeNil() } } else { - if yyq135[95] { + if yyq135[94] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionPressureTransitionPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy444 := &x.EvictionPressureTransitionPeriod + yy441 := &x.EvictionPressureTransitionPeriod + yym442 := z.EncBinary() + _ = yym442 + if false { + } else if z.HasExtensions() && z.EncExt(yy441) { + } else if !yym442 && z.IsJSONHandle() { + z.EncJSONMarshal(yy441) + } else { + z.EncFallback(yy441) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[95] { + yym444 := z.EncBinary() + _ = yym444 + if false { + } else { + r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) + } + } else { + r.EncodeInt(0) + } + } else { + if yyq135[95] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("evictionMaxPodGracePeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) yym445 := z.EncBinary() _ = yym445 if false { - } else if z.HasExtensions() && z.EncExt(yy444) { - } else if !yym445 && z.IsJSONHandle() { - z.EncJSONMarshal(yy444) } else { - z.EncFallback(yy444) + r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) } } } @@ -3369,31 +3375,6 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym447 := z.EncBinary() _ = yym447 if false { - } else { - r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) - } - } else { - r.EncodeInt(0) - } - } else { - if yyq135[96] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionMaxPodGracePeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym448 := z.EncBinary() - _ = yym448 - if false { - } else { - r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) - } - } - } - if yyr135 || yy2arr135 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[97] { - yym450 := z.EncBinary() - _ = yym450 - if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionMinimumReclaim)) } @@ -3401,12 +3382,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq135[97] { + if yyq135[96] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionMinimumReclaim")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym451 := z.EncBinary() - _ = yym451 + yym448 := z.EncBinary() + _ = yym448 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionMinimumReclaim)) @@ -3415,8 +3396,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym453 := z.EncBinary() - _ = yym453 + yym450 := z.EncBinary() + _ = yym450 if false { } else { r.EncodeInt(int64(x.PodsPerCore)) @@ -3425,8 +3406,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podsPerCore")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym454 := z.EncBinary() - _ = yym454 + yym451 := z.EncBinary() + _ = yym451 if false { } else { r.EncodeInt(int64(x.PodsPerCore)) @@ -3434,8 +3415,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym456 := z.EncBinary() - _ = yym456 + yym453 := z.EncBinary() + _ = yym453 if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) @@ -3444,8 +3425,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableControllerAttachDetach")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym457 := z.EncBinary() - _ = yym457 + yym454 := z.EncBinary() + _ = yym454 if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) @@ -3456,8 +3437,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.SystemReserved == nil { r.EncodeNil() } else { - yym459 := z.EncBinary() - _ = yym459 + yym456 := z.EncBinary() + _ = yym456 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3471,8 +3452,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.SystemReserved == nil { r.EncodeNil() } else { - yym460 := z.EncBinary() - _ = yym460 + yym457 := z.EncBinary() + _ = yym457 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3485,8 +3466,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.KubeReserved == nil { r.EncodeNil() } else { - yym462 := z.EncBinary() - _ = yym462 + yym459 := z.EncBinary() + _ = yym459 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3500,8 +3481,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.KubeReserved == nil { r.EncodeNil() } else { - yym463 := z.EncBinary() - _ = yym463 + yym460 := z.EncBinary() + _ = yym460 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3511,8 +3492,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym465 := z.EncBinary() - _ = yym465 + yym462 := z.EncBinary() + _ = yym462 if false { } else { r.EncodeBool(bool(x.ProtectKernelDefaults)) @@ -3521,8 +3502,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("protectKernelDefaults")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym466 := z.EncBinary() - _ = yym466 + yym463 := z.EncBinary() + _ = yym463 if false { } else { r.EncodeBool(bool(x.ProtectKernelDefaults)) @@ -3530,8 +3511,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym468 := z.EncBinary() - _ = yym468 + yym465 := z.EncBinary() + _ = yym465 if false { } else { r.EncodeBool(bool(x.MakeIPTablesUtilChains)) @@ -3540,8 +3521,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("makeIPTablesUtilChains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym469 := z.EncBinary() - _ = yym469 + yym466 := z.EncBinary() + _ = yym466 if false { } else { r.EncodeBool(bool(x.MakeIPTablesUtilChains)) @@ -3549,8 +3530,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym471 := z.EncBinary() - _ = yym471 + yym468 := z.EncBinary() + _ = yym468 if false { } else { r.EncodeInt(int64(x.IPTablesMasqueradeBit)) @@ -3559,8 +3540,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym472 := z.EncBinary() - _ = yym472 + yym469 := z.EncBinary() + _ = yym469 if false { } else { r.EncodeInt(int64(x.IPTablesMasqueradeBit)) @@ -3568,8 +3549,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym474 := z.EncBinary() - _ = yym474 + yym471 := z.EncBinary() + _ = yym471 if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) @@ -3578,8 +3559,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesDropBit")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym475 := z.EncBinary() - _ = yym475 + yym472 := z.EncBinary() + _ = yym472 if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) @@ -3587,12 +3568,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[106] { + if yyq135[105] { if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym477 := z.EncBinary() - _ = yym477 + yym474 := z.EncBinary() + _ = yym474 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3602,15 +3583,15 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq135[106] { + if yyq135[105] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalAllowedUnsafeSysctls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym478 := z.EncBinary() - _ = yym478 + yym475 := z.EncBinary() + _ = yym475 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3620,9 +3601,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq135[107] { - yym480 := z.EncBinary() - _ = yym480 + if yyq135[106] { + yym477 := z.EncBinary() + _ = yym477 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ExperimentalRuntimeIntegrationType)) @@ -3631,12 +3612,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq135[107] { + if yyq135[106] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalRuntimeIntegrationType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym481 := z.EncBinary() - _ = yym481 + yym478 := z.EncBinary() + _ = yym478 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ExperimentalRuntimeIntegrationType)) @@ -3656,25 +3637,25 @@ func (x *KubeletConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym482 := z.DecBinary() - _ = yym482 + yym479 := z.DecBinary() + _ = yym479 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct483 := r.ContainerType() - if yyct483 == codecSelferValueTypeMap1234 { - yyl483 := r.ReadMapStart() - if yyl483 == 0 { + yyct480 := r.ContainerType() + if yyct480 == codecSelferValueTypeMap1234 { + yyl480 := r.ReadMapStart() + if yyl480 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl483, d) + x.codecDecodeSelfFromMap(yyl480, d) } - } else if yyct483 == codecSelferValueTypeArray1234 { - yyl483 := r.ReadArrayStart() - if yyl483 == 0 { + } else if yyct480 == codecSelferValueTypeArray1234 { + yyl480 := r.ReadArrayStart() + if yyl480 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl483, d) + x.codecDecodeSelfFromArray(yyl480, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -3686,12 +3667,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys484Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys484Slc - var yyhl484 bool = l >= 0 - for yyj484 := 0; ; yyj484++ { - if yyhl484 { - if yyj484 >= l { + var yys481Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys481Slc + var yyhl481 bool = l >= 0 + for yyj481 := 0; ; yyj481++ { + if yyhl481 { + if yyj481 >= l { break } } else { @@ -3700,10 +3681,10 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys484Slc = r.DecodeBytes(yys484Slc, true, true) - yys484 := string(yys484Slc) + yys481Slc = r.DecodeBytes(yys481Slc, true, true) + yys481 := string(yys481Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys484 { + switch yys481 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -3726,45 +3707,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv488 := &x.SyncFrequency - yym489 := z.DecBinary() - _ = yym489 + yyv485 := &x.SyncFrequency + yym486 := z.DecBinary() + _ = yym486 if false { - } else if z.HasExtensions() && z.DecExt(yyv488) { - } else if !yym489 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv488) + } else if z.HasExtensions() && z.DecExt(yyv485) { + } else if !yym486 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv485) } else { - z.DecFallback(yyv488, false) + z.DecFallback(yyv485, false) } } case "fileCheckFrequency": if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv490 := &x.FileCheckFrequency - yym491 := z.DecBinary() - _ = yym491 + yyv487 := &x.FileCheckFrequency + yym488 := z.DecBinary() + _ = yym488 if false { - } else if z.HasExtensions() && z.DecExt(yyv490) { - } else if !yym491 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv490) + } else if z.HasExtensions() && z.DecExt(yyv487) { + } else if !yym488 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv487) } else { - z.DecFallback(yyv490, false) + z.DecFallback(yyv487, false) } } case "httpCheckFrequency": if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv492 := &x.HTTPCheckFrequency - yym493 := z.DecBinary() - _ = yym493 + yyv489 := &x.HTTPCheckFrequency + yym490 := z.DecBinary() + _ = yym490 if false { - } else if z.HasExtensions() && z.DecExt(yyv492) { - } else if !yym493 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv492) + } else if z.HasExtensions() && z.DecExt(yyv489) { + } else if !yym490 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv489) } else { - z.DecFallback(yyv492, false) + z.DecFallback(yyv489, false) } } case "manifestURL": @@ -3861,36 +3842,36 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv509 := &x.HostNetworkSources - yym510 := z.DecBinary() - _ = yym510 + yyv506 := &x.HostNetworkSources + yym507 := z.DecBinary() + _ = yym507 if false { } else { - z.F.DecSliceStringX(yyv509, false, d) + z.F.DecSliceStringX(yyv506, false, d) } } case "hostPIDSources": if r.TryDecodeAsNil() { x.HostPIDSources = nil } else { - yyv511 := &x.HostPIDSources - yym512 := z.DecBinary() - _ = yym512 + yyv508 := &x.HostPIDSources + yym509 := z.DecBinary() + _ = yym509 if false { } else { - z.F.DecSliceStringX(yyv511, false, d) + z.F.DecSliceStringX(yyv508, false, d) } } case "hostIPCSources": if r.TryDecodeAsNil() { x.HostIPCSources = nil } else { - yyv513 := &x.HostIPCSources - yym514 := z.DecBinary() - _ = yym514 + yyv510 := &x.HostIPCSources + yym511 := z.DecBinary() + _ = yym511 if false { } else { - z.F.DecSliceStringX(yyv513, false, d) + z.F.DecSliceStringX(yyv510, false, d) } } case "registryPullQPS": @@ -3927,15 +3908,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv520 := &x.MinimumGCAge - yym521 := z.DecBinary() - _ = yym521 + yyv517 := &x.MinimumGCAge + yym518 := z.DecBinary() + _ = yym518 if false { - } else if z.HasExtensions() && z.DecExt(yyv520) { - } else if !yym521 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv520) + } else if z.HasExtensions() && z.DecExt(yyv517) { + } else if !yym518 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv517) } else { - z.DecFallback(yyv520, false) + z.DecFallback(yyv517, false) } } case "maxPerPodContainerCount": @@ -4002,45 +3983,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv532 := &x.StreamingConnectionIdleTimeout - yym533 := z.DecBinary() - _ = yym533 + yyv529 := &x.StreamingConnectionIdleTimeout + yym530 := z.DecBinary() + _ = yym530 if false { - } else if z.HasExtensions() && z.DecExt(yyv532) { - } else if !yym533 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv532) + } else if z.HasExtensions() && z.DecExt(yyv529) { + } else if !yym530 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv529) } else { - z.DecFallback(yyv532, false) + z.DecFallback(yyv529, false) } } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv534 := &x.NodeStatusUpdateFrequency - yym535 := z.DecBinary() - _ = yym535 + yyv531 := &x.NodeStatusUpdateFrequency + yym532 := z.DecBinary() + _ = yym532 if false { - } else if z.HasExtensions() && z.DecExt(yyv534) { - } else if !yym535 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv534) + } else if z.HasExtensions() && z.DecExt(yyv531) { + } else if !yym532 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv531) } else { - z.DecFallback(yyv534, false) + z.DecFallback(yyv531, false) } } case "imageMinimumGCAge": if r.TryDecodeAsNil() { x.ImageMinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv536 := &x.ImageMinimumGCAge - yym537 := z.DecBinary() - _ = yym537 + yyv533 := &x.ImageMinimumGCAge + yym534 := z.DecBinary() + _ = yym534 if false { - } else if z.HasExtensions() && z.DecExt(yyv536) { - } else if !yym537 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv536) + } else if z.HasExtensions() && z.DecExt(yyv533) { + } else if !yym534 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv533) } else { - z.DecFallback(yyv536, false) + z.DecFallback(yyv533, false) } } case "imageGCHighThresholdPercent": @@ -4065,15 +4046,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv541 := &x.VolumeStatsAggPeriod - yym542 := z.DecBinary() - _ = yym542 + yyv538 := &x.VolumeStatsAggPeriod + yym539 := z.DecBinary() + _ = yym539 if false { - } else if z.HasExtensions() && z.DecExt(yyv541) { - } else if !yym542 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv541) + } else if z.HasExtensions() && z.DecExt(yyv538) { + } else if !yym539 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv538) } else { - z.DecFallback(yyv541, false) + z.DecFallback(yyv538, false) } } case "networkPluginName": @@ -4182,15 +4163,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv560 := &x.RuntimeRequestTimeout - yym561 := z.DecBinary() - _ = yym561 + yyv557 := &x.RuntimeRequestTimeout + yym558 := z.DecBinary() + _ = yym558 if false { - } else if z.HasExtensions() && z.DecExt(yyv560) { - } else if !yym561 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv560) + } else if z.HasExtensions() && z.DecExt(yyv557) { + } else if !yym558 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv557) } else { - z.DecFallback(yyv560, false) + z.DecFallback(yyv557, false) } } case "rktPath": @@ -4223,12 +4204,6 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } else { x.ExitOnLockContention = bool(r.DecodeBool()) } - case "configureCbr0": - if r.TryDecodeAsNil() { - x.ConfigureCBR0 = false - } else { - x.ConfigureCBR0 = bool(r.DecodeBool()) - } case "hairpinMode": if r.TryDecodeAsNil() { x.HairpinMode = "" @@ -4329,15 +4304,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv584 := &x.OutOfDiskTransitionFrequency - yym585 := z.DecBinary() - _ = yym585 + yyv580 := &x.OutOfDiskTransitionFrequency + yym581 := z.DecBinary() + _ = yym581 if false { - } else if z.HasExtensions() && z.DecExt(yyv584) { - } else if !yym585 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv584) + } else if z.HasExtensions() && z.DecExt(yyv580) { + } else if !yym581 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv580) } else { - z.DecFallback(yyv584, false) + z.DecFallback(yyv580, false) } } case "nodeIP": @@ -4350,12 +4325,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv587 := &x.NodeLabels - yym588 := z.DecBinary() - _ = yym588 + yyv583 := &x.NodeLabels + yym584 := z.DecBinary() + _ = yym584 if false { } else { - z.F.DecMapStringStringX(yyv587, false, d) + z.F.DecMapStringStringX(yyv583, false, d) } } case "nonMasqueradeCIDR": @@ -4392,15 +4367,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv594 := &x.EvictionPressureTransitionPeriod - yym595 := z.DecBinary() - _ = yym595 + yyv590 := &x.EvictionPressureTransitionPeriod + yym591 := z.DecBinary() + _ = yym591 if false { - } else if z.HasExtensions() && z.DecExt(yyv594) { - } else if !yym595 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv594) + } else if z.HasExtensions() && z.DecExt(yyv590) { + } else if !yym591 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv590) } else { - z.DecFallback(yyv594, false) + z.DecFallback(yyv590, false) } } case "evictionMaxPodGracePeriod": @@ -4431,26 +4406,26 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv600 := &x.SystemReserved - yym601 := z.DecBinary() - _ = yym601 + yyv596 := &x.SystemReserved + yym597 := z.DecBinary() + _ = yym597 if false { - } else if z.HasExtensions() && z.DecExt(yyv600) { + } else if z.HasExtensions() && z.DecExt(yyv596) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv600), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv596), d) } } case "kubeReserved": if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv602 := &x.KubeReserved - yym603 := z.DecBinary() - _ = yym603 + yyv598 := &x.KubeReserved + yym599 := z.DecBinary() + _ = yym599 if false { - } else if z.HasExtensions() && z.DecExt(yyv602) { + } else if z.HasExtensions() && z.DecExt(yyv598) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv602), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv598), d) } } case "protectKernelDefaults": @@ -4481,12 +4456,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv608 := &x.AllowedUnsafeSysctls - yym609 := z.DecBinary() - _ = yym609 + yyv604 := &x.AllowedUnsafeSysctls + yym605 := z.DecBinary() + _ = yym605 if false { } else { - z.F.DecSliceStringX(yyv608, false, d) + z.F.DecSliceStringX(yyv604, false, d) } } case "experimentalRuntimeIntegrationType": @@ -4496,9 +4471,9 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.ExperimentalRuntimeIntegrationType = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys484) - } // end switch yys484 - } // end for yyj484 + z.DecStructFieldNotFound(-1, yys481) + } // end switch yys481 + } // end for yyj481 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -4506,16 +4481,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj611 int - var yyb611 bool - var yyhl611 bool = l >= 0 - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + var yyj607 int + var yyb607 bool + var yyhl607 bool = l >= 0 + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4525,13 +4500,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Kind = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4541,13 +4516,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.APIVersion = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4557,13 +4532,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodManifestPath = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4571,7 +4546,57 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv615 := &x.SyncFrequency + yyv611 := &x.SyncFrequency + yym612 := z.DecBinary() + _ = yym612 + if false { + } else if z.HasExtensions() && z.DecExt(yyv611) { + } else if !yym612 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv611) + } else { + z.DecFallback(yyv611, false) + } + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.FileCheckFrequency = pkg1_unversioned.Duration{} + } else { + yyv613 := &x.FileCheckFrequency + yym614 := z.DecBinary() + _ = yym614 + if false { + } else if z.HasExtensions() && z.DecExt(yyv613) { + } else if !yym614 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv613) + } else { + z.DecFallback(yyv613, false) + } + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + } else { + yyv615 := &x.HTTPCheckFrequency yym616 := z.DecBinary() _ = yym616 if false { @@ -4582,63 +4607,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv615, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} - } else { - yyv617 := &x.FileCheckFrequency - yym618 := z.DecBinary() - _ = yym618 - if false { - } else if z.HasExtensions() && z.DecExt(yyv617) { - } else if !yym618 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv617) - } else { - z.DecFallback(yyv617, false) - } - } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l - } else { - yyb611 = r.CheckBreak() - } - if yyb611 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} - } else { - yyv619 := &x.HTTPCheckFrequency - yym620 := z.DecBinary() - _ = yym620 - if false { - } else if z.HasExtensions() && z.DecExt(yyv619) { - } else if !yym620 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv619) - } else { - z.DecFallback(yyv619, false) - } - } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l - } else { - yyb611 = r.CheckBreak() - } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4648,13 +4623,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4664,13 +4639,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4680,13 +4655,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4696,13 +4671,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4712,13 +4687,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4728,13 +4703,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4744,13 +4719,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4760,13 +4735,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4776,13 +4751,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4792,13 +4767,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4808,13 +4783,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4824,13 +4799,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4840,13 +4815,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4856,13 +4831,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SeccompProfileRoot = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4872,13 +4847,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4886,21 +4861,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv636 := &x.HostNetworkSources - yym637 := z.DecBinary() - _ = yym637 + yyv632 := &x.HostNetworkSources + yym633 := z.DecBinary() + _ = yym633 if false { } else { - z.F.DecSliceStringX(yyv636, false, d) + z.F.DecSliceStringX(yyv632, false, d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4908,21 +4883,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostPIDSources = nil } else { - yyv638 := &x.HostPIDSources - yym639 := z.DecBinary() - _ = yym639 + yyv634 := &x.HostPIDSources + yym635 := z.DecBinary() + _ = yym635 if false { } else { - z.F.DecSliceStringX(yyv638, false, d) + z.F.DecSliceStringX(yyv634, false, d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4930,21 +4905,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostIPCSources = nil } else { - yyv640 := &x.HostIPCSources - yym641 := z.DecBinary() - _ = yym641 + yyv636 := &x.HostIPCSources + yym637 := z.DecBinary() + _ = yym637 if false { } else { - z.F.DecSliceStringX(yyv640, false, d) + z.F.DecSliceStringX(yyv636, false, d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4954,13 +4929,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4970,13 +4945,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4986,13 +4961,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5002,13 +4977,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5018,13 +4993,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5032,24 +5007,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv647 := &x.MinimumGCAge - yym648 := z.DecBinary() - _ = yym648 + yyv643 := &x.MinimumGCAge + yym644 := z.DecBinary() + _ = yym644 if false { - } else if z.HasExtensions() && z.DecExt(yyv647) { - } else if !yym648 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv647) + } else if z.HasExtensions() && z.DecExt(yyv643) { + } else if !yym644 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv643) } else { - z.DecFallback(yyv647, false) + z.DecFallback(yyv643, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5059,13 +5034,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5075,13 +5050,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5091,13 +5066,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5107,13 +5082,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5123,13 +5098,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5139,13 +5114,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5155,13 +5130,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5171,13 +5146,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5187,13 +5162,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5203,13 +5178,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5217,7 +5192,57 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv659 := &x.StreamingConnectionIdleTimeout + yyv655 := &x.StreamingConnectionIdleTimeout + yym656 := z.DecBinary() + _ = yym656 + if false { + } else if z.HasExtensions() && z.DecExt(yyv655) { + } else if !yym656 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv655) + } else { + z.DecFallback(yyv655, false) + } + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + } else { + yyv657 := &x.NodeStatusUpdateFrequency + yym658 := z.DecBinary() + _ = yym658 + if false { + } else if z.HasExtensions() && z.DecExt(yyv657) { + } else if !yym658 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv657) + } else { + z.DecFallback(yyv657, false) + } + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + } else { + yyv659 := &x.ImageMinimumGCAge yym660 := z.DecBinary() _ = yym660 if false { @@ -5228,63 +5253,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv659, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} - } else { - yyv661 := &x.NodeStatusUpdateFrequency - yym662 := z.DecBinary() - _ = yym662 - if false { - } else if z.HasExtensions() && z.DecExt(yyv661) { - } else if !yym662 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv661) - } else { - z.DecFallback(yyv661, false) - } - } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l - } else { - yyb611 = r.CheckBreak() - } - if yyb611 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} - } else { - yyv663 := &x.ImageMinimumGCAge - yym664 := z.DecBinary() - _ = yym664 - if false { - } else if z.HasExtensions() && z.DecExt(yyv663) { - } else if !yym664 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv663) - } else { - z.DecFallback(yyv663, false) - } - } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l - } else { - yyb611 = r.CheckBreak() - } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5294,13 +5269,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCHighThresholdPercent = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5310,13 +5285,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCLowThresholdPercent = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5326,13 +5301,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LowDiskSpaceThresholdMB = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5340,24 +5315,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv668 := &x.VolumeStatsAggPeriod - yym669 := z.DecBinary() - _ = yym669 + yyv664 := &x.VolumeStatsAggPeriod + yym665 := z.DecBinary() + _ = yym665 if false { - } else if z.HasExtensions() && z.DecExt(yyv668) { - } else if !yym669 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv668) + } else if z.HasExtensions() && z.DecExt(yyv664) { + } else if !yym665 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv664) } else { - z.DecFallback(yyv668, false) + z.DecFallback(yyv664, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5367,13 +5342,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5383,13 +5358,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginMTU = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5399,13 +5374,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5415,13 +5390,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIConfDir = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5431,13 +5406,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIBinDir = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5447,13 +5422,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5463,13 +5438,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5479,13 +5454,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5495,13 +5470,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeletCgroups = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5511,13 +5486,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupsPerQOS = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5527,13 +5502,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupDriver = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5543,13 +5518,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RuntimeCgroups = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5559,13 +5534,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemCgroups = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5575,13 +5550,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5591,13 +5566,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5607,13 +5582,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteRuntimeEndpoint = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5623,13 +5598,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteImageEndpoint = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5637,24 +5612,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv687 := &x.RuntimeRequestTimeout - yym688 := z.DecBinary() - _ = yym688 + yyv683 := &x.RuntimeRequestTimeout + yym684 := z.DecBinary() + _ = yym684 if false { - } else if z.HasExtensions() && z.DecExt(yyv687) { - } else if !yym688 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv687) + } else if z.HasExtensions() && z.DecExt(yyv683) { + } else if !yym684 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv683) } else { - z.DecFallback(yyv687, false) + z.DecFallback(yyv683, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5664,13 +5639,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5680,13 +5655,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktAPIEndpoint = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5696,13 +5671,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5712,13 +5687,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LockFilePath = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5728,29 +5703,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExitOnLockContention = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ConfigureCBR0 = false - } else { - x.ConfigureCBR0 = bool(r.DecodeBool()) - } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l - } else { - yyb611 = r.CheckBreak() - } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5760,13 +5719,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HairpinMode = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5776,13 +5735,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.BabysitDaemons = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5792,13 +5751,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5808,13 +5767,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NvidiaGPUs = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5824,13 +5783,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5840,13 +5799,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5856,13 +5815,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5872,13 +5831,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5888,13 +5847,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5904,13 +5863,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = int64(r.DecodeInt(64)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5920,13 +5879,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5936,13 +5895,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5952,13 +5911,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContentType = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5968,13 +5927,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5984,13 +5943,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6000,13 +5959,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6014,24 +5973,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv711 := &x.OutOfDiskTransitionFrequency - yym712 := z.DecBinary() - _ = yym712 + yyv706 := &x.OutOfDiskTransitionFrequency + yym707 := z.DecBinary() + _ = yym707 if false { - } else if z.HasExtensions() && z.DecExt(yyv711) { - } else if !yym712 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv711) + } else if z.HasExtensions() && z.DecExt(yyv706) { + } else if !yym707 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv706) } else { - z.DecFallback(yyv711, false) + z.DecFallback(yyv706, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6041,13 +6000,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6055,21 +6014,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv714 := &x.NodeLabels - yym715 := z.DecBinary() - _ = yym715 + yyv709 := &x.NodeLabels + yym710 := z.DecBinary() + _ = yym710 if false { } else { - z.F.DecMapStringStringX(yyv714, false, d) + z.F.DecMapStringStringX(yyv709, false, d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6079,13 +6038,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6095,13 +6054,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableCustomMetrics = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6111,13 +6070,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionHard = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6127,13 +6086,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoft = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6143,13 +6102,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoftGracePeriod = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6157,24 +6116,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv721 := &x.EvictionPressureTransitionPeriod - yym722 := z.DecBinary() - _ = yym722 + yyv716 := &x.EvictionPressureTransitionPeriod + yym717 := z.DecBinary() + _ = yym717 if false { - } else if z.HasExtensions() && z.DecExt(yyv721) { - } else if !yym722 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv721) + } else if z.HasExtensions() && z.DecExt(yyv716) { + } else if !yym717 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv716) } else { - z.DecFallback(yyv721, false) + z.DecFallback(yyv716, false) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6184,13 +6143,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMaxPodGracePeriod = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6200,13 +6159,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMinimumReclaim = string(r.DecodeString()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6216,13 +6175,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodsPerCore = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6232,13 +6191,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableControllerAttachDetach = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6246,22 +6205,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv727 := &x.SystemReserved - yym728 := z.DecBinary() - _ = yym728 + yyv722 := &x.SystemReserved + yym723 := z.DecBinary() + _ = yym723 if false { - } else if z.HasExtensions() && z.DecExt(yyv727) { + } else if z.HasExtensions() && z.DecExt(yyv722) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv727), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv722), d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6269,22 +6228,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv729 := &x.KubeReserved - yym730 := z.DecBinary() - _ = yym730 + yyv724 := &x.KubeReserved + yym725 := z.DecBinary() + _ = yym725 if false { - } else if z.HasExtensions() && z.DecExt(yyv729) { + } else if z.HasExtensions() && z.DecExt(yyv724) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv729), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv724), d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6294,13 +6253,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ProtectKernelDefaults = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6310,13 +6269,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MakeIPTablesUtilChains = bool(r.DecodeBool()) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6326,13 +6285,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesMasqueradeBit = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6342,13 +6301,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesDropBit = int32(r.DecodeInt(32)) } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6356,21 +6315,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv735 := &x.AllowedUnsafeSysctls - yym736 := z.DecBinary() - _ = yym736 + yyv730 := &x.AllowedUnsafeSysctls + yym731 := z.DecBinary() + _ = yym731 if false { } else { - z.F.DecSliceStringX(yyv735, false, d) + z.F.DecSliceStringX(yyv730, false, d) } } - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6381,17 +6340,17 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.ExperimentalRuntimeIntegrationType = string(r.DecodeString()) } for { - yyj611++ - if yyhl611 { - yyb611 = yyj611 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb611 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb611 { + if yyb607 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj611-1, "") + z.DecStructFieldNotFound(yyj607-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -6403,36 +6362,36 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym738 := z.EncBinary() - _ = yym738 + yym733 := z.EncBinary() + _ = yym733 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep739 := !z.EncBinary() - yy2arr739 := z.EncBasicHandle().StructToArray - var yyq739 [14]bool - _, _, _ = yysep739, yyq739, yy2arr739 - const yyr739 bool = false - yyq739[0] = x.Kind != "" - yyq739[1] = x.APIVersion != "" - var yynn739 int - if yyr739 || yy2arr739 { + yysep734 := !z.EncBinary() + yy2arr734 := z.EncBasicHandle().StructToArray + var yyq734 [14]bool + _, _, _ = yysep734, yyq734, yy2arr734 + const yyr734 bool = false + yyq734[0] = x.Kind != "" + yyq734[1] = x.APIVersion != "" + var yynn734 int + if yyr734 || yy2arr734 { r.EncodeArrayStart(14) } else { - yynn739 = 12 - for _, b := range yyq739 { + yynn734 = 12 + for _, b := range yyq734 { if b { - yynn739++ + yynn734++ } } - r.EncodeMapStart(yynn739) - yynn739 = 0 + r.EncodeMapStart(yynn734) + yynn734 = 0 } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq739[0] { - yym741 := z.EncBinary() - _ = yym741 + if yyq734[0] { + yym736 := z.EncBinary() + _ = yym736 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -6441,23 +6400,23 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq739[0] { + if yyq734[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym742 := z.EncBinary() - _ = yym742 + yym737 := z.EncBinary() + _ = yym737 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq739[1] { - yym744 := z.EncBinary() - _ = yym744 + if yyq734[1] { + yym739 := z.EncBinary() + _ = yym739 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -6466,22 +6425,22 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq739[1] { + if yyq734[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym745 := z.EncBinary() - _ = yym745 + yym740 := z.EncBinary() + _ = yym740 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym747 := z.EncBinary() - _ = yym747 + yym742 := z.EncBinary() + _ = yym742 if false { } else { r.EncodeInt(int64(x.Port)) @@ -6490,17 +6449,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym748 := z.EncBinary() - _ = yym748 + yym743 := z.EncBinary() + _ = yym743 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym750 := z.EncBinary() - _ = yym750 + yym745 := z.EncBinary() + _ = yym745 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -6509,17 +6468,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym751 := z.EncBinary() - _ = yym751 + yym746 := z.EncBinary() + _ = yym746 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym753 := z.EncBinary() - _ = yym753 + yym748 := z.EncBinary() + _ = yym748 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) @@ -6528,17 +6487,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("algorithmProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym754 := z.EncBinary() - _ = yym754 + yym749 := z.EncBinary() + _ = yym749 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym756 := z.EncBinary() - _ = yym756 + yym751 := z.EncBinary() + _ = yym751 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) @@ -6547,17 +6506,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("policyConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym757 := z.EncBinary() - _ = yym757 + yym752 := z.EncBinary() + _ = yym752 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym759 := z.EncBinary() - _ = yym759 + yym754 := z.EncBinary() + _ = yym754 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -6566,17 +6525,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym760 := z.EncBinary() - _ = yym760 + yym755 := z.EncBinary() + _ = yym755 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym762 := z.EncBinary() - _ = yym762 + yym757 := z.EncBinary() + _ = yym757 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -6585,17 +6544,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym763 := z.EncBinary() - _ = yym763 + yym758 := z.EncBinary() + _ = yym758 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym765 := z.EncBinary() - _ = yym765 + yym760 := z.EncBinary() + _ = yym760 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -6604,17 +6563,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym766 := z.EncBinary() - _ = yym766 + yym761 := z.EncBinary() + _ = yym761 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym768 := z.EncBinary() - _ = yym768 + yym763 := z.EncBinary() + _ = yym763 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -6623,17 +6582,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym769 := z.EncBinary() - _ = yym769 + yym764 := z.EncBinary() + _ = yym764 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym771 := z.EncBinary() - _ = yym771 + yym766 := z.EncBinary() + _ = yym766 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) @@ -6642,17 +6601,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym772 := z.EncBinary() - _ = yym772 + yym767 := z.EncBinary() + _ = yym767 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym774 := z.EncBinary() - _ = yym774 + yym769 := z.EncBinary() + _ = yym769 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) @@ -6661,17 +6620,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hardPodAffinitySymmetricWeight")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym775 := z.EncBinary() - _ = yym775 + yym770 := z.EncBinary() + _ = yym770 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym777 := z.EncBinary() - _ = yym777 + yym772 := z.EncBinary() + _ = yym772 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) @@ -6680,25 +6639,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("failureDomains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym778 := z.EncBinary() - _ = yym778 + yym773 := z.EncBinary() + _ = yym773 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) } } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy780 := &x.LeaderElection - yy780.CodecEncodeSelf(e) + yy775 := &x.LeaderElection + yy775.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy781 := &x.LeaderElection - yy781.CodecEncodeSelf(e) + yy776 := &x.LeaderElection + yy776.CodecEncodeSelf(e) } - if yyr739 || yy2arr739 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -6711,25 +6670,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym782 := z.DecBinary() - _ = yym782 + yym777 := z.DecBinary() + _ = yym777 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct783 := r.ContainerType() - if yyct783 == codecSelferValueTypeMap1234 { - yyl783 := r.ReadMapStart() - if yyl783 == 0 { + yyct778 := r.ContainerType() + if yyct778 == codecSelferValueTypeMap1234 { + yyl778 := r.ReadMapStart() + if yyl778 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl783, d) + x.codecDecodeSelfFromMap(yyl778, d) } - } else if yyct783 == codecSelferValueTypeArray1234 { - yyl783 := r.ReadArrayStart() - if yyl783 == 0 { + } else if yyct778 == codecSelferValueTypeArray1234 { + yyl778 := r.ReadArrayStart() + if yyl778 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl783, d) + x.codecDecodeSelfFromArray(yyl778, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -6741,12 +6700,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys784Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys784Slc - var yyhl784 bool = l >= 0 - for yyj784 := 0; ; yyj784++ { - if yyhl784 { - if yyj784 >= l { + var yys779Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys779Slc + var yyhl779 bool = l >= 0 + for yyj779 := 0; ; yyj779++ { + if yyhl779 { + if yyj779 >= l { break } } else { @@ -6755,10 +6714,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys784Slc = r.DecodeBytes(yys784Slc, true, true) - yys784 := string(yys784Slc) + yys779Slc = r.DecodeBytes(yys779Slc, true, true) + yys779 := string(yys779Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys784 { + switch yys779 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -6841,13 +6800,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv798 := &x.LeaderElection - yyv798.CodecDecodeSelf(d) + yyv793 := &x.LeaderElection + yyv793.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys784) - } // end switch yys784 - } // end for yyj784 + z.DecStructFieldNotFound(-1, yys779) + } // end switch yys779 + } // end for yyj779 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -6855,16 +6814,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj799 int - var yyb799 bool - var yyhl799 bool = l >= 0 - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + var yyj794 int + var yyb794 bool + var yyhl794 bool = l >= 0 + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6874,13 +6833,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6890,13 +6849,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6906,13 +6865,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int32(r.DecodeInt(32)) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6922,13 +6881,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6938,13 +6897,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6954,13 +6913,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6970,13 +6929,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6986,13 +6945,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.ContentType = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7002,13 +6961,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7018,13 +6977,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7034,13 +6993,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7050,13 +7009,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.HardPodAffinitySymmetricWeight = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7066,13 +7025,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.FailureDomains = string(r.DecodeString()) } - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7080,21 +7039,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv813 := &x.LeaderElection - yyv813.CodecDecodeSelf(d) + yyv808 := &x.LeaderElection + yyv808.CodecDecodeSelf(d) } for { - yyj799++ - if yyhl799 { - yyb799 = yyj799 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb799 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb799 { + if yyb794 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj799-1, "") + z.DecStructFieldNotFound(yyj794-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7106,33 +7065,33 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym814 := z.EncBinary() - _ = yym814 + yym809 := z.EncBinary() + _ = yym809 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep815 := !z.EncBinary() - yy2arr815 := z.EncBasicHandle().StructToArray - var yyq815 [4]bool - _, _, _ = yysep815, yyq815, yy2arr815 - const yyr815 bool = false - var yynn815 int - if yyr815 || yy2arr815 { + yysep810 := !z.EncBinary() + yy2arr810 := z.EncBasicHandle().StructToArray + var yyq810 [4]bool + _, _, _ = yysep810, yyq810, yy2arr810 + const yyr810 bool = false + var yynn810 int + if yyr810 || yy2arr810 { r.EncodeArrayStart(4) } else { - yynn815 = 4 - for _, b := range yyq815 { + yynn810 = 4 + for _, b := range yyq810 { if b { - yynn815++ + yynn810++ } } - r.EncodeMapStart(yynn815) - yynn815 = 0 + r.EncodeMapStart(yynn810) + yynn810 = 0 } - if yyr815 || yy2arr815 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym817 := z.EncBinary() - _ = yym817 + yym812 := z.EncBinary() + _ = yym812 if false { } else { r.EncodeBool(bool(x.LeaderElect)) @@ -7141,16 +7100,43 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElect")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym818 := z.EncBinary() - _ = yym818 + yym813 := z.EncBinary() + _ = yym813 if false { } else { r.EncodeBool(bool(x.LeaderElect)) } } - if yyr815 || yy2arr815 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy820 := &x.LeaseDuration + yy815 := &x.LeaseDuration + yym816 := z.EncBinary() + _ = yym816 + if false { + } else if z.HasExtensions() && z.EncExt(yy815) { + } else if !yym816 && z.IsJSONHandle() { + z.EncJSONMarshal(yy815) + } else { + z.EncFallback(yy815) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy817 := &x.LeaseDuration + yym818 := z.EncBinary() + _ = yym818 + if false { + } else if z.HasExtensions() && z.EncExt(yy817) { + } else if !yym818 && z.IsJSONHandle() { + z.EncJSONMarshal(yy817) + } else { + z.EncFallback(yy817) + } + } + if yyr810 || yy2arr810 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy820 := &x.RenewDeadline yym821 := z.EncBinary() _ = yym821 if false { @@ -7162,9 +7148,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) + r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy822 := &x.LeaseDuration + yy822 := &x.RenewDeadline yym823 := z.EncBinary() _ = yym823 if false { @@ -7175,9 +7161,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy822) } } - if yyr815 || yy2arr815 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy825 := &x.RenewDeadline + yy825 := &x.RetryPeriod yym826 := z.EncBinary() _ = yym826 if false { @@ -7189,9 +7175,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) + r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy827 := &x.RenewDeadline + yy827 := &x.RetryPeriod yym828 := z.EncBinary() _ = yym828 if false { @@ -7202,34 +7188,7 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy827) } } - if yyr815 || yy2arr815 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy830 := &x.RetryPeriod - yym831 := z.EncBinary() - _ = yym831 - if false { - } else if z.HasExtensions() && z.EncExt(yy830) { - } else if !yym831 && z.IsJSONHandle() { - z.EncJSONMarshal(yy830) - } else { - z.EncFallback(yy830) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy832 := &x.RetryPeriod - yym833 := z.EncBinary() - _ = yym833 - if false { - } else if z.HasExtensions() && z.EncExt(yy832) { - } else if !yym833 && z.IsJSONHandle() { - z.EncJSONMarshal(yy832) - } else { - z.EncFallback(yy832) - } - } - if yyr815 || yy2arr815 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7242,25 +7201,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym834 := z.DecBinary() - _ = yym834 + yym829 := z.DecBinary() + _ = yym829 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct835 := r.ContainerType() - if yyct835 == codecSelferValueTypeMap1234 { - yyl835 := r.ReadMapStart() - if yyl835 == 0 { + yyct830 := r.ContainerType() + if yyct830 == codecSelferValueTypeMap1234 { + yyl830 := r.ReadMapStart() + if yyl830 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl835, d) + x.codecDecodeSelfFromMap(yyl830, d) } - } else if yyct835 == codecSelferValueTypeArray1234 { - yyl835 := r.ReadArrayStart() - if yyl835 == 0 { + } else if yyct830 == codecSelferValueTypeArray1234 { + yyl830 := r.ReadArrayStart() + if yyl830 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl835, d) + x.codecDecodeSelfFromArray(yyl830, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7272,12 +7231,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys836Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys836Slc - var yyhl836 bool = l >= 0 - for yyj836 := 0; ; yyj836++ { - if yyhl836 { - if yyj836 >= l { + var yys831Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys831Slc + var yyhl831 bool = l >= 0 + for yyj831 := 0; ; yyj831++ { + if yyhl831 { + if yyj831 >= l { break } } else { @@ -7286,10 +7245,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys836Slc = r.DecodeBytes(yys836Slc, true, true) - yys836 := string(yys836Slc) + yys831Slc = r.DecodeBytes(yys831Slc, true, true) + yys831 := string(yys831Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys836 { + switch yys831 { case "leaderElect": if r.TryDecodeAsNil() { x.LeaderElect = false @@ -7300,51 +7259,51 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv838 := &x.LeaseDuration - yym839 := z.DecBinary() - _ = yym839 + yyv833 := &x.LeaseDuration + yym834 := z.DecBinary() + _ = yym834 if false { - } else if z.HasExtensions() && z.DecExt(yyv838) { - } else if !yym839 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv838) + } else if z.HasExtensions() && z.DecExt(yyv833) { + } else if !yym834 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv833) } else { - z.DecFallback(yyv838, false) + z.DecFallback(yyv833, false) } } case "renewDeadline": if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv840 := &x.RenewDeadline - yym841 := z.DecBinary() - _ = yym841 + yyv835 := &x.RenewDeadline + yym836 := z.DecBinary() + _ = yym836 if false { - } else if z.HasExtensions() && z.DecExt(yyv840) { - } else if !yym841 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv840) + } else if z.HasExtensions() && z.DecExt(yyv835) { + } else if !yym836 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv835) } else { - z.DecFallback(yyv840, false) + z.DecFallback(yyv835, false) } } case "retryPeriod": if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv842 := &x.RetryPeriod - yym843 := z.DecBinary() - _ = yym843 + yyv837 := &x.RetryPeriod + yym838 := z.DecBinary() + _ = yym838 if false { - } else if z.HasExtensions() && z.DecExt(yyv842) { - } else if !yym843 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv842) + } else if z.HasExtensions() && z.DecExt(yyv837) { + } else if !yym838 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv837) } else { - z.DecFallback(yyv842, false) + z.DecFallback(yyv837, false) } } default: - z.DecStructFieldNotFound(-1, yys836) - } // end switch yys836 - } // end for yyj836 + z.DecStructFieldNotFound(-1, yys831) + } // end switch yys831 + } // end for yyj831 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7352,16 +7311,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj844 int - var yyb844 bool - var yyhl844 bool = l >= 0 - yyj844++ - if yyhl844 { - yyb844 = yyj844 > l + var yyj839 int + var yyb839 bool + var yyhl839 bool = l >= 0 + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb844 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb844 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7371,13 +7330,13 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } else { x.LeaderElect = bool(r.DecodeBool()) } - yyj844++ - if yyhl844 { - yyb844 = yyj844 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb844 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb844 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7385,24 +7344,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv846 := &x.LeaseDuration - yym847 := z.DecBinary() - _ = yym847 + yyv841 := &x.LeaseDuration + yym842 := z.DecBinary() + _ = yym842 if false { - } else if z.HasExtensions() && z.DecExt(yyv846) { - } else if !yym847 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv846) + } else if z.HasExtensions() && z.DecExt(yyv841) { + } else if !yym842 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv841) } else { - z.DecFallback(yyv846, false) + z.DecFallback(yyv841, false) } } - yyj844++ - if yyhl844 { - yyb844 = yyj844 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb844 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb844 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7410,24 +7369,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv848 := &x.RenewDeadline - yym849 := z.DecBinary() - _ = yym849 + yyv843 := &x.RenewDeadline + yym844 := z.DecBinary() + _ = yym844 if false { - } else if z.HasExtensions() && z.DecExt(yyv848) { - } else if !yym849 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv848) + } else if z.HasExtensions() && z.DecExt(yyv843) { + } else if !yym844 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv843) } else { - z.DecFallback(yyv848, false) + z.DecFallback(yyv843, false) } } - yyj844++ - if yyhl844 { - yyb844 = yyj844 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb844 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb844 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7435,29 +7394,29 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv850 := &x.RetryPeriod - yym851 := z.DecBinary() - _ = yym851 + yyv845 := &x.RetryPeriod + yym846 := z.DecBinary() + _ = yym846 if false { - } else if z.HasExtensions() && z.DecExt(yyv850) { - } else if !yym851 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv850) + } else if z.HasExtensions() && z.DecExt(yyv845) { + } else if !yym846 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv845) } else { - z.DecFallback(yyv850, false) + z.DecFallback(yyv845, false) } } for { - yyj844++ - if yyhl844 { - yyb844 = yyj844 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb844 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb844 { + if yyb839 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj844-1, "") + z.DecStructFieldNotFound(yyj839-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7469,36 +7428,36 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode if x == nil { r.EncodeNil() } else { - yym852 := z.EncBinary() - _ = yym852 + yym847 := z.EncBinary() + _ = yym847 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep853 := !z.EncBinary() - yy2arr853 := z.EncBasicHandle().StructToArray - var yyq853 [60]bool - _, _, _ = yysep853, yyq853, yy2arr853 - const yyr853 bool = false - yyq853[0] = x.Kind != "" - yyq853[1] = x.APIVersion != "" - var yynn853 int - if yyr853 || yy2arr853 { + yysep848 := !z.EncBinary() + yy2arr848 := z.EncBasicHandle().StructToArray + var yyq848 [60]bool + _, _, _ = yysep848, yyq848, yy2arr848 + const yyr848 bool = false + yyq848[0] = x.Kind != "" + yyq848[1] = x.APIVersion != "" + var yynn848 int + if yyr848 || yy2arr848 { r.EncodeArrayStart(60) } else { - yynn853 = 58 - for _, b := range yyq853 { + yynn848 = 58 + for _, b := range yyq848 { if b { - yynn853++ + yynn848++ } } - r.EncodeMapStart(yynn853) - yynn853 = 0 + r.EncodeMapStart(yynn848) + yynn848 = 0 } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq853[0] { - yym855 := z.EncBinary() - _ = yym855 + if yyq848[0] { + yym850 := z.EncBinary() + _ = yym850 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -7507,23 +7466,23 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq853[0] { + if yyq848[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym856 := z.EncBinary() - _ = yym856 + yym851 := z.EncBinary() + _ = yym851 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq853[1] { - yym858 := z.EncBinary() - _ = yym858 + if yyq848[1] { + yym853 := z.EncBinary() + _ = yym853 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -7532,22 +7491,22 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq853[1] { + if yyq848[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym859 := z.EncBinary() - _ = yym859 + yym854 := z.EncBinary() + _ = yym854 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym861 := z.EncBinary() - _ = yym861 + yym856 := z.EncBinary() + _ = yym856 if false { } else { r.EncodeInt(int64(x.Port)) @@ -7556,17 +7515,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym862 := z.EncBinary() - _ = yym862 + yym857 := z.EncBinary() + _ = yym857 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym864 := z.EncBinary() - _ = yym864 + yym859 := z.EncBinary() + _ = yym859 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -7575,17 +7534,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym865 := z.EncBinary() - _ = yym865 + yym860 := z.EncBinary() + _ = yym860 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym867 := z.EncBinary() - _ = yym867 + yym862 := z.EncBinary() + _ = yym862 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -7594,17 +7553,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym868 := z.EncBinary() - _ = yym868 + yym863 := z.EncBinary() + _ = yym863 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym870 := z.EncBinary() - _ = yym870 + yym865 := z.EncBinary() + _ = yym865 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) @@ -7613,17 +7572,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym871 := z.EncBinary() - _ = yym871 + yym866 := z.EncBinary() + _ = yym866 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym873 := z.EncBinary() - _ = yym873 + yym868 := z.EncBinary() + _ = yym868 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) @@ -7632,17 +7591,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentEndpointSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym874 := z.EncBinary() - _ = yym874 + yym869 := z.EncBinary() + _ = yym869 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym876 := z.EncBinary() - _ = yym876 + yym871 := z.EncBinary() + _ = yym871 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) @@ -7651,17 +7610,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRSSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym877 := z.EncBinary() - _ = yym877 + yym872 := z.EncBinary() + _ = yym872 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym879 := z.EncBinary() - _ = yym879 + yym874 := z.EncBinary() + _ = yym874 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) @@ -7670,17 +7629,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym880 := z.EncBinary() - _ = yym880 + yym875 := z.EncBinary() + _ = yym875 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym882 := z.EncBinary() - _ = yym882 + yym877 := z.EncBinary() + _ = yym877 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) @@ -7689,17 +7648,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentServiceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym883 := z.EncBinary() - _ = yym883 + yym878 := z.EncBinary() + _ = yym878 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym885 := z.EncBinary() - _ = yym885 + yym880 := z.EncBinary() + _ = yym880 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) @@ -7708,17 +7667,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentResourceQuotaSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym886 := z.EncBinary() - _ = yym886 + yym881 := z.EncBinary() + _ = yym881 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym888 := z.EncBinary() - _ = yym888 + yym883 := z.EncBinary() + _ = yym883 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) @@ -7727,17 +7686,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDeploymentSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym889 := z.EncBinary() - _ = yym889 + yym884 := z.EncBinary() + _ = yym884 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym891 := z.EncBinary() - _ = yym891 + yym886 := z.EncBinary() + _ = yym886 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) @@ -7746,17 +7705,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDaemonSetSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym892 := z.EncBinary() - _ = yym892 + yym887 := z.EncBinary() + _ = yym887 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym894 := z.EncBinary() - _ = yym894 + yym889 := z.EncBinary() + _ = yym889 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) @@ -7765,17 +7724,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentJobSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym895 := z.EncBinary() - _ = yym895 + yym890 := z.EncBinary() + _ = yym890 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym897 := z.EncBinary() - _ = yym897 + yym892 := z.EncBinary() + _ = yym892 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) @@ -7784,17 +7743,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentNamespaceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym898 := z.EncBinary() - _ = yym898 + yym893 := z.EncBinary() + _ = yym893 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym900 := z.EncBinary() - _ = yym900 + yym895 := z.EncBinary() + _ = yym895 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) @@ -7803,17 +7762,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentSATokenSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym901 := z.EncBinary() - _ = yym901 + yym896 := z.EncBinary() + _ = yym896 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym903 := z.EncBinary() - _ = yym903 + yym898 := z.EncBinary() + _ = yym898 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) @@ -7822,17 +7781,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRC")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym904 := z.EncBinary() - _ = yym904 + yym899 := z.EncBinary() + _ = yym899 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym906 := z.EncBinary() - _ = yym906 + yym901 := z.EncBinary() + _ = yym901 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) @@ -7841,17 +7800,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym907 := z.EncBinary() - _ = yym907 + yym902 := z.EncBinary() + _ = yym902 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym909 := z.EncBinary() - _ = yym909 + yym904 := z.EncBinary() + _ = yym904 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) @@ -7860,16 +7819,43 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForDaemonSet")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym910 := z.EncBinary() - _ = yym910 + yym905 := z.EncBinary() + _ = yym905 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy912 := &x.ServiceSyncPeriod + yy907 := &x.ServiceSyncPeriod + yym908 := z.EncBinary() + _ = yym908 + if false { + } else if z.HasExtensions() && z.EncExt(yy907) { + } else if !yym908 && z.IsJSONHandle() { + z.EncJSONMarshal(yy907) + } else { + z.EncFallback(yy907) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy909 := &x.ServiceSyncPeriod + yym910 := z.EncBinary() + _ = yym910 + if false { + } else if z.HasExtensions() && z.EncExt(yy909) { + } else if !yym910 && z.IsJSONHandle() { + z.EncJSONMarshal(yy909) + } else { + z.EncFallback(yy909) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy912 := &x.NodeSyncPeriod yym913 := z.EncBinary() _ = yym913 if false { @@ -7881,9 +7867,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy914 := &x.ServiceSyncPeriod + yy914 := &x.NodeSyncPeriod yym915 := z.EncBinary() _ = yym915 if false { @@ -7894,9 +7880,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy914) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy917 := &x.NodeSyncPeriod + yy917 := &x.RouteReconciliationPeriod yym918 := z.EncBinary() _ = yym918 if false { @@ -7908,9 +7894,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy919 := &x.NodeSyncPeriod + yy919 := &x.RouteReconciliationPeriod yym920 := z.EncBinary() _ = yym920 if false { @@ -7921,9 +7907,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy919) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy922 := &x.RouteReconciliationPeriod + yy922 := &x.ResourceQuotaSyncPeriod yym923 := z.EncBinary() _ = yym923 if false { @@ -7935,9 +7921,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy924 := &x.RouteReconciliationPeriod + yy924 := &x.ResourceQuotaSyncPeriod yym925 := z.EncBinary() _ = yym925 if false { @@ -7948,9 +7934,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy924) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy927 := &x.ResourceQuotaSyncPeriod + yy927 := &x.NamespaceSyncPeriod yym928 := z.EncBinary() _ = yym928 if false { @@ -7962,9 +7948,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy929 := &x.ResourceQuotaSyncPeriod + yy929 := &x.NamespaceSyncPeriod yym930 := z.EncBinary() _ = yym930 if false { @@ -7975,9 +7961,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy929) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy932 := &x.NamespaceSyncPeriod + yy932 := &x.PVClaimBinderSyncPeriod yym933 := z.EncBinary() _ = yym933 if false { @@ -7989,9 +7975,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy934 := &x.NamespaceSyncPeriod + yy934 := &x.PVClaimBinderSyncPeriod yym935 := z.EncBinary() _ = yym935 if false { @@ -8002,9 +7988,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy934) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy937 := &x.PVClaimBinderSyncPeriod + yy937 := &x.MinResyncPeriod yym938 := z.EncBinary() _ = yym938 if false { @@ -8016,9 +8002,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy939 := &x.PVClaimBinderSyncPeriod + yy939 := &x.MinResyncPeriod yym940 := z.EncBinary() _ = yym940 if false { @@ -8029,37 +8015,10 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy939) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy942 := &x.MinResyncPeriod - yym943 := z.EncBinary() - _ = yym943 - if false { - } else if z.HasExtensions() && z.EncExt(yy942) { - } else if !yym943 && z.IsJSONHandle() { - z.EncJSONMarshal(yy942) - } else { - z.EncFallback(yy942) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy944 := &x.MinResyncPeriod - yym945 := z.EncBinary() - _ = yym945 - if false { - } else if z.HasExtensions() && z.EncExt(yy944) { - } else if !yym945 && z.IsJSONHandle() { - z.EncJSONMarshal(yy944) - } else { - z.EncFallback(yy944) - } - } - if yyr853 || yy2arr853 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym947 := z.EncBinary() - _ = yym947 + yym942 := z.EncBinary() + _ = yym942 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) @@ -8068,16 +8027,43 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("terminatedPodGCThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym948 := z.EncBinary() - _ = yym948 + yym943 := z.EncBinary() + _ = yym943 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy950 := &x.HorizontalPodAutoscalerSyncPeriod + yy945 := &x.HorizontalPodAutoscalerSyncPeriod + yym946 := z.EncBinary() + _ = yym946 + if false { + } else if z.HasExtensions() && z.EncExt(yy945) { + } else if !yym946 && z.IsJSONHandle() { + z.EncJSONMarshal(yy945) + } else { + z.EncFallback(yy945) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy947 := &x.HorizontalPodAutoscalerSyncPeriod + yym948 := z.EncBinary() + _ = yym948 + if false { + } else if z.HasExtensions() && z.EncExt(yy947) { + } else if !yym948 && z.IsJSONHandle() { + z.EncJSONMarshal(yy947) + } else { + z.EncFallback(yy947) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy950 := &x.DeploymentControllerSyncPeriod yym951 := z.EncBinary() _ = yym951 if false { @@ -8089,9 +8075,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy952 := &x.HorizontalPodAutoscalerSyncPeriod + yy952 := &x.DeploymentControllerSyncPeriod yym953 := z.EncBinary() _ = yym953 if false { @@ -8102,9 +8088,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy952) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy955 := &x.DeploymentControllerSyncPeriod + yy955 := &x.PodEvictionTimeout yym956 := z.EncBinary() _ = yym956 if false { @@ -8116,9 +8102,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy957 := &x.DeploymentControllerSyncPeriod + yy957 := &x.PodEvictionTimeout yym958 := z.EncBinary() _ = yym958 if false { @@ -8129,37 +8115,10 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy957) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy960 := &x.PodEvictionTimeout - yym961 := z.EncBinary() - _ = yym961 - if false { - } else if z.HasExtensions() && z.EncExt(yy960) { - } else if !yym961 && z.IsJSONHandle() { - z.EncJSONMarshal(yy960) - } else { - z.EncFallback(yy960) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy962 := &x.PodEvictionTimeout - yym963 := z.EncBinary() - _ = yym963 - if false { - } else if z.HasExtensions() && z.EncExt(yy962) { - } else if !yym963 && z.IsJSONHandle() { - z.EncJSONMarshal(yy962) - } else { - z.EncFallback(yy962) - } - } - if yyr853 || yy2arr853 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym965 := z.EncBinary() - _ = yym965 + yym960 := z.EncBinary() + _ = yym960 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) @@ -8168,17 +8127,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsQps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym966 := z.EncBinary() - _ = yym966 + yym961 := z.EncBinary() + _ = yym961 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym968 := z.EncBinary() - _ = yym968 + yym963 := z.EncBinary() + _ = yym963 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) @@ -8187,44 +8146,44 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym969 := z.EncBinary() - _ = yym969 + yym964 := z.EncBinary() + _ = yym964 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy971 := &x.NodeMonitorGracePeriod - yym972 := z.EncBinary() - _ = yym972 + yy966 := &x.NodeMonitorGracePeriod + yym967 := z.EncBinary() + _ = yym967 if false { - } else if z.HasExtensions() && z.EncExt(yy971) { - } else if !yym972 && z.IsJSONHandle() { - z.EncJSONMarshal(yy971) + } else if z.HasExtensions() && z.EncExt(yy966) { + } else if !yym967 && z.IsJSONHandle() { + z.EncJSONMarshal(yy966) } else { - z.EncFallback(yy971) + z.EncFallback(yy966) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy973 := &x.NodeMonitorGracePeriod - yym974 := z.EncBinary() - _ = yym974 + yy968 := &x.NodeMonitorGracePeriod + yym969 := z.EncBinary() + _ = yym969 if false { - } else if z.HasExtensions() && z.EncExt(yy973) { - } else if !yym974 && z.IsJSONHandle() { - z.EncJSONMarshal(yy973) + } else if z.HasExtensions() && z.EncExt(yy968) { + } else if !yym969 && z.IsJSONHandle() { + z.EncJSONMarshal(yy968) } else { - z.EncFallback(yy973) + z.EncFallback(yy968) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym976 := z.EncBinary() - _ = yym976 + yym971 := z.EncBinary() + _ = yym971 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) @@ -8233,16 +8192,43 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerRetryCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym977 := z.EncBinary() - _ = yym977 + yym972 := z.EncBinary() + _ = yym972 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy979 := &x.NodeStartupGracePeriod + yy974 := &x.NodeStartupGracePeriod + yym975 := z.EncBinary() + _ = yym975 + if false { + } else if z.HasExtensions() && z.EncExt(yy974) { + } else if !yym975 && z.IsJSONHandle() { + z.EncJSONMarshal(yy974) + } else { + z.EncFallback(yy974) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy976 := &x.NodeStartupGracePeriod + yym977 := z.EncBinary() + _ = yym977 + if false { + } else if z.HasExtensions() && z.EncExt(yy976) { + } else if !yym977 && z.IsJSONHandle() { + z.EncJSONMarshal(yy976) + } else { + z.EncFallback(yy976) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy979 := &x.NodeMonitorPeriod yym980 := z.EncBinary() _ = yym980 if false { @@ -8254,9 +8240,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy981 := &x.NodeStartupGracePeriod + yy981 := &x.NodeMonitorPeriod yym982 := z.EncBinary() _ = yym982 if false { @@ -8267,37 +8253,10 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy981) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy984 := &x.NodeMonitorPeriod - yym985 := z.EncBinary() - _ = yym985 - if false { - } else if z.HasExtensions() && z.EncExt(yy984) { - } else if !yym985 && z.IsJSONHandle() { - z.EncJSONMarshal(yy984) - } else { - z.EncFallback(yy984) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy986 := &x.NodeMonitorPeriod - yym987 := z.EncBinary() - _ = yym987 - if false { - } else if z.HasExtensions() && z.EncExt(yy986) { - } else if !yym987 && z.IsJSONHandle() { - z.EncJSONMarshal(yy986) - } else { - z.EncFallback(yy986) - } - } - if yyr853 || yy2arr853 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym989 := z.EncBinary() - _ = yym989 + yym984 := z.EncBinary() + _ = yym984 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) @@ -8306,17 +8265,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceAccountKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym990 := z.EncBinary() - _ = yym990 + yym985 := z.EncBinary() + _ = yym985 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym992 := z.EncBinary() - _ = yym992 + yym987 := z.EncBinary() + _ = yym987 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) @@ -8325,17 +8284,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym993 := z.EncBinary() - _ = yym993 + yym988 := z.EncBinary() + _ = yym988 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym995 := z.EncBinary() - _ = yym995 + yym990 := z.EncBinary() + _ = yym990 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) @@ -8344,17 +8303,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym996 := z.EncBinary() - _ = yym996 + yym991 := z.EncBinary() + _ = yym991 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym998 := z.EncBinary() - _ = yym998 + yym993 := z.EncBinary() + _ = yym993 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) @@ -8363,17 +8322,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("approveAllKubeletCSRsForGroup")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym999 := z.EncBinary() - _ = yym999 + yym994 := z.EncBinary() + _ = yym994 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1001 := z.EncBinary() - _ = yym1001 + yym996 := z.EncBinary() + _ = yym996 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -8382,17 +8341,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1002 := z.EncBinary() - _ = yym1002 + yym997 := z.EncBinary() + _ = yym997 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1004 := z.EncBinary() - _ = yym1004 + yym999 := z.EncBinary() + _ = yym999 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) @@ -8401,17 +8360,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1005 := z.EncBinary() - _ = yym1005 + yym1000 := z.EncBinary() + _ = yym1000 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1007 := z.EncBinary() - _ = yym1007 + yym1002 := z.EncBinary() + _ = yym1002 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) @@ -8420,17 +8379,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1008 := z.EncBinary() - _ = yym1008 + yym1003 := z.EncBinary() + _ = yym1003 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1010 := z.EncBinary() - _ = yym1010 + yym1005 := z.EncBinary() + _ = yym1005 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) @@ -8439,17 +8398,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1011 := z.EncBinary() - _ = yym1011 + yym1006 := z.EncBinary() + _ = yym1006 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1013 := z.EncBinary() - _ = yym1013 + yym1008 := z.EncBinary() + _ = yym1008 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) @@ -8458,17 +8417,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeCIDRMaskSize")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1014 := z.EncBinary() - _ = yym1014 + yym1009 := z.EncBinary() + _ = yym1009 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1016 := z.EncBinary() - _ = yym1016 + yym1011 := z.EncBinary() + _ = yym1011 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) @@ -8477,17 +8436,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allocateNodeCIDRs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1017 := z.EncBinary() - _ = yym1017 + yym1012 := z.EncBinary() + _ = yym1012 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1019 := z.EncBinary() - _ = yym1019 + yym1014 := z.EncBinary() + _ = yym1014 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) @@ -8496,17 +8455,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCloudRoutes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1020 := z.EncBinary() - _ = yym1020 + yym1015 := z.EncBinary() + _ = yym1015 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1022 := z.EncBinary() - _ = yym1022 + yym1017 := z.EncBinary() + _ = yym1017 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) @@ -8515,17 +8474,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootCAFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1023 := z.EncBinary() - _ = yym1023 + yym1018 := z.EncBinary() + _ = yym1018 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1025 := z.EncBinary() - _ = yym1025 + yym1020 := z.EncBinary() + _ = yym1020 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -8534,17 +8493,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1026 := z.EncBinary() - _ = yym1026 + yym1021 := z.EncBinary() + _ = yym1021 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1028 := z.EncBinary() - _ = yym1028 + yym1023 := z.EncBinary() + _ = yym1023 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -8553,17 +8512,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1029 := z.EncBinary() - _ = yym1029 + yym1024 := z.EncBinary() + _ = yym1024 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1031 := z.EncBinary() - _ = yym1031 + yym1026 := z.EncBinary() + _ = yym1026 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -8572,66 +8531,66 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1032 := z.EncBinary() - _ = yym1032 + yym1027 := z.EncBinary() + _ = yym1027 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1034 := &x.LeaderElection - yy1034.CodecEncodeSelf(e) + yy1029 := &x.LeaderElection + yy1029.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1035 := &x.LeaderElection - yy1035.CodecEncodeSelf(e) + yy1030 := &x.LeaderElection + yy1030.CodecEncodeSelf(e) } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1037 := &x.VolumeConfiguration - yy1037.CodecEncodeSelf(e) + yy1032 := &x.VolumeConfiguration + yy1032.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1038 := &x.VolumeConfiguration - yy1038.CodecEncodeSelf(e) + yy1033 := &x.VolumeConfiguration + yy1033.CodecEncodeSelf(e) } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1040 := &x.ControllerStartInterval - yym1041 := z.EncBinary() - _ = yym1041 + yy1035 := &x.ControllerStartInterval + yym1036 := z.EncBinary() + _ = yym1036 if false { - } else if z.HasExtensions() && z.EncExt(yy1040) { - } else if !yym1041 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1040) + } else if z.HasExtensions() && z.EncExt(yy1035) { + } else if !yym1036 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1035) } else { - z.EncFallback(yy1040) + z.EncFallback(yy1035) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controllerStartInterval")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1042 := &x.ControllerStartInterval - yym1043 := z.EncBinary() - _ = yym1043 + yy1037 := &x.ControllerStartInterval + yym1038 := z.EncBinary() + _ = yym1038 if false { - } else if z.HasExtensions() && z.EncExt(yy1042) { - } else if !yym1043 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1042) + } else if z.HasExtensions() && z.EncExt(yy1037) { + } else if !yym1038 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1037) } else { - z.EncFallback(yy1042) + z.EncFallback(yy1037) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1045 := z.EncBinary() - _ = yym1045 + yym1040 := z.EncBinary() + _ = yym1040 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) @@ -8640,17 +8599,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableGarbageCollector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1046 := z.EncBinary() - _ = yym1046 + yym1041 := z.EncBinary() + _ = yym1041 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1048 := z.EncBinary() - _ = yym1048 + yym1043 := z.EncBinary() + _ = yym1043 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) @@ -8659,17 +8618,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentGCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1049 := z.EncBinary() - _ = yym1049 + yym1044 := z.EncBinary() + _ = yym1044 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1051 := z.EncBinary() - _ = yym1051 + yym1046 := z.EncBinary() + _ = yym1046 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) @@ -8678,17 +8637,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1052 := z.EncBinary() - _ = yym1052 + yym1047 := z.EncBinary() + _ = yym1047 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1054 := z.EncBinary() - _ = yym1054 + yym1049 := z.EncBinary() + _ = yym1049 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) @@ -8697,17 +8656,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("secondaryNodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1055 := z.EncBinary() - _ = yym1055 + yym1050 := z.EncBinary() + _ = yym1050 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1057 := z.EncBinary() - _ = yym1057 + yym1052 := z.EncBinary() + _ = yym1052 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) @@ -8716,17 +8675,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("largeClusterSizeThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1058 := z.EncBinary() - _ = yym1058 + yym1053 := z.EncBinary() + _ = yym1053 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1060 := z.EncBinary() - _ = yym1060 + yym1055 := z.EncBinary() + _ = yym1055 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) @@ -8735,14 +8694,14 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("unhealthyZoneThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1061 := z.EncBinary() - _ = yym1061 + yym1056 := z.EncBinary() + _ = yym1056 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) } } - if yyr853 || yy2arr853 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -8755,25 +8714,25 @@ func (x *KubeControllerManagerConfiguration) CodecDecodeSelf(d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1062 := z.DecBinary() - _ = yym1062 + yym1057 := z.DecBinary() + _ = yym1057 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1063 := r.ContainerType() - if yyct1063 == codecSelferValueTypeMap1234 { - yyl1063 := r.ReadMapStart() - if yyl1063 == 0 { + yyct1058 := r.ContainerType() + if yyct1058 == codecSelferValueTypeMap1234 { + yyl1058 := r.ReadMapStart() + if yyl1058 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1063, d) + x.codecDecodeSelfFromMap(yyl1058, d) } - } else if yyct1063 == codecSelferValueTypeArray1234 { - yyl1063 := r.ReadArrayStart() - if yyl1063 == 0 { + } else if yyct1058 == codecSelferValueTypeArray1234 { + yyl1058 := r.ReadArrayStart() + if yyl1058 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1063, d) + x.codecDecodeSelfFromArray(yyl1058, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8785,12 +8744,12 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1064Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1064Slc - var yyhl1064 bool = l >= 0 - for yyj1064 := 0; ; yyj1064++ { - if yyhl1064 { - if yyj1064 >= l { + var yys1059Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1059Slc + var yyhl1059 bool = l >= 0 + for yyj1059 := 0; ; yyj1059++ { + if yyhl1059 { + if yyj1059 >= l { break } } else { @@ -8799,10 +8758,10 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1064Slc = r.DecodeBytes(yys1064Slc, true, true) - yys1064 := string(yys1064Slc) + yys1059Slc = r.DecodeBytes(yys1059Slc, true, true) + yys1059 := string(yys1059Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1064 { + switch yys1059 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -8921,105 +8880,105 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1084 := &x.ServiceSyncPeriod - yym1085 := z.DecBinary() - _ = yym1085 + yyv1079 := &x.ServiceSyncPeriod + yym1080 := z.DecBinary() + _ = yym1080 if false { - } else if z.HasExtensions() && z.DecExt(yyv1084) { - } else if !yym1085 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1084) + } else if z.HasExtensions() && z.DecExt(yyv1079) { + } else if !yym1080 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1079) } else { - z.DecFallback(yyv1084, false) + z.DecFallback(yyv1079, false) } } case "nodeSyncPeriod": if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1086 := &x.NodeSyncPeriod - yym1087 := z.DecBinary() - _ = yym1087 + yyv1081 := &x.NodeSyncPeriod + yym1082 := z.DecBinary() + _ = yym1082 if false { - } else if z.HasExtensions() && z.DecExt(yyv1086) { - } else if !yym1087 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1086) + } else if z.HasExtensions() && z.DecExt(yyv1081) { + } else if !yym1082 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1081) } else { - z.DecFallback(yyv1086, false) + z.DecFallback(yyv1081, false) } } case "routeReconciliationPeriod": if r.TryDecodeAsNil() { x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} } else { - yyv1088 := &x.RouteReconciliationPeriod - yym1089 := z.DecBinary() - _ = yym1089 + yyv1083 := &x.RouteReconciliationPeriod + yym1084 := z.DecBinary() + _ = yym1084 if false { - } else if z.HasExtensions() && z.DecExt(yyv1088) { - } else if !yym1089 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1088) + } else if z.HasExtensions() && z.DecExt(yyv1083) { + } else if !yym1084 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1083) } else { - z.DecFallback(yyv1088, false) + z.DecFallback(yyv1083, false) } } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1090 := &x.ResourceQuotaSyncPeriod - yym1091 := z.DecBinary() - _ = yym1091 + yyv1085 := &x.ResourceQuotaSyncPeriod + yym1086 := z.DecBinary() + _ = yym1086 if false { - } else if z.HasExtensions() && z.DecExt(yyv1090) { - } else if !yym1091 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1090) + } else if z.HasExtensions() && z.DecExt(yyv1085) { + } else if !yym1086 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1085) } else { - z.DecFallback(yyv1090, false) + z.DecFallback(yyv1085, false) } } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1092 := &x.NamespaceSyncPeriod - yym1093 := z.DecBinary() - _ = yym1093 + yyv1087 := &x.NamespaceSyncPeriod + yym1088 := z.DecBinary() + _ = yym1088 if false { - } else if z.HasExtensions() && z.DecExt(yyv1092) { - } else if !yym1093 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1092) + } else if z.HasExtensions() && z.DecExt(yyv1087) { + } else if !yym1088 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1087) } else { - z.DecFallback(yyv1092, false) + z.DecFallback(yyv1087, false) } } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1094 := &x.PVClaimBinderSyncPeriod - yym1095 := z.DecBinary() - _ = yym1095 + yyv1089 := &x.PVClaimBinderSyncPeriod + yym1090 := z.DecBinary() + _ = yym1090 if false { - } else if z.HasExtensions() && z.DecExt(yyv1094) { - } else if !yym1095 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1094) + } else if z.HasExtensions() && z.DecExt(yyv1089) { + } else if !yym1090 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1089) } else { - z.DecFallback(yyv1094, false) + z.DecFallback(yyv1089, false) } } case "minResyncPeriod": if r.TryDecodeAsNil() { x.MinResyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1096 := &x.MinResyncPeriod - yym1097 := z.DecBinary() - _ = yym1097 + yyv1091 := &x.MinResyncPeriod + yym1092 := z.DecBinary() + _ = yym1092 if false { - } else if z.HasExtensions() && z.DecExt(yyv1096) { - } else if !yym1097 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1096) + } else if z.HasExtensions() && z.DecExt(yyv1091) { + } else if !yym1092 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1091) } else { - z.DecFallback(yyv1096, false) + z.DecFallback(yyv1091, false) } } case "terminatedPodGCThreshold": @@ -9032,45 +8991,45 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1099 := &x.HorizontalPodAutoscalerSyncPeriod - yym1100 := z.DecBinary() - _ = yym1100 + yyv1094 := &x.HorizontalPodAutoscalerSyncPeriod + yym1095 := z.DecBinary() + _ = yym1095 if false { - } else if z.HasExtensions() && z.DecExt(yyv1099) { - } else if !yym1100 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1099) + } else if z.HasExtensions() && z.DecExt(yyv1094) { + } else if !yym1095 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1094) } else { - z.DecFallback(yyv1099, false) + z.DecFallback(yyv1094, false) } } case "deploymentControllerSyncPeriod": if r.TryDecodeAsNil() { x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1101 := &x.DeploymentControllerSyncPeriod - yym1102 := z.DecBinary() - _ = yym1102 + yyv1096 := &x.DeploymentControllerSyncPeriod + yym1097 := z.DecBinary() + _ = yym1097 if false { - } else if z.HasExtensions() && z.DecExt(yyv1101) { - } else if !yym1102 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1101) + } else if z.HasExtensions() && z.DecExt(yyv1096) { + } else if !yym1097 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1096) } else { - z.DecFallback(yyv1101, false) + z.DecFallback(yyv1096, false) } } case "podEvictionTimeout": if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1103 := &x.PodEvictionTimeout - yym1104 := z.DecBinary() - _ = yym1104 + yyv1098 := &x.PodEvictionTimeout + yym1099 := z.DecBinary() + _ = yym1099 if false { - } else if z.HasExtensions() && z.DecExt(yyv1103) { - } else if !yym1104 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1103) + } else if z.HasExtensions() && z.DecExt(yyv1098) { + } else if !yym1099 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1098) } else { - z.DecFallback(yyv1103, false) + z.DecFallback(yyv1098, false) } } case "deletingPodsQps": @@ -9089,15 +9048,15 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1107 := &x.NodeMonitorGracePeriod - yym1108 := z.DecBinary() - _ = yym1108 + yyv1102 := &x.NodeMonitorGracePeriod + yym1103 := z.DecBinary() + _ = yym1103 if false { - } else if z.HasExtensions() && z.DecExt(yyv1107) { - } else if !yym1108 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1107) + } else if z.HasExtensions() && z.DecExt(yyv1102) { + } else if !yym1103 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1102) } else { - z.DecFallback(yyv1107, false) + z.DecFallback(yyv1102, false) } } case "registerRetryCount": @@ -9110,30 +9069,30 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1110 := &x.NodeStartupGracePeriod - yym1111 := z.DecBinary() - _ = yym1111 + yyv1105 := &x.NodeStartupGracePeriod + yym1106 := z.DecBinary() + _ = yym1106 if false { - } else if z.HasExtensions() && z.DecExt(yyv1110) { - } else if !yym1111 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1110) + } else if z.HasExtensions() && z.DecExt(yyv1105) { + } else if !yym1106 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1105) } else { - z.DecFallback(yyv1110, false) + z.DecFallback(yyv1105, false) } } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { x.NodeMonitorPeriod = pkg1_unversioned.Duration{} } else { - yyv1112 := &x.NodeMonitorPeriod - yym1113 := z.DecBinary() - _ = yym1113 + yyv1107 := &x.NodeMonitorPeriod + yym1108 := z.DecBinary() + _ = yym1108 if false { - } else if z.HasExtensions() && z.DecExt(yyv1112) { - } else if !yym1113 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1112) + } else if z.HasExtensions() && z.DecExt(yyv1107) { + } else if !yym1108 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1107) } else { - z.DecFallback(yyv1112, false) + z.DecFallback(yyv1107, false) } } case "serviceAccountKeyFile": @@ -9230,29 +9189,29 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1129 := &x.LeaderElection - yyv1129.CodecDecodeSelf(d) + yyv1124 := &x.LeaderElection + yyv1124.CodecDecodeSelf(d) } case "volumeConfiguration": if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1130 := &x.VolumeConfiguration - yyv1130.CodecDecodeSelf(d) + yyv1125 := &x.VolumeConfiguration + yyv1125.CodecDecodeSelf(d) } case "controllerStartInterval": if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1131 := &x.ControllerStartInterval - yym1132 := z.DecBinary() - _ = yym1132 + yyv1126 := &x.ControllerStartInterval + yym1127 := z.DecBinary() + _ = yym1127 if false { - } else if z.HasExtensions() && z.DecExt(yyv1131) { - } else if !yym1132 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1131) + } else if z.HasExtensions() && z.DecExt(yyv1126) { + } else if !yym1127 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1126) } else { - z.DecFallback(yyv1131, false) + z.DecFallback(yyv1126, false) } } case "enableGarbageCollector": @@ -9292,9 +9251,9 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } default: - z.DecStructFieldNotFound(-1, yys1064) - } // end switch yys1064 - } // end for yyj1064 + z.DecStructFieldNotFound(-1, yys1059) + } // end switch yys1059 + } // end for yyj1059 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -9302,16 +9261,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1139 int - var yyb1139 bool - var yyhl1139 bool = l >= 0 - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + var yyj1134 int + var yyb1134 bool + var yyhl1134 bool = l >= 0 + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9321,13 +9280,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Kind = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9337,13 +9296,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.APIVersion = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9353,13 +9312,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Port = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9369,13 +9328,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Address = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9385,13 +9344,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudProvider = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9401,13 +9360,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9417,13 +9376,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentEndpointSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9433,13 +9392,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRSSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9449,13 +9408,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRCSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9465,13 +9424,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentServiceSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9481,13 +9440,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentResourceQuotaSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9497,13 +9456,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDeploymentSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9513,13 +9472,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDaemonSetSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9529,13 +9488,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentJobSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9545,13 +9504,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentNamespaceSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9561,13 +9520,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentSATokenSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9577,13 +9536,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRC = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9593,13 +9552,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRS = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9609,13 +9568,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForDaemonSet = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9623,24 +9582,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1159 := &x.ServiceSyncPeriod - yym1160 := z.DecBinary() - _ = yym1160 + yyv1154 := &x.ServiceSyncPeriod + yym1155 := z.DecBinary() + _ = yym1155 if false { - } else if z.HasExtensions() && z.DecExt(yyv1159) { - } else if !yym1160 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1159) + } else if z.HasExtensions() && z.DecExt(yyv1154) { + } else if !yym1155 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1154) } else { - z.DecFallback(yyv1159, false) + z.DecFallback(yyv1154, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9648,24 +9607,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1161 := &x.NodeSyncPeriod - yym1162 := z.DecBinary() - _ = yym1162 + yyv1156 := &x.NodeSyncPeriod + yym1157 := z.DecBinary() + _ = yym1157 if false { - } else if z.HasExtensions() && z.DecExt(yyv1161) { - } else if !yym1162 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1161) + } else if z.HasExtensions() && z.DecExt(yyv1156) { + } else if !yym1157 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1156) } else { - z.DecFallback(yyv1161, false) + z.DecFallback(yyv1156, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9673,24 +9632,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} } else { - yyv1163 := &x.RouteReconciliationPeriod - yym1164 := z.DecBinary() - _ = yym1164 + yyv1158 := &x.RouteReconciliationPeriod + yym1159 := z.DecBinary() + _ = yym1159 if false { - } else if z.HasExtensions() && z.DecExt(yyv1163) { - } else if !yym1164 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1163) + } else if z.HasExtensions() && z.DecExt(yyv1158) { + } else if !yym1159 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1158) } else { - z.DecFallback(yyv1163, false) + z.DecFallback(yyv1158, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9698,24 +9657,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1165 := &x.ResourceQuotaSyncPeriod - yym1166 := z.DecBinary() - _ = yym1166 + yyv1160 := &x.ResourceQuotaSyncPeriod + yym1161 := z.DecBinary() + _ = yym1161 if false { - } else if z.HasExtensions() && z.DecExt(yyv1165) { - } else if !yym1166 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1165) + } else if z.HasExtensions() && z.DecExt(yyv1160) { + } else if !yym1161 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1160) } else { - z.DecFallback(yyv1165, false) + z.DecFallback(yyv1160, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9723,24 +9682,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1167 := &x.NamespaceSyncPeriod - yym1168 := z.DecBinary() - _ = yym1168 + yyv1162 := &x.NamespaceSyncPeriod + yym1163 := z.DecBinary() + _ = yym1163 if false { - } else if z.HasExtensions() && z.DecExt(yyv1167) { - } else if !yym1168 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1167) + } else if z.HasExtensions() && z.DecExt(yyv1162) { + } else if !yym1163 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1162) } else { - z.DecFallback(yyv1167, false) + z.DecFallback(yyv1162, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9748,7 +9707,73 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1169 := &x.PVClaimBinderSyncPeriod + yyv1164 := &x.PVClaimBinderSyncPeriod + yym1165 := z.DecBinary() + _ = yym1165 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1164) { + } else if !yym1165 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1164) + } else { + z.DecFallback(yyv1164, false) + } + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.MinResyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1166 := &x.MinResyncPeriod + yym1167 := z.DecBinary() + _ = yym1167 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1166) { + } else if !yym1167 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1166) + } else { + z.DecFallback(yyv1166, false) + } + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.TerminatedPodGCThreshold = 0 + } else { + x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1169 := &x.HorizontalPodAutoscalerSyncPeriod yym1170 := z.DecBinary() _ = yym1170 if false { @@ -9759,21 +9784,21 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1169, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} + x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1171 := &x.MinResyncPeriod + yyv1171 := &x.DeploymentControllerSyncPeriod yym1172 := z.DecBinary() _ = yym1172 if false { @@ -9784,79 +9809,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1171, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.TerminatedPodGCThreshold = 0 - } else { - x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1174 := &x.HorizontalPodAutoscalerSyncPeriod - yym1175 := z.DecBinary() - _ = yym1175 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1174) { - } else if !yym1175 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1174) - } else { - z.DecFallback(yyv1174, false) - } - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1176 := &x.DeploymentControllerSyncPeriod - yym1177 := z.DecBinary() - _ = yym1177 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1176) { - } else if !yym1177 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1176) - } else { - z.DecFallback(yyv1176, false) - } - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9864,24 +9823,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1178 := &x.PodEvictionTimeout - yym1179 := z.DecBinary() - _ = yym1179 + yyv1173 := &x.PodEvictionTimeout + yym1174 := z.DecBinary() + _ = yym1174 if false { - } else if z.HasExtensions() && z.DecExt(yyv1178) { - } else if !yym1179 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1178) + } else if z.HasExtensions() && z.DecExt(yyv1173) { + } else if !yym1174 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1173) } else { - z.DecFallback(yyv1178, false) + z.DecFallback(yyv1173, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9891,13 +9850,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsQps = float32(r.DecodeFloat(true)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9907,13 +9866,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsBurst = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9921,7 +9880,73 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1182 := &x.NodeMonitorGracePeriod + yyv1177 := &x.NodeMonitorGracePeriod + yym1178 := z.DecBinary() + _ = yym1178 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1177) { + } else if !yym1178 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1177) + } else { + z.DecFallback(yyv1177, false) + } + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.RegisterRetryCount = 0 + } else { + x.RegisterRetryCount = int32(r.DecodeInt(32)) + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + } else { + yyv1180 := &x.NodeStartupGracePeriod + yym1181 := z.DecBinary() + _ = yym1181 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1180) { + } else if !yym1181 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1180) + } else { + z.DecFallback(yyv1180, false) + } + } + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l + } else { + yyb1134 = r.CheckBreak() + } + if yyb1134 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + } else { + yyv1182 := &x.NodeMonitorPeriod yym1183 := z.DecBinary() _ = yym1183 if false { @@ -9932,79 +9957,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1182, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.RegisterRetryCount = 0 - } else { - x.RegisterRetryCount = int32(r.DecodeInt(32)) - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} - } else { - yyv1185 := &x.NodeStartupGracePeriod - yym1186 := z.DecBinary() - _ = yym1186 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1185) { - } else if !yym1186 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1185) - } else { - z.DecFallback(yyv1185, false) - } - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} - } else { - yyv1187 := &x.NodeMonitorPeriod - yym1188 := z.DecBinary() - _ = yym1188 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1187) { - } else if !yym1188 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1187) - } else { - z.DecFallback(yyv1187, false) - } - } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l - } else { - yyb1139 = r.CheckBreak() - } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10014,13 +9973,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceAccountKeyFile = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10030,13 +9989,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningCertFile = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10046,13 +10005,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningKeyFile = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10062,13 +10021,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ApproveAllKubeletCSRsForGroup = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10078,13 +10037,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10094,13 +10053,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterName = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10110,13 +10069,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterCIDR = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10126,13 +10085,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceCIDR = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10142,13 +10101,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeCIDRMaskSize = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10158,13 +10117,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.AllocateNodeCIDRs = bool(r.DecodeBool()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10174,13 +10133,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConfigureCloudRoutes = bool(r.DecodeBool()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10190,13 +10149,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.RootCAFile = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10206,13 +10165,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ContentType = string(r.DecodeString()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10222,13 +10181,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10238,13 +10197,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10252,16 +10211,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1204 := &x.LeaderElection - yyv1204.CodecDecodeSelf(d) + yyv1199 := &x.LeaderElection + yyv1199.CodecDecodeSelf(d) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10269,16 +10228,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1205 := &x.VolumeConfiguration - yyv1205.CodecDecodeSelf(d) + yyv1200 := &x.VolumeConfiguration + yyv1200.CodecDecodeSelf(d) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10286,24 +10245,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1206 := &x.ControllerStartInterval - yym1207 := z.DecBinary() - _ = yym1207 + yyv1201 := &x.ControllerStartInterval + yym1202 := z.DecBinary() + _ = yym1202 if false { - } else if z.HasExtensions() && z.DecExt(yyv1206) { - } else if !yym1207 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1206) + } else if z.HasExtensions() && z.DecExt(yyv1201) { + } else if !yym1202 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1201) } else { - z.DecFallback(yyv1206, false) + z.DecFallback(yyv1201, false) } } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10313,13 +10272,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableGarbageCollector = bool(r.DecodeBool()) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10329,13 +10288,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentGCSyncs = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10345,13 +10304,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10361,13 +10320,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.SecondaryNodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10377,13 +10336,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LargeClusterSizeThreshold = int32(r.DecodeInt(32)) } - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10394,17 +10353,17 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } for { - yyj1139++ - if yyhl1139 { - yyb1139 = yyj1139 > l + yyj1134++ + if yyhl1134 { + yyb1134 = yyj1134 > l } else { - yyb1139 = r.CheckBreak() + yyb1134 = r.CheckBreak() } - if yyb1139 { + if yyb1134 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1139-1, "") + z.DecStructFieldNotFound(yyj1134-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -10416,33 +10375,33 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1214 := z.EncBinary() - _ = yym1214 + yym1209 := z.EncBinary() + _ = yym1209 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1215 := !z.EncBinary() - yy2arr1215 := z.EncBasicHandle().StructToArray - var yyq1215 [4]bool - _, _, _ = yysep1215, yyq1215, yy2arr1215 - const yyr1215 bool = false - var yynn1215 int - if yyr1215 || yy2arr1215 { + yysep1210 := !z.EncBinary() + yy2arr1210 := z.EncBasicHandle().StructToArray + var yyq1210 [4]bool + _, _, _ = yysep1210, yyq1210, yy2arr1210 + const yyr1210 bool = false + var yynn1210 int + if yyr1210 || yy2arr1210 { r.EncodeArrayStart(4) } else { - yynn1215 = 4 - for _, b := range yyq1215 { + yynn1210 = 4 + for _, b := range yyq1210 { if b { - yynn1215++ + yynn1210++ } } - r.EncodeMapStart(yynn1215) - yynn1215 = 0 + r.EncodeMapStart(yynn1210) + yynn1210 = 0 } - if yyr1215 || yy2arr1215 { + if yyr1210 || yy2arr1210 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1217 := z.EncBinary() - _ = yym1217 + yym1212 := z.EncBinary() + _ = yym1212 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) @@ -10451,17 +10410,17 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableHostPathProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1218 := z.EncBinary() - _ = yym1218 + yym1213 := z.EncBinary() + _ = yym1213 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) } } - if yyr1215 || yy2arr1215 { + if yyr1210 || yy2arr1210 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1220 := z.EncBinary() - _ = yym1220 + yym1215 := z.EncBinary() + _ = yym1215 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) @@ -10470,28 +10429,28 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDynamicProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1221 := z.EncBinary() - _ = yym1221 + yym1216 := z.EncBinary() + _ = yym1216 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) } } - if yyr1215 || yy2arr1215 { + if yyr1210 || yy2arr1210 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1223 := &x.PersistentVolumeRecyclerConfiguration - yy1223.CodecEncodeSelf(e) + yy1218 := &x.PersistentVolumeRecyclerConfiguration + yy1218.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("persitentVolumeRecyclerConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1224 := &x.PersistentVolumeRecyclerConfiguration - yy1224.CodecEncodeSelf(e) + yy1219 := &x.PersistentVolumeRecyclerConfiguration + yy1219.CodecEncodeSelf(e) } - if yyr1215 || yy2arr1215 { + if yyr1210 || yy2arr1210 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1226 := z.EncBinary() - _ = yym1226 + yym1221 := z.EncBinary() + _ = yym1221 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) @@ -10500,14 +10459,14 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("flexVolumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1227 := z.EncBinary() - _ = yym1227 + yym1222 := z.EncBinary() + _ = yym1222 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) } } - if yyr1215 || yy2arr1215 { + if yyr1210 || yy2arr1210 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10520,25 +10479,25 @@ func (x *VolumeConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1228 := z.DecBinary() - _ = yym1228 + yym1223 := z.DecBinary() + _ = yym1223 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1229 := r.ContainerType() - if yyct1229 == codecSelferValueTypeMap1234 { - yyl1229 := r.ReadMapStart() - if yyl1229 == 0 { + yyct1224 := r.ContainerType() + if yyct1224 == codecSelferValueTypeMap1234 { + yyl1224 := r.ReadMapStart() + if yyl1224 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1229, d) + x.codecDecodeSelfFromMap(yyl1224, d) } - } else if yyct1229 == codecSelferValueTypeArray1234 { - yyl1229 := r.ReadArrayStart() - if yyl1229 == 0 { + } else if yyct1224 == codecSelferValueTypeArray1234 { + yyl1224 := r.ReadArrayStart() + if yyl1224 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1229, d) + x.codecDecodeSelfFromArray(yyl1224, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10550,12 +10509,12 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1230Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1230Slc - var yyhl1230 bool = l >= 0 - for yyj1230 := 0; ; yyj1230++ { - if yyhl1230 { - if yyj1230 >= l { + var yys1225Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1225Slc + var yyhl1225 bool = l >= 0 + for yyj1225 := 0; ; yyj1225++ { + if yyhl1225 { + if yyj1225 >= l { break } } else { @@ -10564,10 +10523,10 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1230Slc = r.DecodeBytes(yys1230Slc, true, true) - yys1230 := string(yys1230Slc) + yys1225Slc = r.DecodeBytes(yys1225Slc, true, true) + yys1225 := string(yys1225Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1230 { + switch yys1225 { case "enableHostPathProvisioning": if r.TryDecodeAsNil() { x.EnableHostPathProvisioning = false @@ -10584,8 +10543,8 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1233 := &x.PersistentVolumeRecyclerConfiguration - yyv1233.CodecDecodeSelf(d) + yyv1228 := &x.PersistentVolumeRecyclerConfiguration + yyv1228.CodecDecodeSelf(d) } case "flexVolumePluginDir": if r.TryDecodeAsNil() { @@ -10594,9 +10553,9 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.FlexVolumePluginDir = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys1230) - } // end switch yys1230 - } // end for yyj1230 + z.DecStructFieldNotFound(-1, yys1225) + } // end switch yys1225 + } // end for yyj1225 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10604,16 +10563,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1235 int - var yyb1235 bool - var yyhl1235 bool = l >= 0 - yyj1235++ - if yyhl1235 { - yyb1235 = yyj1235 > l + var yyj1230 int + var yyb1230 bool + var yyhl1230 bool = l >= 0 + yyj1230++ + if yyhl1230 { + yyb1230 = yyj1230 > l } else { - yyb1235 = r.CheckBreak() + yyb1230 = r.CheckBreak() } - if yyb1235 { + if yyb1230 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10623,13 +10582,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableHostPathProvisioning = bool(r.DecodeBool()) } - yyj1235++ - if yyhl1235 { - yyb1235 = yyj1235 > l + yyj1230++ + if yyhl1230 { + yyb1230 = yyj1230 > l } else { - yyb1235 = r.CheckBreak() + yyb1230 = r.CheckBreak() } - if yyb1235 { + if yyb1230 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10639,13 +10598,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableDynamicProvisioning = bool(r.DecodeBool()) } - yyj1235++ - if yyhl1235 { - yyb1235 = yyj1235 > l + yyj1230++ + if yyhl1230 { + yyb1230 = yyj1230 > l } else { - yyb1235 = r.CheckBreak() + yyb1230 = r.CheckBreak() } - if yyb1235 { + if yyb1230 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10653,16 +10612,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1238 := &x.PersistentVolumeRecyclerConfiguration - yyv1238.CodecDecodeSelf(d) + yyv1233 := &x.PersistentVolumeRecyclerConfiguration + yyv1233.CodecDecodeSelf(d) } - yyj1235++ - if yyhl1235 { - yyb1235 = yyj1235 > l + yyj1230++ + if yyhl1230 { + yyb1230 = yyj1230 > l } else { - yyb1235 = r.CheckBreak() + yyb1230 = r.CheckBreak() } - if yyb1235 { + if yyb1230 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10673,17 +10632,17 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.FlexVolumePluginDir = string(r.DecodeString()) } for { - yyj1235++ - if yyhl1235 { - yyb1235 = yyj1235 > l + yyj1230++ + if yyhl1230 { + yyb1230 = yyj1230 > l } else { - yyb1235 = r.CheckBreak() + yyb1230 = r.CheckBreak() } - if yyb1235 { + if yyb1230 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1235-1, "") + z.DecStructFieldNotFound(yyj1230-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -10695,33 +10654,33 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc if x == nil { r.EncodeNil() } else { - yym1240 := z.EncBinary() - _ = yym1240 + yym1235 := z.EncBinary() + _ = yym1235 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1241 := !z.EncBinary() - yy2arr1241 := z.EncBasicHandle().StructToArray - var yyq1241 [7]bool - _, _, _ = yysep1241, yyq1241, yy2arr1241 - const yyr1241 bool = false - var yynn1241 int - if yyr1241 || yy2arr1241 { + yysep1236 := !z.EncBinary() + yy2arr1236 := z.EncBasicHandle().StructToArray + var yyq1236 [7]bool + _, _, _ = yysep1236, yyq1236, yy2arr1236 + const yyr1236 bool = false + var yynn1236 int + if yyr1236 || yy2arr1236 { r.EncodeArrayStart(7) } else { - yynn1241 = 7 - for _, b := range yyq1241 { + yynn1236 = 7 + for _, b := range yyq1236 { if b { - yynn1241++ + yynn1236++ } } - r.EncodeMapStart(yynn1241) - yynn1241 = 0 + r.EncodeMapStart(yynn1236) + yynn1236 = 0 } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1243 := z.EncBinary() - _ = yym1243 + yym1238 := z.EncBinary() + _ = yym1238 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) @@ -10730,17 +10689,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maximumRetry")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1244 := z.EncBinary() - _ = yym1244 + yym1239 := z.EncBinary() + _ = yym1239 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1246 := z.EncBinary() - _ = yym1246 + yym1241 := z.EncBinary() + _ = yym1241 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) @@ -10749,17 +10708,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1247 := z.EncBinary() - _ = yym1247 + yym1242 := z.EncBinary() + _ = yym1242 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1249 := z.EncBinary() - _ = yym1249 + yym1244 := z.EncBinary() + _ = yym1244 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) @@ -10768,17 +10727,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1250 := z.EncBinary() - _ = yym1250 + yym1245 := z.EncBinary() + _ = yym1245 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1252 := z.EncBinary() - _ = yym1252 + yym1247 := z.EncBinary() + _ = yym1247 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) @@ -10787,17 +10746,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1253 := z.EncBinary() - _ = yym1253 + yym1248 := z.EncBinary() + _ = yym1248 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1255 := z.EncBinary() - _ = yym1255 + yym1250 := z.EncBinary() + _ = yym1250 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) @@ -10806,17 +10765,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1256 := z.EncBinary() - _ = yym1256 + yym1251 := z.EncBinary() + _ = yym1251 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1258 := z.EncBinary() - _ = yym1258 + yym1253 := z.EncBinary() + _ = yym1253 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) @@ -10825,17 +10784,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1259 := z.EncBinary() - _ = yym1259 + yym1254 := z.EncBinary() + _ = yym1254 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1261 := z.EncBinary() - _ = yym1261 + yym1256 := z.EncBinary() + _ = yym1256 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) @@ -10844,14 +10803,14 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1262 := z.EncBinary() - _ = yym1262 + yym1257 := z.EncBinary() + _ = yym1257 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) } } - if yyr1241 || yy2arr1241 { + if yyr1236 || yy2arr1236 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10864,25 +10823,25 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecDecodeSelf(d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1263 := z.DecBinary() - _ = yym1263 + yym1258 := z.DecBinary() + _ = yym1258 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1264 := r.ContainerType() - if yyct1264 == codecSelferValueTypeMap1234 { - yyl1264 := r.ReadMapStart() - if yyl1264 == 0 { + yyct1259 := r.ContainerType() + if yyct1259 == codecSelferValueTypeMap1234 { + yyl1259 := r.ReadMapStart() + if yyl1259 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1264, d) + x.codecDecodeSelfFromMap(yyl1259, d) } - } else if yyct1264 == codecSelferValueTypeArray1234 { - yyl1264 := r.ReadArrayStart() - if yyl1264 == 0 { + } else if yyct1259 == codecSelferValueTypeArray1234 { + yyl1259 := r.ReadArrayStart() + if yyl1259 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1264, d) + x.codecDecodeSelfFromArray(yyl1259, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10894,12 +10853,12 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1265Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1265Slc - var yyhl1265 bool = l >= 0 - for yyj1265 := 0; ; yyj1265++ { - if yyhl1265 { - if yyj1265 >= l { + var yys1260Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1260Slc + var yyhl1260 bool = l >= 0 + for yyj1260 := 0; ; yyj1260++ { + if yyhl1260 { + if yyj1260 >= l { break } } else { @@ -10908,10 +10867,10 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1265Slc = r.DecodeBytes(yys1265Slc, true, true) - yys1265 := string(yys1265Slc) + yys1260Slc = r.DecodeBytes(yys1260Slc, true, true) + yys1260 := string(yys1260Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1265 { + switch yys1260 { case "maximumRetry": if r.TryDecodeAsNil() { x.MaximumRetry = 0 @@ -10955,9 +10914,9 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } default: - z.DecStructFieldNotFound(-1, yys1265) - } // end switch yys1265 - } // end for yyj1265 + z.DecStructFieldNotFound(-1, yys1260) + } // end switch yys1260 + } // end for yyj1260 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10965,16 +10924,16 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1273 int - var yyb1273 bool - var yyhl1273 bool = l >= 0 - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + var yyj1268 int + var yyb1268 bool + var yyhl1268 bool = l >= 0 + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10984,13 +10943,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MaximumRetry = int32(r.DecodeInt(32)) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11000,13 +10959,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11016,13 +10975,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathNFS = string(r.DecodeString()) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11032,13 +10991,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.IncrementTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11048,13 +11007,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathHostPath = string(r.DecodeString()) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11064,13 +11023,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutHostPath = int32(r.DecodeInt(32)) } - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11081,17 +11040,17 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } for { - yyj1273++ - if yyhl1273 { - yyb1273 = yyj1273 > l + yyj1268++ + if yyhl1268 { + yyb1268 = yyj1268 > l } else { - yyb1273 = r.CheckBreak() + yyb1268 = r.CheckBreak() } - if yyb1273 { + if yyb1268 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1273-1, "") + z.DecStructFieldNotFound(yyj1268-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -11101,20 +11060,20 @@ func (x codecSelfer1234) encconfig_ConfigurationMap(v pkg2_config.ConfigurationM z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk1281, yyv1281 := range v { + for yyk1276, yyv1276 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym1282 := z.EncBinary() - _ = yym1282 + yym1277 := z.EncBinary() + _ = yym1277 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk1281)) + r.EncodeString(codecSelferC_UTF81234, string(yyk1276)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1283 := z.EncBinary() - _ = yym1283 + yym1278 := z.EncBinary() + _ = yym1278 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyv1281)) + r.EncodeString(codecSelferC_UTF81234, string(yyv1276)) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -11125,63 +11084,63 @@ func (x codecSelfer1234) decconfig_ConfigurationMap(v *pkg2_config.Configuration z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1284 := *v - yyl1284 := r.ReadMapStart() - yybh1284 := z.DecBasicHandle() - if yyv1284 == nil { - yyrl1284, _ := z.DecInferLen(yyl1284, yybh1284.MaxInitLen, 32) - yyv1284 = make(map[string]string, yyrl1284) - *v = yyv1284 + yyv1279 := *v + yyl1279 := r.ReadMapStart() + yybh1279 := z.DecBasicHandle() + if yyv1279 == nil { + yyrl1279, _ := z.DecInferLen(yyl1279, yybh1279.MaxInitLen, 32) + yyv1279 = make(map[string]string, yyrl1279) + *v = yyv1279 } - var yymk1284 string - var yymv1284 string - var yymg1284 bool - if yybh1284.MapValueReset { + var yymk1279 string + var yymv1279 string + var yymg1279 bool + if yybh1279.MapValueReset { } - if yyl1284 > 0 { - for yyj1284 := 0; yyj1284 < yyl1284; yyj1284++ { + if yyl1279 > 0 { + for yyj1279 := 0; yyj1279 < yyl1279; yyj1279++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1284 = "" + yymk1279 = "" } else { - yymk1284 = string(r.DecodeString()) + yymk1279 = string(r.DecodeString()) } - if yymg1284 { - yymv1284 = yyv1284[yymk1284] + if yymg1279 { + yymv1279 = yyv1279[yymk1279] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1284 = "" + yymv1279 = "" } else { - yymv1284 = string(r.DecodeString()) + yymv1279 = string(r.DecodeString()) } - if yyv1284 != nil { - yyv1284[yymk1284] = yymv1284 + if yyv1279 != nil { + yyv1279[yymk1279] = yymv1279 } } - } else if yyl1284 < 0 { - for yyj1284 := 0; !r.CheckBreak(); yyj1284++ { + } else if yyl1279 < 0 { + for yyj1279 := 0; !r.CheckBreak(); yyj1279++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1284 = "" + yymk1279 = "" } else { - yymk1284 = string(r.DecodeString()) + yymk1279 = string(r.DecodeString()) } - if yymg1284 { - yymv1284 = yyv1284[yymk1284] + if yymg1279 { + yymv1279 = yyv1279[yymk1279] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1284 = "" + yymv1279 = "" } else { - yymv1284 = string(r.DecodeString()) + yymv1279 = string(r.DecodeString()) } - if yyv1284 != nil { - yyv1284[yymk1284] = yymv1284 + if yyv1279 != nil { + yyv1279[yymk1279] = yymv1279 } } } // else len==0: TODO: Should we clear map entries? diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index 83fd27ac89..8b49db752c 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -329,18 +329,14 @@ type KubeletConfiguration struct { // This will cause the kubelet to listen to inotify events on the lock file, // releasing it and exiting when another process tries to open that file. ExitOnLockContention bool `json:"exitOnLockContention"` - // configureCBR0 enables the kublet to configure cbr0 based on - // Node.Spec.PodCIDR. - ConfigureCBR0 bool `json:"configureCbr0"` // How should the kubelet configure the container bridge for hairpin packets. // Setting this flag allows endpoints in a Service to loadbalance back to // themselves if they should try to access their own Service. Values: // "promiscuous-bridge": make the container bridge promiscuous. // "hairpin-veth": set the hairpin flag on container veth interfaces. // "none": do nothing. - // Setting --configure-cbr0 to false implies that to achieve hairpin NAT - // one must set --hairpin-mode=veth-flag, because bridge assumes the - // existence of a container bridge named cbr0. + // Generally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT, + // because promiscous-bridge assumes the existence of a container bridge named cbr0. HairpinMode string `json:"hairpinMode"` // The node has babysitter process monitoring docker and kubelet. BabysitDaemons bool `json:"babysitDaemons"` @@ -366,10 +362,10 @@ type KubeletConfiguration struct { // maxOpenFiles is Number of files that can be opened by Kubelet process. MaxOpenFiles int64 `json:"maxOpenFiles"` // reconcileCIDR is Reconcile node CIDR with the CIDR specified by the - // API server. No-op if register-node or configure-cbr0 is false. + // API server. Won't have any effect if register-node is false. ReconcileCIDR bool `json:"reconcileCIDR"` // registerSchedulable tells the kubelet to register the node as - // schedulable. No-op if register-node is false. + // schedulable. Won't have any effect if register-node is false. RegisterSchedulable bool `json:"registerSchedulable"` // contentType is contentType of requests sent to apiserver. ContentType string `json:"contentType"` diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 48525b2fb6..d09de9cea8 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -162,9 +162,6 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { if obj.CertDirectory == "" { obj.CertDirectory = "/var/run/kubernetes" } - if obj.ConfigureCBR0 == nil { - obj.ConfigureCBR0 = boolVar(false) - } if obj.CgroupsPerQOS == nil { obj.CgroupsPerQOS = boolVar(false) } diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index c2353de6f5..89b3c47307 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -374,18 +374,14 @@ type KubeletConfiguration struct { // This will cause the kubelet to listen to inotify events on the lock file, // releasing it and exiting when another process tries to open that file. ExitOnLockContention bool `json:"exitOnLockContention"` - // configureCBR0 enables the kublet to configure cbr0 based on - // Node.Spec.PodCIDR. - ConfigureCBR0 *bool `json:"configureCbr0"` // How should the kubelet configure the container bridge for hairpin packets. // Setting this flag allows endpoints in a Service to loadbalance back to // themselves if they should try to access their own Service. Values: // "promiscuous-bridge": make the container bridge promiscuous. // "hairpin-veth": set the hairpin flag on container veth interfaces. // "none": do nothing. - // Setting --configure-cbr0 to false implies that to achieve hairpin NAT - // one must set --hairpin-mode=veth-flag, because bridge assumes the - // existence of a container bridge named cbr0. + // Generally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT, + // because promiscous-bridge assumes the existence of a container bridge named cbr0. HairpinMode string `json:"hairpinMode"` // The node has babysitter process monitoring docker and kubelet. BabysitDaemons bool `json:"babysitDaemons"` @@ -411,10 +407,10 @@ type KubeletConfiguration struct { // maxOpenFiles is Number of files that can be opened by Kubelet process. MaxOpenFiles int64 `json:"maxOpenFiles"` // reconcileCIDR is Reconcile node CIDR with the CIDR specified by the - // API server. No-op if register-node or configure-cbr0 is false. + // API server. Won't have any effect if register-node is false. ReconcileCIDR *bool `json:"reconcileCIDR"` // registerSchedulable tells the kubelet to register the node as - // schedulable. No-op if register-node is false. + // schedulable. Won't have any effect if register-node is false. RegisterSchedulable *bool `json:"registerSchedulable"` // contentType is contentType of requests sent to apiserver. ContentType string `json:"contentType"` diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go index be154db3ac..a390229089 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go @@ -257,9 +257,6 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu return err } out.ExitOnLockContention = in.ExitOnLockContention - if err := api.Convert_Pointer_bool_To_bool(&in.ConfigureCBR0, &out.ConfigureCBR0, s); err != nil { - return err - } out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods @@ -438,9 +435,6 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu return err } out.ExitOnLockContention = in.ExitOnLockContention - if err := api.Convert_bool_To_Pointer_bool(&in.ConfigureCBR0, &out.ConfigureCBR0, s); err != nil { - return err - } out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods diff --git a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go index 091f175cb7..48e927f17e 100644 --- a/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go @@ -273,13 +273,6 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c * out.LockFilePath = nil } out.ExitOnLockContention = in.ExitOnLockContention - if in.ConfigureCBR0 != nil { - in, out := &in.ConfigureCBR0, &out.ConfigureCBR0 - *out = new(bool) - **out = **in - } else { - out.ConfigureCBR0 = nil - } out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods diff --git a/pkg/apis/componentconfig/zz_generated.deepcopy.go b/pkg/apis/componentconfig/zz_generated.deepcopy.go index 083696fc9b..793d77ce30 100644 --- a/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ b/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -281,7 +281,6 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface out.RktStage1Image = in.RktStage1Image out.LockFilePath = in.LockFilePath out.ExitOnLockContention = in.ExitOnLockContention - out.ConfigureCBR0 = in.ConfigureCBR0 out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 6db9295d70..0f30425055 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -2596,16 +2596,9 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Format: "", }, }, - "configureCbr0": { - SchemaProps: spec.SchemaProps{ - Description: "configureCBR0 enables the kublet to configure cbr0 based on Node.Spec.PodCIDR.", - Type: []string{"boolean"}, - Format: "", - }, - }, "hairpinMode": { SchemaProps: spec.SchemaProps{ - Description: "How should the kubelet configure the container bridge for hairpin packets. Setting this flag allows endpoints in a Service to loadbalance back to themselves if they should try to access their own Service. Values:\n \"promiscuous-bridge\": make the container bridge promiscuous.\n \"hairpin-veth\": set the hairpin flag on container veth interfaces.\n \"none\": do nothing.\nSetting --configure-cbr0 to false implies that to achieve hairpin NAT one must set --hairpin-mode=veth-flag, because bridge assumes the existence of a container bridge named cbr0.", + Description: "How should the kubelet configure the container bridge for hairpin packets. Setting this flag allows endpoints in a Service to loadbalance back to themselves if they should try to access their own Service. Values:\n \"promiscuous-bridge\": make the container bridge promiscuous.\n \"hairpin-veth\": set the hairpin flag on container veth interfaces.\n \"none\": do nothing.\nGenerally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT, because promiscous-bridge assumes the existence of a container bridge named cbr0.", Type: []string{"string"}, Format: "", }, @@ -2675,14 +2668,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, "reconcileCIDR": { SchemaProps: spec.SchemaProps{ - Description: "reconcileCIDR is Reconcile node CIDR with the CIDR specified by the API server. No-op if register-node or configure-cbr0 is false.", + Description: "reconcileCIDR is Reconcile node CIDR with the CIDR specified by the API server. Won't have any effect if register-node is false.", Type: []string{"boolean"}, Format: "", }, }, "registerSchedulable": { SchemaProps: spec.SchemaProps{ - Description: "registerSchedulable tells the kubelet to register the node as schedulable. No-op if register-node is false.", + Description: "registerSchedulable tells the kubelet to register the node as schedulable. Won't have any effect if register-node is false.", Type: []string{"boolean"}, Format: "", }, @@ -2889,7 +2882,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginMTU", "networkPluginDir", "cniConfDir", "cniBinDir", "volumePluginDir", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "lockFilePath", "exitOnLockContention", "configureCbr0", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit"}, + Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginMTU", "networkPluginDir", "cniConfDir", "cniBinDir", "volumePluginDir", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit"}, }, }, Dependencies: []string{ @@ -14202,16 +14195,9 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Format: "", }, }, - "configureCbr0": { - SchemaProps: spec.SchemaProps{ - Description: "configureCBR0 enables the kublet to configure cbr0 based on Node.Spec.PodCIDR.", - Type: []string{"boolean"}, - Format: "", - }, - }, "hairpinMode": { SchemaProps: spec.SchemaProps{ - Description: "How should the kubelet configure the container bridge for hairpin packets. Setting this flag allows endpoints in a Service to loadbalance back to themselves if they should try to access their own Service. Values:\n \"promiscuous-bridge\": make the container bridge promiscuous.\n \"hairpin-veth\": set the hairpin flag on container veth interfaces.\n \"none\": do nothing.\nSetting --configure-cbr0 to false implies that to achieve hairpin NAT one must set --hairpin-mode=veth-flag, because bridge assumes the existence of a container bridge named cbr0.", + Description: "How should the kubelet configure the container bridge for hairpin packets. Setting this flag allows endpoints in a Service to loadbalance back to themselves if they should try to access their own Service. Values:\n \"promiscuous-bridge\": make the container bridge promiscuous.\n \"hairpin-veth\": set the hairpin flag on container veth interfaces.\n \"none\": do nothing.\nGenerally, one must set --hairpin-mode=veth-flag to achieve hairpin NAT, because promiscous-bridge assumes the existence of a container bridge named cbr0.", Type: []string{"string"}, Format: "", }, @@ -14281,14 +14267,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, "reconcileCIDR": { SchemaProps: spec.SchemaProps{ - Description: "reconcileCIDR is Reconcile node CIDR with the CIDR specified by the API server. No-op if register-node or configure-cbr0 is false.", + Description: "reconcileCIDR is Reconcile node CIDR with the CIDR specified by the API server. Won't have any effect if register-node is false.", Type: []string{"boolean"}, Format: "", }, }, "registerSchedulable": { SchemaProps: spec.SchemaProps{ - Description: "registerSchedulable tells the kubelet to register the node as schedulable. No-op if register-node is false.", + Description: "registerSchedulable tells the kubelet to register the node as schedulable. Won't have any effect if register-node is false.", Type: []string{"boolean"}, Format: "", }, @@ -14495,7 +14481,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginDir", "cniConfDir", "cniBinDir", "networkPluginMTU", "volumePluginDir", "cloudProvider", "cloudConfigFile", "kubeletCgroups", "runtimeCgroups", "systemCgroups", "cgroupRoot", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "runtimeRequestTimeout", "rktPath", "rktAPIEndpoint", "rktStage1Image", "lockFilePath", "exitOnLockContention", "configureCbr0", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "outOfDiskTransitionFrequency", "nodeIP", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "evictionHard", "evictionSoft", "evictionSoftGracePeriod", "evictionPressureTransitionPeriod", "evictionMaxPodGracePeriod", "evictionMinimumReclaim", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit"}, + Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginDir", "cniConfDir", "cniBinDir", "networkPluginMTU", "volumePluginDir", "cloudProvider", "cloudConfigFile", "kubeletCgroups", "runtimeCgroups", "systemCgroups", "cgroupRoot", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "runtimeRequestTimeout", "rktPath", "rktAPIEndpoint", "rktStage1Image", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "outOfDiskTransitionFrequency", "nodeIP", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "evictionHard", "evictionSoft", "evictionSoftGracePeriod", "evictionPressureTransitionPeriod", "evictionMaxPodGracePeriod", "evictionMinimumReclaim", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit"}, }, }, Dependencies: []string{ diff --git a/pkg/kubelet/container_bridge.go b/pkg/kubelet/container_bridge.go deleted file mode 100644 index dc5259979c..0000000000 --- a/pkg/kubelet/container_bridge.go +++ /dev/null @@ -1,160 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package kubelet - -import ( - "bytes" - "fmt" - "net" - "os" - "os/exec" - "regexp" - - "github.com/golang/glog" - "k8s.io/kubernetes/pkg/util" - "k8s.io/kubernetes/pkg/util/iptables" - "k8s.io/kubernetes/pkg/util/procfs" - "syscall" -) - -var cidrRegexp = regexp.MustCompile(`inet ([0-9a-fA-F.:]*/[0-9]*)`) - -func createCBR0(wantCIDR *net.IPNet, babysitDaemons bool) error { - // recreate cbr0 with wantCIDR - if err := exec.Command("brctl", "addbr", "cbr0").Run(); err != nil { - glog.Error(err) - return err - } - if err := exec.Command("ip", "addr", "add", wantCIDR.String(), "dev", "cbr0").Run(); err != nil { - glog.Error(err) - return err - } - if err := exec.Command("ip", "link", "set", "dev", "cbr0", "mtu", "1460", "up").Run(); err != nil { - glog.Error(err) - return err - } - // Stop docker so that babysitter process can restart it again with proper configurations and - // checkpoint file (https://github.com/docker/docker/issues/18283). It is safe to kill docker - // process here since CIDR can be changed only once for a given node object, and node is marked - // as NotReady until the docker daemon is restarted with the newly configured custom bridge. - // TODO (dawnchen): Remove this once corrupted checkpoint issue is fixed. - // - // For now just log the error. The containerRuntime check will catch docker failures. - // TODO (dawnchen) figure out what we should do for rkt here. - if babysitDaemons { - if err := procfs.PKill("docker", syscall.SIGKILL); err != nil { - glog.Error(err) - } - } else if util.UsingSystemdInitSystem() { - if err := exec.Command("systemctl", "restart", "docker").Run(); err != nil { - glog.Error(err) - } - } else { - if err := exec.Command("service", "docker", "restart").Run(); err != nil { - glog.Error(err) - } - } - glog.V(2).Info("Recreated cbr0 and restarted docker") - return nil -} - -func ensureCbr0(wantCIDR *net.IPNet, promiscuous, babysitDaemons bool) error { - exists, err := cbr0Exists() - if err != nil { - return err - } - if !exists { - glog.V(2).Infof("CBR0 doesn't exist, attempting to create it with range: %s", wantCIDR) - return createCBR0(wantCIDR, babysitDaemons) - } - if !cbr0CidrCorrect(wantCIDR) { - glog.V(2).Infof("Attempting to recreate cbr0 with address range: %s", wantCIDR) - - // delete cbr0 - if err := exec.Command("ip", "link", "set", "dev", "cbr0", "down").Run(); err != nil { - glog.Error(err) - return err - } - if err := exec.Command("brctl", "delbr", "cbr0").Run(); err != nil { - glog.Error(err) - return err - } - if err := createCBR0(wantCIDR, babysitDaemons); err != nil { - glog.Error(err) - return err - } - } - // Put the container bridge into promiscuous mode to force it to accept hairpin packets. - // TODO: Remove this once the kernel bug (#20096) is fixed. - if promiscuous { - // Checking if the bridge is in promiscuous mode is as expensive and more brittle than - // simply setting the flag every time. - if err := exec.Command("ip", "link", "set", "cbr0", "promisc", "on").Run(); err != nil { - glog.Error(err) - return err - } - } - return nil -} - -// Check if cbr0 network interface is configured or not, and take action -// when the configuration is missing on the node, and propagate the rest -// error to kubelet to handle. -func cbr0Exists() (bool, error) { - if _, err := os.Stat("/sys/class/net/cbr0"); err != nil { - if os.IsNotExist(err) { - return false, nil - } - return false, err - } - return true, nil -} - -func cbr0CidrCorrect(wantCIDR *net.IPNet) bool { - output, err := exec.Command("ip", "addr", "show", "cbr0").Output() - if err != nil { - return false - } - match := cidrRegexp.FindSubmatch(output) - if len(match) < 2 { - return false - } - cbr0IP, cbr0CIDR, err := net.ParseCIDR(string(match[1])) - if err != nil { - glog.Errorf("Couldn't parse CIDR: %q", match[1]) - return false - } - cbr0CIDR.IP = cbr0IP - - glog.V(5).Infof("Want cbr0 CIDR: %s, have cbr0 CIDR: %s", wantCIDR, cbr0CIDR) - return wantCIDR.IP.Equal(cbr0IP) && bytes.Equal(wantCIDR.Mask, cbr0CIDR.Mask) -} - -// nonMasqueradeCIDR is the CIDR for our internal IP range; traffic to IPs -// outside this range will use IP masquerade. -func ensureIPTablesMasqRule(client iptables.Interface, nonMasqueradeCIDR string) error { - if _, err := client.EnsureRule(iptables.Append, iptables.TableNAT, - iptables.ChainPostrouting, - "-m", "comment", "--comment", "kubelet: SNAT outbound cluster traffic", - "-m", "addrtype", "!", "--dst-type", "LOCAL", - "!", "-d", nonMasqueradeCIDR, - "-j", "MASQUERADE"); err != nil { - return fmt.Errorf("Failed to ensure masquerading for %s chain %s: %v", - iptables.TableNAT, iptables.ChainPostrouting, err) - } - return nil -} diff --git a/pkg/kubelet/container_bridge_test.go b/pkg/kubelet/container_bridge_test.go deleted file mode 100644 index b7af6d89cc..0000000000 --- a/pkg/kubelet/container_bridge_test.go +++ /dev/null @@ -1,154 +0,0 @@ -/* -Copyright 2014 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package kubelet - -import ( - "testing" - - "k8s.io/kubernetes/pkg/util/dbus" - "k8s.io/kubernetes/pkg/util/exec" - "k8s.io/kubernetes/pkg/util/iptables" - "k8s.io/kubernetes/pkg/util/sets" -) - -func TestEnsureIPTablesMasqRuleNew(t *testing.T) { - fcmd := exec.FakeCmd{ - CombinedOutputScript: []exec.FakeCombinedOutputAction{ - // iptables version check - func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, - // Status 1 on the first call. - func() ([]byte, error) { return nil, &exec.FakeExitError{Status: 1} }, - // Success on the second call. - func() ([]byte, error) { return []byte{}, nil }, - }, - } - fexec := exec.FakeExec{ - CommandScript: []exec.FakeCommandAction{ - // iptables version check - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - // The second Command() call is checking the rule. Failure of that means create it. - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - }, - } - runner := iptables.New(&fexec, dbus.NewFake(nil, nil), iptables.ProtocolIpv4) - defer runner.Destroy() - err := ensureIPTablesMasqRule(runner, "127.0.0.0/8") - if err != nil { - t.Errorf("expected success, got %v", err) - } - if fcmd.CombinedOutputCalls != 3 { - t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) - } - if !sets.NewString(fcmd.CombinedOutputLog[2]...).HasAll("iptables", "-t", "nat", "-A", "POSTROUTING", - "-m", "comment", "--comment", "kubelet: SNAT outbound cluster traffic", - "!", "-d", "127.0.0.0/8", "-j", "MASQUERADE") { - t.Errorf("wrong CombinedOutput() log, got %#v", fcmd.CombinedOutputLog[2]) - } -} - -func TestEnsureIPTablesMasqRuleAlreadyExists(t *testing.T) { - fcmd := exec.FakeCmd{ - CombinedOutputScript: []exec.FakeCombinedOutputAction{ - // iptables version check - func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, - // Success. - func() ([]byte, error) { return []byte{}, nil }, - }, - } - fexec := exec.FakeExec{ - CommandScript: []exec.FakeCommandAction{ - // iptables version check - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - // The second Command() call is checking the rule. Success of that exec means "done". - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - }, - } - runner := iptables.New(&fexec, dbus.NewFake(nil, nil), iptables.ProtocolIpv4) - defer runner.Destroy() - err := ensureIPTablesMasqRule(runner, "127.0.0.0/8") - if err != nil { - t.Errorf("expected success, got %v", err) - } - if fcmd.CombinedOutputCalls != 2 { - t.Errorf("expected 2 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) - } - if !sets.NewString(fcmd.CombinedOutputLog[1]...).HasAll("iptables", "-t", "nat", "-C", "POSTROUTING", - "-m", "comment", "--comment", "kubelet: SNAT outbound cluster traffic", - "!", "-d", "127.0.0.0/8", "-j", "MASQUERADE") { - t.Errorf("wrong CombinedOutput() log, got %#v", fcmd.CombinedOutputLog[1]) - } -} - -func TestEnsureIPTablesMasqRuleErrorChecking(t *testing.T) { - fcmd := exec.FakeCmd{ - CombinedOutputScript: []exec.FakeCombinedOutputAction{ - // iptables version check - func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, - // Status 2 on the first call. - func() ([]byte, error) { return nil, &exec.FakeExitError{Status: 2} }, - }, - } - fexec := exec.FakeExec{ - CommandScript: []exec.FakeCommandAction{ - // iptables version check - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - // The second Command() call is checking the rule. Failure of that means create it. - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - }, - } - runner := iptables.New(&fexec, dbus.NewFake(nil, nil), iptables.ProtocolIpv4) - defer runner.Destroy() - err := ensureIPTablesMasqRule(runner, "127.0.0.0/8") - if err == nil { - t.Errorf("expected failure") - } - if fcmd.CombinedOutputCalls != 2 { - t.Errorf("expected 2 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) - } -} - -func TestEnsureIPTablesMasqRuleErrorCreating(t *testing.T) { - fcmd := exec.FakeCmd{ - CombinedOutputScript: []exec.FakeCombinedOutputAction{ - // iptables version check - func() ([]byte, error) { return []byte("iptables v1.9.22"), nil }, - // Status 1 on the first call. - func() ([]byte, error) { return nil, &exec.FakeExitError{Status: 1} }, - // Status 1 on the second call. - func() ([]byte, error) { return nil, &exec.FakeExitError{Status: 1} }, - }, - } - fexec := exec.FakeExec{ - CommandScript: []exec.FakeCommandAction{ - // iptables version check - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - // The second Command() call is checking the rule. Failure of that means create it. - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - func(cmd string, args ...string) exec.Cmd { return exec.InitFakeCmd(&fcmd, cmd, args...) }, - }, - } - runner := iptables.New(&fexec, dbus.NewFake(nil, nil), iptables.ProtocolIpv4) - defer runner.Destroy() - err := ensureIPTablesMasqRule(runner, "127.0.0.0/8") - if err == nil { - t.Errorf("expected failure") - } - if fcmd.CombinedOutputCalls != 3 { - t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) - } -} diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 5691c12a26..fc39c303f8 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -389,13 +389,6 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub oomWatcher := NewOOMWatcher(kubeDeps.CAdvisorInterface, kubeDeps.Recorder) - // TODO(mtaufen): remove when internal cbr0 implementation gets removed in favor - // of the kubenet network plugin - var myConfigureCBR0 bool = kubeCfg.ConfigureCBR0 - if kubeCfg.NetworkPluginName == "kubenet" { - myConfigureCBR0 = false - } - klet := &Kubelet{ hostname: hostname, nodeName: nodeName, @@ -430,7 +423,6 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub cgroupRoot: kubeCfg.CgroupRoot, mounter: kubeDeps.Mounter, writer: kubeDeps.Writer, - configureCBR0: myConfigureCBR0, nonMasqueradeCIDR: kubeCfg.NonMasqueradeCIDR, reconcileCIDR: kubeCfg.ReconcileCIDR, maxPods: int(kubeCfg.MaxPods), @@ -454,7 +446,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub iptablesDropBit: int(kubeCfg.IPTablesDropBit), } - if mode, err := effectiveHairpinMode(componentconfig.HairpinMode(kubeCfg.HairpinMode), kubeCfg.ContainerRuntime, kubeCfg.ConfigureCBR0, kubeCfg.NetworkPluginName); err != nil { + if mode, err := effectiveHairpinMode(componentconfig.HairpinMode(kubeCfg.HairpinMode), kubeCfg.ContainerRuntime, kubeCfg.NetworkPluginName); err != nil { // This is a non-recoverable error. Returning it up the callstack will just // lead to retries of the same failure, so just fail hard. glog.Fatalf("Invalid hairpin mode: %v", err) @@ -914,7 +906,6 @@ type Kubelet struct { // Whether or not kubelet should take responsibility for keeping cbr0 in // the correct state. - configureCBR0 bool reconcileCIDR bool // Traffic to IPs outside this range will use IP masquerade. diff --git a/pkg/kubelet/kubelet_network.go b/pkg/kubelet/kubelet_network.go index 1c589adbd9..753630a101 100644 --- a/pkg/kubelet/kubelet_network.go +++ b/pkg/kubelet/kubelet_network.go @@ -20,7 +20,6 @@ import ( "fmt" "io" "io/ioutil" - "net" "strings" "github.com/golang/glog" @@ -49,11 +48,10 @@ const ( // effectiveHairpinMode determines the effective hairpin mode given the // configured mode, container runtime, and whether cbr0 should be configured. -func effectiveHairpinMode(hairpinMode componentconfig.HairpinMode, containerRuntime string, configureCBR0 bool, networkPlugin string) (componentconfig.HairpinMode, error) { +func effectiveHairpinMode(hairpinMode componentconfig.HairpinMode, containerRuntime string, networkPlugin string) (componentconfig.HairpinMode, error) { // The hairpin mode setting doesn't matter if: // - We're not using a bridge network. This is hard to check because we might - // be using a plugin. It matters if --configure-cbr0=true, and we currently - // don't pipe it down to any plugins. + // be using a plugin. // - It's set to hairpin-veth for a container runtime that doesn't know how // to set the hairpin flag on the veth's of containers. Currently the // docker runtime is the only one that understands this. @@ -64,18 +62,14 @@ func effectiveHairpinMode(hairpinMode componentconfig.HairpinMode, containerRunt glog.Warningf("Hairpin mode set to %q but container runtime is %q, ignoring", hairpinMode, containerRuntime) return componentconfig.HairpinNone, nil } - if hairpinMode == componentconfig.PromiscuousBridge && !configureCBR0 && networkPlugin != "kubenet" { - // This is not a valid combination. Users might be using the + if hairpinMode == componentconfig.PromiscuousBridge && networkPlugin != "kubenet" { + // This is not a valid combination, since promiscuous-bridge only works on kubenet. Users might be using the // default values (from before the hairpin-mode flag existed) and we // should keep the old behavior. - glog.Warningf("Hairpin mode set to %q but configureCBR0 is false, falling back to %q", hairpinMode, componentconfig.HairpinVeth) + glog.Warningf("Hairpin mode set to %q but kubenet is not enabled, falling back to %q", hairpinMode, componentconfig.HairpinVeth) return componentconfig.HairpinVeth, nil } - } else if hairpinMode == componentconfig.HairpinNone { - if configureCBR0 { - glog.Warningf("Hairpin mode set to %q and configureCBR0 is true, this might result in loss of hairpin packets", hairpinMode) - } - } else { + } else if hairpinMode != componentconfig.HairpinNone { return "", fmt.Errorf("unknown value: %q", hairpinMode) } return hairpinMode, nil @@ -195,60 +189,8 @@ func (kl *Kubelet) cleanupBandwidthLimits(allPods []*api.Pod) error { return nil } -// TODO: remove when kubenet plugin is ready -// NOTE!!! if you make changes here, also make them to kubenet -func (kl *Kubelet) reconcileCBR0(podCIDR string) error { - if podCIDR == "" { - glog.V(5).Info("PodCIDR not set. Will not configure cbr0.") - return nil - } - glog.V(5).Infof("PodCIDR is set to %q", podCIDR) - _, cidr, err := net.ParseCIDR(podCIDR) - if err != nil { - return err - } - // Set cbr0 interface address to first address in IPNet - cidr.IP.To4()[3] += 1 - if err := ensureCbr0(cidr, kl.hairpinMode == componentconfig.PromiscuousBridge, kl.babysitDaemons); err != nil { - return err - } - if kl.shapingEnabled() { - if kl.shaper == nil { - glog.V(5).Info("Shaper is nil, creating") - kl.shaper = bandwidth.NewTCShaper("cbr0") - } - return kl.shaper.ReconcileInterface() - } - return nil -} - -// syncNetworkStatus updates the network state, ensuring that the network is -// configured correctly if the kubelet is set to configure cbr0: -// * ensure that iptables masq rules are setup -// * reconcile cbr0 with the pod CIDR +// syncNetworkStatus updates the network state func (kl *Kubelet) syncNetworkStatus() { - var err error - if kl.configureCBR0 { - if err := ensureIPTablesMasqRule(kl.iptClient, kl.nonMasqueradeCIDR); err != nil { - err = fmt.Errorf("Error on adding iptables rules: %v", err) - glog.Error(err) - kl.runtimeState.setNetworkState(err) - return - } - podCIDR := kl.runtimeState.podCIDR() - if len(podCIDR) == 0 { - err = fmt.Errorf("ConfigureCBR0 requested, but PodCIDR not set. Will not configure CBR0 right now") - glog.Warning(err) - } else if err = kl.reconcileCBR0(podCIDR); err != nil { - err = fmt.Errorf("Error configuring cbr0: %v", err) - glog.Error(err) - } - if err != nil { - kl.runtimeState.setNetworkState(err) - return - } - } - kl.runtimeState.setNetworkState(kl.networkPlugin.Status()) } diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index 30feba4cc9..9d20a8a90c 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -139,8 +139,7 @@ func GetHollowKubeletConfig( c.EnableDebuggingHandlers = true c.EnableServer = true c.CgroupsPerQOS = false - // Since this kubelet runs with --configure-cbr0=false, it needs to use - // hairpin-veth to allow hairpin packets. Note that this deviates from + // hairpin-veth is used to allow hairpin packets. Note that this deviates from // what the "real" kubelet currently does, because there's no way to // set promiscuous mode on docker0. c.HairpinMode = componentconfig.HairpinVeth