diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index 3172a8ace41..3545aa3ddf6 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -46,6 +46,8 @@ for ((i=0; i < NUM_NODES; i++)) do VAGRANT_NODE_NAMES[$i]="node-$((i+1))" done +CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.246.0.0/16}" + SERVICE_CLUSTER_IP_RANGE=10.247.0.0/16 # formerly PORTAL_NET # Since this isn't exposed on the network, default to a simple user/passwd diff --git a/cmd/kube-proxy/app/options/options.go b/cmd/kube-proxy/app/options/options.go index 06d05dfcc7e..32dc2b3447a 100644 --- a/cmd/kube-proxy/app/options/options.go +++ b/cmd/kube-proxy/app/options/options.go @@ -71,6 +71,7 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { fs.Var(componentconfig.PortRangeVar{&s.PortRange}, "proxy-port-range", "Range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.") fs.StringVar(&s.HostnameOverride, "hostname-override", s.HostnameOverride, "If non-empty, will use this string as identification instead of the actual hostname.") fs.Var(&s.Mode, "proxy-mode", "Which proxy mode to use: 'userspace' (older) or 'iptables' (faster). If blank, look at the Node object on the Kubernetes API and respect the '"+ExperimentalProxyModeAnnotation+"' annotation if provided. Otherwise use the best-available proxy (currently iptables). If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are insufficient, this always falls back to the userspace proxy.") + fs.IntVar(s.IPTablesMasqueradeBit, "iptables-masquerade-bit", util.IntPtrDerefOr(s.IPTablesMasqueradeBit, 14), "If using the pure iptables proxy, the bit of the fwmark space to mark packets requiring SNAT with. Must be within the range [0, 31].") fs.DurationVar(&s.IPTablesSyncPeriod.Duration, "iptables-sync-period", s.IPTablesSyncPeriod.Duration, "How often iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0.") fs.DurationVar(&s.ConfigSyncPeriod, "config-sync-period", s.ConfigSyncPeriod, "How often configuration from the apiserver is refreshed. Must be greater than 0.") fs.BoolVar(&s.MasqueradeAll, "masquerade-all", s.MasqueradeAll, "If using the pure iptables proxy, SNAT everything") diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index f43d2166063..b46df3f0a36 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -191,18 +191,23 @@ func NewProxyServerDefault(config *options.ProxyServerConfig) (*ProxyServer, err proxyMode := getProxyMode(string(config.Mode), client.Nodes(), hostname, iptInterface, iptables.LinuxKernelCompatTester{}) if proxyMode == proxyModeIptables { - glog.V(2).Info("Using iptables Proxier.") - proxierIptables, err := iptables.NewProxier(iptInterface, execer, config.IPTablesSyncPeriod.Duration, config.MasqueradeAll) + glog.V(0).Info("Using iptables Proxier.") + if config.IPTablesMasqueradeBit == nil { + // IPTablesMasqueradeBit must be specified or defaulted. + return nil, fmt.Errorf("Unable to read IPTablesMasqueradeBit from config") + } + + proxierIptables, err := iptables.NewProxier(iptInterface, execer, config.IPTablesSyncPeriod.Duration, config.MasqueradeAll, *config.IPTablesMasqueradeBit) if err != nil { glog.Fatalf("Unable to create proxier: %v", err) } proxier = proxierIptables endpointsHandler = proxierIptables // No turning back. Remove artifacts that might still exist from the userspace Proxier. - glog.V(2).Info("Tearing down userspace rules. Errors here are acceptable.") + glog.V(0).Info("Tearing down userspace rules.") userspace.CleanupLeftovers(iptInterface) } else { - glog.V(2).Info("Using userspace Proxier.") + glog.V(0).Info("Using userspace Proxier.") // This is a proxy.LoadBalancer which NewProxier needs but has methods we don't need for // our config.EndpointsConfigHandler. loadBalancer := userspace.NewLoadBalancerRR() @@ -222,7 +227,7 @@ func NewProxyServerDefault(config *options.ProxyServerConfig) (*ProxyServer, err } proxier = proxierUserspace // Remove artifacts from the pure-iptables Proxier. - glog.V(2).Info("Tearing down pure-iptables proxy rules. Errors here are acceptable.") + glog.V(0).Info("Tearing down pure-iptables proxy rules.") iptables.CleanupLeftovers(iptInterface) } iptInterface.AddReloadFunc(proxier.Sync) diff --git a/docs/admin/kube-proxy.md b/docs/admin/kube-proxy.md index f9319633584..dd92a2c532b 100644 --- a/docs/admin/kube-proxy.md +++ b/docs/admin/kube-proxy.md @@ -63,6 +63,7 @@ kube-proxy --healthz-bind-address=127.0.0.1: The IP address for the health check server to serve on, defaulting to 127.0.0.1 (set to 0.0.0.0 for all interfaces) --healthz-port=10249: The port to bind the health check server. Use 0 to disable. --hostname-override="": If non-empty, will use this string as identification instead of the actual hostname. + --iptables-masquerade-bit=14: If using the pure iptables proxy, the bit of the fwmark space to mark packets requiring SNAT with. Must be within the range [0, 31]. --iptables-sync-period=30s: How often iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0. --kube-api-burst=10: Burst to use while talking with kubernetes apiserver --kube-api-qps=5: QPS to use while talking with kubernetes apiserver @@ -76,7 +77,7 @@ kube-proxy --udp-timeout=250ms: How long an idle UDP connection will be kept open (e.g. '250ms', '2s'). Must be greater than 0. Only applicable for proxy-mode=userspace ``` -###### Auto generated by spf13/cobra on 1-Feb-2016 +###### Auto generated by spf13/cobra on 7-Feb-2016 diff --git a/docs/devel/README.md b/docs/devel/README.md index 8a01a8d65c7..4128e00179e 100644 --- a/docs/devel/README.md +++ b/docs/devel/README.md @@ -48,6 +48,8 @@ Guide](../admin/README.md). * **Pull Request Process** ([pull-requests.md](pull-requests.md)): When and why pull requests are closed. +* **Kubernetes On-Call Rotations** ([on-call-rotations.md](on-call-rotations.md)): Descriptions of on-call rotations for build and end-user support + * **Faster PR reviews** ([faster_reviews.md](faster_reviews.md)): How to get faster PR reviews. * **Getting Recent Builds** ([getting-builds.md](getting-builds.md)): How to get recent builds including the latest builds that pass CI. @@ -73,6 +75,9 @@ Guide](../admin/README.md). * **Coding Conventions** ([coding-conventions.md](coding-conventions.md)): Coding style advice for contributors. +* **Document Conventions** ([how-to-doc.md](how-to-doc.md)) + Document style advice for contributors. + * **Running a cluster locally** ([running-locally.md](running-locally.md)): A fast and lightweight local cluster deployment for developement. diff --git a/docs/devel/on-call-build-cop.md b/docs/devel/on-call-build-cop.md new file mode 100644 index 00000000000..7530963ec65 --- /dev/null +++ b/docs/devel/on-call-build-cop.md @@ -0,0 +1,105 @@ + + + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). + +-- + + + + +Kubernetes "Github and Build-cop" Rotation +========================================== + +Preqrequisites +-------------- + +* Ensure you have [write access to http://github.com/kubernetes/kubernetes](https://github.com/orgs/kubernetes/teams/kubernetes-maintainers) + * Test your admin access by e.g. adding a label to an issue. + +Traffic sources and responsibilities +------------------------------------ + +* GitHub [https://github.com/kubernetes/kubernetes/issues](https://github.com/kubernetes/kubernetes/issues) and [https://github.com/kubernetes/kubernetes/pulls](https://github.com/kubernetes/kubernetes/pulls): Your job is to be the first responder to all new issues and PRs. If you are not equipped to do this (which is fine!), it is your job to seek guidance! + * Support issues should be closed and redirected to Stackoverflow (see example response below). + * All incoming issues should be tagged with a team label (team/{api,ux,control-plane,node,cluster,csi,redhat,mesosphere,gke,release-infra,test-infra,none}); for issues that overlap teams, you can use multiple team labels + * There is a related concept of "Github teams" which allow you to @ mention a set of people; feel free to @ mention a Github team if you wish, but this is not a substitute for adding a team/* label, which is required + * [Google teams](https://github.com/orgs/kubernetes/teams?utf8=%E2%9C%93&query=goog-) + * [Redhat teams](https://github.com/orgs/kubernetes/teams?utf8=%E2%9C%93&query=rh-) + * [SIGs](https://github.com/orgs/kubernetes/teams?utf8=%E2%9C%93&query=sig-) + * If the issue is reporting broken builds, broken e2e tests, or other obvious P0 issues, label the issue with priority/P0 and assign it to someone. This is the only situation in which you should add a priority/* label + * non-P0 issues do not need a reviewer assigned initially + * Assign any issues related to Vagrant to @derekwaynecarr (and @mention him in the issue) + * All incoming PRs should be assigned a reviewer. + * unless it is a WIP (Work in Progress), RFC (Request for Comments), or design proposal. + * An auto-assigner [should do this for you] (https://github.com/kubernetes/kubernetes/pull/12365/files) + * When in doubt, choose a TL or team maintainer of the most relevant team; they can delegate + * Keep in mind that you can @ mention people in an issue/PR to bring it to their attention without assigning it to them. You can also @ mention github teams, such as @kubernetes/goog-ux or @kubernetes/kubectl + * If you need help triaging an issue or PR, consult with (or assign it to) @brendandburns, @thockin, @bgrant0607, @quinton-hoole, @davidopp, @dchen1107, @lavalamp (all U.S. Pacific Time) or @fgrzadkowski (Central European Time). + * At the beginning of your shift, please add team/* labels to any issues that have fallen through the cracks and don't have one. Likewise, be fair to the next person in rotation: try to ensure that every issue that gets filed while you are on duty is handled. The Github query to find issues with no team/* label is: [here](https://github.com/kubernetes/kubernetes/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+-label%3Ateam%2Fcontrol-plane+-label%3Ateam%2Fmesosphere+-label%3Ateam%2Fredhat+-label%3Ateam%2Frelease-infra+-label%3Ateam%2Fnone+-label%3Ateam%2Fnode+-label%3Ateam%2Fcluster+-label%3Ateam%2Fux+-label%3Ateam%2Fcsi+-label%3Ateam%2Fapi+-label%3Ateam%2Ftest-infra+). + +Example response for support issues: + + Please re-post your question to [stackoverflow](http://stackoverflow.com/questions/tagged/kubernetes). + + We are trying to consolidate the channels to which questions for help/support are posted so that we can improve our efficiency in responding to your requests, and to make it easier for you to find answers to frequently asked questions and how to address common use cases. + + We regularly see messages posted in multiple forums, with the full response thread only in one place or, worse, spread across multiple forums. Also, the large volume of support issues on github is making it difficult for us to use issues to identify real bugs. + + The Kubernetes team scans stackoverflow on a regular basis, and will try to ensure your questions don't go unanswered. + + Before posting a new question, please search stackoverflow for answers to similar questions, and also familiarize yourself with: + * [the user guide](http://kubernetes.io/v1.0/) + * [the troubleshooting guide](http://kubernetes.io/v1.0/docs/troubleshooting.html) + + Again, thanks for using Kubernetes. + + The Kubernetes Team + +Build-copping +------------- + +* The [merge-bot submit queue](http://submit-queue.k8s.io/) ([source](https://github.com/kubernetes/contrib/tree/master/submit-queue)) should auto-merge all eligible PRs for you once they've passed all the relevant checks mentioned below and all [critical e2e tests] (https://goto.google.com/k8s-test/view/Critical%20Builds/) are passing. If the merge-bot been disabled for some reason, or tests are failing, you might need to do some manual merging to get things back on track. +* Once a day or so, look at the [flaky test builds](https://goto.google.com/k8s-test/view/Flaky/); if they are timing out, clusters are failing to start, or tests are consistently failing (instead of just flaking), file an issue to get things back on track. +* Jobs that are not in [critical e2e tests] (https://goto.google.com/k8s-test/view/Critical%20Builds/) or [flaky test builds](https://goto.google.com/k8s-test/view/Flaky/) are not your responsibility to monitor. The `Test owner:` in the job description will be automatically emailed if the job is failing. +* If you are a weekday oncall, ensure that PRs confirming to the following pre-requisites are being merged at a reasonable rate: + * [Have been LGTMd](https://github.com/kubernetes/kubernetes/labels/lgtm) + * Pass Travis and Shippable. + * Author has signed CLA if applicable. +* If you are a weekend oncall, [never merge PRs manually](collab.md), instead add the label "lgtm" to the PRs once they have been LGTMd and passed Travis and Shippable; this will cause merge-bot to merge them automatically (or make them easy to find by the next oncall, who will merge them). +* When the build is broken, roll back the PRs responsible ASAP +* When E2E tests are unstable, a "merge freeze" may be instituted. During a merge freeze: + * Oncall should slowly merge LGTMd changes throughout the day while monitoring E2E to ensure stability. + * Ideally the E2E run should be green, but some tests are flaky and can fail randomly (not as a result of a particular change). + * If a large number of tests fail, or tests that normally pass fail, that is an indication that one or more of the PR(s) in that build might be problematic (and should be reverted). + * Use the Test Results Analyzer to see individual test history over time. +* Flake mitigation + * Tests that flake (fail a small percentage of the time) need an issue filed against them. Please read [this](https://github.com/kubernetes/kubernetes/blob/doc-flaky-test/docs/devel/flaky-tests.md#filing-issues-for-flaky-tests); the build cop is expected to file issues for any flaky tests they encounter. + * It's reasonable to manually merge PRs that fix a flake or otherwise mitigate it. + +Contact information +------------------- + +[@k8s-oncall](https://github.com/k8s-oncall) will reach the current person on call. + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/devel/on-call-build-cop.md?pixel)]() + diff --git a/docs/devel/on-call-rotations.md b/docs/devel/on-call-rotations.md new file mode 100644 index 00000000000..9544db5102c --- /dev/null +++ b/docs/devel/on-call-rotations.md @@ -0,0 +1,52 @@ + + + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). + +-- + + + + +Kubernetes On-Call Rotations +==================== + +Kubernetes "first responder" rotations +-------------------------------------- + +Kubernetes has generated a lot of public traffic: email, pull-requests, bugs, etc. So much traffic that it's becoming impossible to keep up with it all! This is a fantastic problem to have. In order to be sure that SOMEONE, but not EVERYONE on the team is paying attention to public traffic, we have instituted two "first responder" rotations, listed below. Please read this page before proceeding to the pages linked below, which are specific to each rotation. + +Please also read our [notes on OSS collaboration](collab.md), particularly the bits about hours. Specifically, each rotation is expected to be active primarily during work hours, less so off hours. + +During regular workday work hours of your shift, your primary responsibility is to monitor the traffic sources specific to your rotation. You can check traffic in the evenings if you feel so inclined, but it is not expected to be as highly focused as work hours. For weekends, you should check traffic very occasionally (e.g. once or twice a day). Again, it is not expected to be as highly focused as workdays. It is assumed that over time, everyone will get weekday and weekend shifts, so the workload will balance out. + +If you can not serve your shift, and you know this ahead of time, it is your responsibility to find someone to cover and to change the rotation. If you have an emergency, your responsibilities fall on the primary of the other rotation, who acts as your secondary. If you need help to cover all of the tasks, partners with oncall rotations (e.g., [Redhat](https://github.com/orgs/kubernetes/teams/rh-oncall)). + +If you are not on duty you DO NOT need to do these things. You are free to focus on "real work". + +Note that Kubernetes will occasionally enter code slush/freeze, prior to milestones. When it does, there might be changes in the instructions (assigning milestones, for instance). + +* [Github and Build Cop Rotation](on-call-build-cop.md) +* [User Support Rotation](on-call-user-support.md) + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/devel/on-call-rotations.md?pixel)]() + diff --git a/docs/devel/on-call-user-support.md b/docs/devel/on-call-user-support.md new file mode 100644 index 00000000000..ceea9c76a18 --- /dev/null +++ b/docs/devel/on-call-user-support.md @@ -0,0 +1,83 @@ + + + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). + +-- + + + + +Kubernetes "User Support" Rotation +================================== + +Traffic sources and responsibilities +------------------------------------ + +* [StackOverflow](http://stackoverflow.com/questions/tagged/kubernetes) and [ServerFault](http://serverfault.com/questions/tagged/google-kubernetes): Respond to any thread that has no responses and is more than 6 hours old (over time we will lengthen this timeout to allow community responses). If you are not equipped to respond, it is your job to redirect to someone who can. + * [Query for unanswered Kubernetes StackOverflow questions](http://stackoverflow.com/search?q=%5Bkubernetes%5D+answers%3A0) + * [Query for unanswered Kubernetes ServerFault questions](http://serverfault.com/questions/tagged/google-kubernetes?sort=unanswered&pageSize=15) + * Direct poorly formulated questions to [stackoverflow's tips about how to ask](http://stackoverflow.com/help/how-to-ask) + * Direct off-topic questions to [stackoverflow's policy](http://stackoverflow.com/help/on-topic) +* [Slack](https://kubernetes.slack.com) ([registration](http://slack.k8s.io)): Your job is to be on Slack, watching for questions and answering or redirecting as needed. Also check out the [Slack Archive](http://kubernetes.slackarchive.io/). +* [Email/Groups](https://groups.google.com/forum/#!forum/google-containers): Respond to any thread that has no responses and is more than 6 hours old (over time we will lengthen this timeout to allow community responses). If you are not equipped to respond, it is your job to redirect to someone who can. +* [Legacy] [IRC](irc://irc.freenode.net/#google-containers) (irc.freenode.net #google-containers): watch IRC for questions and try to redirect users to Slack. Also check out the [IRC logs](https://botbot.me/freenode/google-containers/). + +In general, try to direct support questions to: + +1. Documentation, such as the [user guide](../user-guide/README.md) and [troubleshooting guide](../troubleshooting.md) +2. Stackoverflow + +If you see questions on a forum other than Stackoverflow, try to redirect them to Stackoverflow. Example response: + + Please re-post your question to [stackoverflow](http://stackoverflow.com/questions/tagged/kubernetes). + + We are trying to consolidate the channels to which questions for help/support are posted so that we can improve our efficiency in responding to your requests, and to make it easier for you to find answers to frequently asked questions and how to address common use cases. + + We regularly see messages posted in multiple forums, with the full response thread only in one place or, worse, spread across multiple forums. Also, the large volume of support issues on github is making it difficult for us to use issues to identify real bugs. + + The Kubernetes team scans stackoverflow on a regular basis, and will try to ensure your questions don't go unanswered. + + Before posting a new question, please search stackoverflow for answers to similar questions, and also familiarize yourself with: + * [the user guide](http://kubernetes.io/v1.1/) + * [the troubleshooting guide](http://kubernetes.io/v1.1/docs/troubleshooting.html) + + Again, thanks for using Kubernetes. + + The Kubernetes Team + +If you answer a question (in any of the above forums) that you think might be useful for someone else in the future, *please add it to one of the FAQs in the wiki*: +* [User FAQ](https://github.com/kubernetes/kubernetes/wiki/User-FAQ) +* [Developer FAQ](https://github.com/kubernetes/kubernetes/wiki/Developer-FAQ) +* [Debugging FAQ](https://github.com/kubernetes/kubernetes/wiki/Debugging-FAQ). + +Getting it into the FAQ is more important than polish. Please indicate the date it was added, so people can judge the likelihood that it is out-of-date (and please correct any FAQ entries that you see contain out-of-date information). + +Contact information +------------------- + +[@k8s-support-oncall](https://github.com/k8s-support-oncall) will reach the current person on call. + + + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/devel/on-call-user-support.md?pixel)]() + diff --git a/docs/devel/pr_workflow.dia b/docs/devel/pr_workflow.dia new file mode 100644 index 00000000000..753a284b4a4 Binary files /dev/null and b/docs/devel/pr_workflow.dia differ diff --git a/docs/devel/pr_workflow.png b/docs/devel/pr_workflow.png new file mode 100644 index 00000000000..0e2bd5d6eda Binary files /dev/null and b/docs/devel/pr_workflow.png differ diff --git a/docs/devel/pull-requests.md b/docs/devel/pull-requests.md index eaffce237d6..817882dbb55 100644 --- a/docs/devel/pull-requests.md +++ b/docs/devel/pull-requests.md @@ -34,34 +34,54 @@ Documentation for other releases can be found at Pull Request Process ==================== -An overview of how we will manage old or out-of-date pull requests. - -Process -------- - -We will close any pull requests older than two weeks. - -Exceptions can be made for PRs that have active review comments, or that are awaiting other dependent PRs. Closed pull requests are easy to recreate, and little work is lost by closing a pull request that subsequently needs to be reopened. - -We want to limit the total number of PRs in flight to: -* Maintain a clean project -* Remove old PRs that would be difficult to rebase as the underlying code has changed over time -* Encourage code velocity +An overview of how pull requests are managed for kubernetes. This document +assumes the reader has already followed the [development guide](development.md) +to set up their environment. Life of a Pull Request ---------------------- Unless in the last few weeks of a milestone when we need to reduce churn and stabilize, we aim to be always accepting pull requests. -Either the [on call](https://github.com/kubernetes/kubernetes/wiki/Kubernetes-on-call-rotations) manually or the [github "munger"](https://github.com/kubernetes/contrib/tree/master/mungegithub) submit-queue plugin automatically will manage merging PRs. +Either the [on call](on-call-rotations.md) manually or the [github "munger"](https://github.com/kubernetes/contrib/tree/master/mungegithub) submit-queue plugin automatically will manage merging PRs. There are several requirements for the submit-queue to work: * Author must have signed CLA ("cla: yes" label added to PR) * No changes can be made since last lgtm label was applied -* k8s-bot must have reported the GCE E2E build and test steps passed (Travis, Shippable and Jenkins build) +* k8s-bot must have reported the GCE E2E build and test steps passed (Travis, Jenkins unit/integration, Jenkins e2e) Additionally, for infrequent or new contributors, we require the on call to apply the "ok-to-merge" label manually. This is gated by the [whitelist](https://github.com/kubernetes/contrib/blob/master/mungegithub/whitelist.txt). +### Before sending a pull request + +The following will save time for both you and your reviewer: + +* Enable [pre-commit hooks](development.md#committing-changes-to-your-fork) and verify they pass. +* Verify `hack/verify-generated-docs.sh` passes. +* Verify `hack/test-go.sh` passes. + +### Visual overview + +![PR workflow](pr_workflow.png) + +Other notes +----------- + +Pull requests that are purely support questions will be closed and +redirected to [stackoverflow](http://stackoverflow.com/questions/tagged/kubernetes). +We do this to consolidate help/support questions into a single channel, +improve efficiency in responding to requests and make FAQs easier +to find. + +Pull requests older than 2 weeks will be closed. Exceptions can be made +for PRs that have active review comments, or that are awaiting other dependent PRs. +Closed pull requests are easy to recreate, and little work is lost by closing a pull +request that subsequently needs to be reopened. We want to limit the total number of PRs in flight to: +* Maintain a clean project +* Remove old PRs that would be difficult to rebase as the underlying code has changed over time +* Encourage code velocity + + Automation ---------- diff --git a/docs/getting-started-guides/README.md b/docs/getting-started-guides/README.md index 383fc78bf76..9c86d1c87a3 100644 --- a/docs/getting-started-guides/README.md +++ b/docs/getting-started-guides/README.md @@ -173,14 +173,14 @@ Bare-metal | custom | Fedora | _none_ | [docs](fedora/fedor Bare-metal | custom | Fedora | flannel | [docs](fedora/flannel_multi_node_cluster.md) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) libvirt | custom | Fedora | flannel | [docs](fedora/flannel_multi_node_cluster.md) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) KVM | custom | Fedora | flannel | [docs](fedora/flannel_multi_node_cluster.md) | | Community ([@aveshagarwal](https://github.com/aveshagarwal)) -Mesos/Docker | custom | Ubuntu | Docker | [docs](mesos-docker.md) | [✓][4] | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) +Mesos/Docker | custom | Ubuntu | Docker | [docs](mesos-docker.md) | [✓][4] | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) Mesos/GCE | | | | [docs](mesos.md) | | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) DCOS | Marathon | CoreOS/Alpine | custom | [docs](dcos.md) | | Community ([Kubernetes-Mesos Authors](https://github.com/mesosphere/kubernetes-mesos/blob/master/AUTHORS.md)) AWS | CoreOS | CoreOS | flannel | [docs](coreos.md) | | Community GCE | CoreOS | CoreOS | flannel | [docs](coreos.md) | | Community ([@pires](https://github.com/pires)) Vagrant | CoreOS | CoreOS | flannel | [docs](coreos.md) | | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles)) Bare-metal (Offline) | CoreOS | CoreOS | flannel | [docs](coreos/bare_metal_offline.md) | | Community ([@jeffbean](https://github.com/jeffbean)) -Bare-metal | CoreOS | CoreOS | Calico | [docs](coreos/bare_metal_calico.md) | | Community ([@caseydavenport](https://github.com/caseydavenport)) +Bare-metal | CoreOS | CoreOS | Calico | [docs](coreos/bare_metal_calico.md) | [✓][5] | Community ([@caseydavenport](https://github.com/caseydavenport)) CloudStack | Ansible | CoreOS | flannel | [docs](cloudstack.md) | | Community ([@runseb](https://github.com/runseb)) Vmware | | Debian | OVS | [docs](vsphere.md) | | Community ([@pietern](https://github.com/pietern)) Bare-metal | custom | CentOS | _none_ | [docs](centos/centos_manual_config.md) | | Community ([@coolsvap](https://github.com/coolsvap)) @@ -226,6 +226,8 @@ Definition of columns: [3]: https://gist.github.com/erictune/2f39b22f72565365e59b [4]: https://gist.github.com/sttts/d27f3b879223895494d4 + +[5]: https://gist.github.com/caseydavenport/98ca87e709b21f03d195 diff --git a/docs/getting-started-guides/coreos/bare_metal_calico.md b/docs/getting-started-guides/coreos/bare_metal_calico.md index 73c2b431f72..dc45a18e60f 100644 --- a/docs/getting-started-guides/coreos/bare_metal_calico.md +++ b/docs/getting-started-guides/coreos/bare_metal_calico.md @@ -34,91 +34,202 @@ Documentation for other releases can be found at Bare Metal Kubernetes on CoreOS with Calico Networking ------------------------------------------ -This document describes how to deploy Kubernetes with Calico networking on _bare metal_ CoreOS. For more information on Project Calico, visit [projectcalico.org](http://projectcalico.org) and the [calico-docker repository](https://github.com/projectcalico/calico-docker). +This document describes how to deploy Kubernetes with Calico networking on _bare metal_ CoreOS. For more information on Project Calico, visit [projectcalico.org](http://projectcalico.org) and the [calico-containers repository](https://github.com/projectcalico/calico-containers). -To install Calico on an existing Kubernetes cluster, or for more information on deploying Calico with Kubernetes in a number of other environments take a look at our supported [deployment guides](https://github.com/projectcalico/calico-docker/tree/master/docs/kubernetes). +To install Calico on an existing Kubernetes cluster, or for more information on deploying Calico with Kubernetes in a number of other environments take a look at our supported [deployment guides](https://github.com/projectcalico/calico-containers/tree/master/docs/cni/kubernetes). Specifically, this guide will have you do the following: -- Deploy a Kubernetes master node on CoreOS using cloud-config -- Deploy two Kubernetes compute nodes with Calico Networking using cloud-config +- Deploy a Kubernetes master node on CoreOS using cloud-config. +- Deploy two Kubernetes compute nodes with Calico Networking using cloud-config. +- Configure `kubectl` to access your cluster. -## Prerequisites +The resulting cluster will use SSL between Kubernetes components. It will run the SkyDNS service and kube-ui, and be fully conformant with the Kubernetes v1.1 conformance tests. -1. At least three bare-metal machines (or VMs) to work with. This guide will configure them as follows: - - 1 Kubernetes Master - - 2 Kubernetes Nodes -2. Your nodes should have IP connectivity. +## Prerequisites and Assumptions + +- At least three bare-metal machines (or VMs) to work with. This guide will configure them as follows: + - 1 Kubernetes Master + - 2 Kubernetes Nodes +- Your nodes should have IP connectivity to each other and the internet. +- This guide assumes a DHCP server on your network to assign server IPs. +- This guide uses `192.168.0.0/16` as the subnet from which pod IP addresses are assigned. If this overlaps with your host subnet, you will need to configure Calico to use a different [IP pool](https://github.com/projectcalico/calico-containers/blob/master/docs/calicoctl/pool.md#calicoctl-pool-commands). ## Cloud-config This guide will use [cloud-config](https://coreos.com/docs/cluster-management/setup/cloudinit-cloud-config/) to configure each of the nodes in our Kubernetes cluster. We'll use two cloud-config files: -- `master-config.yaml`: Cloud-config for the Kubernetes master -- `node-config.yaml`: Cloud-config for each Kubernetes node +- `master-config.yaml`: cloud-config for the Kubernetes master +- `node-config.yaml`: cloud-config for each Kubernetes node ## Download CoreOS -Let's download the CoreOS bootable ISO. We'll use this image to boot and install CoreOS on each server. - -``` -wget http://stable.release.core-os.net/amd64-usr/current/coreos_production_iso_image.iso -``` - -> You can also download the ISO from the [CoreOS website](https://coreos.com/docs/running-coreos/platforms/iso/). +Download the stable CoreOS bootable ISO from the [CoreOS website](https://coreos.com/docs/running-coreos/platforms/iso/). ## Configure the Kubernetes Master -Once you've downloaded the image, use it to boot your Kubernetes master. Once booted, you should be automatically logged in as the `core` user. +1. Once you've downloaded the ISO image, burn the ISO to a CD/DVD/USB key and boot from it (if using a virtual machine you can boot directly from the ISO). Once booted, you should be automatically logged in as the `core` user at the terminal. At this point CoreOS is running from the ISO and it hasn't been installed yet. -*On another machine*, download the `calico-kubernetes` repository, which contains the necessary cloud-config files for this guide, and make a copy of the file `master-config-template.yaml`. +2. *On another machine*, download the the [master cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/master-config-template.yaml) and save it as `master-config.yaml`. + +3. Replace the following variables in the `master-config.yaml` file. + + - ``: The public key you will use for SSH access to this server. See [generating ssh keys](https://help.github.com/articles/generating-ssh-keys/) + +4. Copy the edited `master-config.yaml` to your Kubernetes master machine (using a USB stick, for example). + +5. The CoreOS bootable ISO comes with a tool called `coreos-install` which will allow us to install CoreOS and configure the machine using a cloud-config file. The following command will download and install stable CoreOS using the `master-config.yaml` file we just created for configuration. Run this on the Kubernetes master. + + > **Warning:** this is a destructive operation that erases disk `sda` on your server. + + ``` + sudo coreos-install -d /dev/sda -C stable -c master-config.yaml + ``` + +6. Once complete, restart the server and boot from `/dev/sda` (you may need to remove the ISO image). When it comes back up, you should have SSH access as the `core` user using the public key provided in the `master-config.yaml` file. + +### Configure TLS + +The master requires the CA certificate, `ca.pem`; its own certificate, `apiserver.pem` and its private key, `apiserver-key.pem`. This [CoreOS guide](https://coreos.com/kubernetes/docs/latest/openssl.html) explains how to generate these. + +1. Generate the necessary certificates for the master. This [guide for generating Kubernetes TLS Assets](https://coreos.com/kubernetes/docs/latest/openssl.html) explains how to use OpenSSL to generate the required assets. + +2. Send the three files to your master host (using `scp` for example). + +3. Move them to the `/etc/kubernetes/ssl` folder and ensure that only the root user can read the key: + + ``` + # Move keys + sudo mkdir -p /etc/kubernetes/ssl/ + sudo mv -t /etc/kubernetes/ssl/ ca.pem apiserver.pem apiserver-key.pem + + # Set Permissions + sudo chmod 600 /etc/kubernetes/ssl/apiserver-key.pem + sudo chown root:root /etc/kubernetes/ssl/apiserver-key.pem + ``` + +4. Restart the kubelet to pick up the changes: + + ``` + sudo systemctl restart kubelet + ``` + +## Configure the compute nodes + +The following steps will set up a single Kubernetes node for use as a compute host. Run these steps to deploy each Kubernetes node in your cluster. + +1. Boot up the node machine using the bootable ISO we downloaded earlier. You should be automatically logged in as the `core` user. + +2. Make a copy of the [node cloud-config template](https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/cloud-config/node-config-template.yaml) for this machine. + +3. Replace the following placeholders in the `node-config.yaml` file to match your deployment. + + - ``: Hostname for this node (e.g. kube-node1, kube-node2) + - ``: The public key you will use for SSH access to this server. + - ``: The IPv4 address of the Kubernetes master. + +4. Replace the following placeholders with the contents of their respective files. + + - ``: Complete contents of `ca.pem` + - ``: Complete contents of `ca-key.pem` + + > **Important:** in a production deployment, embedding the secret key in cloud-config is a bad idea! In production you should use an appropriate secret manager. + + > **Important:** Make sure you indent the entire file to match the indentation of the placeholder. For example: + > + > ``` + > - path: /etc/kubernetes/ssl/ca.pem + > owner: core + > permissions: 0644 + > content: | + > + > ``` + > + > should look like this once the certificate is in place: + > + > ``` + > - path: /etc/kubernetes/ssl/ca.pem + > owner: core + > permissions: 0644 + > content: | + > -----BEGIN CERTIFICATE----- + > MIIC9zCCAd+gAwIBAgIJAJMnVnhVhy5pMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNV + > ...... + > QHwi1rNc8eBLNrd4BM/A1ZeDVh/Q9KxN+ZG/hHIXhmWKgN5wQx6/81FIFg== + > -----END CERTIFICATE----- + > ``` + +5. Move the modified `node-config.yaml` to your Kubernetes node machine and install and configure CoreOS on the node using the following command. + + > **Warning:** this is a destructive operation that erases disk `sda` on your server. + + ``` + sudo coreos-install -d /dev/sda -C stable -c node-config.yaml + ``` + +6. Once complete, restart the server and boot into `/dev/sda`. When it comes back up, you should have SSH access as the `core` user using the public key provided in the `node-config.yaml` file. It will take some time for the node to be fully configured. + +## Configure Kubeconfig + +To administer your cluster from a separate host, you will need the client and admin certificates generated earlier (`ca.pem`, `admin.pem`, `admin-key.pem`). With certificates in place, run the following commands with the appropriate filepaths. ``` -wget https://github.com/projectcalico/calico-kubernetes/archive/master.tar.gz -tar -xvf master.tar.gz -cp calico-kubernetes-master/config/cloud-config/master-config-template.yaml master-config.yaml +kubectl config set-cluster calico-cluster --server=https:// --certificate-authority= +kubectl config set-credentials calico-admin --certificate-authority= --client-key= --client-certificate= +kubectl config set-context calico --cluster=calico-cluster --user=calico-admin +kubectl config use-context calico ``` -You'll need to replace the following variables in the `master-config.yaml` file. -- ``: The public key you will use for SSH access to this server. +Check your work with `kubectl get nodes`. -Move the edited `master-config.yaml` to your Kubernetes master machine. The CoreOS bootable ISO comes with a tool called `coreos-install` which will allow us to install CoreOS and configure the machine using a cloud-config file. The following command will download and install stable CoreOS using the `master-config.yaml` file we just created for configuration. Run this on the Kubernetes master. +## Install the DNS Addon + +Most Kubernetes deployments will require the DNS addon for service discovery. To install DNS, create the skydns service and replication controller provided. ``` -sudo coreos-install -d /dev/sda -C stable -c master-config.yaml +kubectl create -f https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/master/dns/skydns.yaml ``` -Once complete, eject the bootable ISO and restart the server. When it comes back up, you should have SSH access as the `core` user using the public key provided in the `master-config.yaml` file. It may take a few minutes for the machine to be fully configured with Kubernetes and Calico. +## Install the Kubernetes UI Addon (Optional) -## Configure the compute hosts - ->The following steps will set up a single Kubernetes node for use as a compute host. Run these steps to deploy each Kubernetes node in your cluster. - -First, boot up the node machine using the bootable ISO we downloaded earlier. You should be automatically logged in as the `core` user. - -Make a copy of the `node-config-template.yaml` in the `calico-kubernetes` repository for this machine. +The Kubernetes UI can be installed using `kubectl` to run the following manifest file. ``` -cp calico-kubernetes-master/config/cloud-config/node-config-template.yaml node-config.yaml +kubectl create -f https://raw.githubusercontent.com/projectcalico/calico-cni/k8s-1.1-docs/samples/kubernetes/master/kube-ui/kube-ui.yaml ``` -You'll need to replace the following variables in the `node-config.yaml` file to match your deployment. -- ``: Hostname for this node (e.g. kube-node1, kube-node2) -- ``: The public key you will use for SSH access to this server. -- ``: The IPv4 address of the Kubernetes master. +## Launch other Services With Calico-Kubernetes -Move the modified `node-config.yaml` to your Kubernetes node machine and install and configure CoreOS on the node using the following command. +At this point, you have a fully functioning cluster running on Kubernetes with a master and two nodes networked with Calico. You can now follow any of the [standard documentation](../../../examples/) to set up other services on your cluster. + +## Connectivity to outside the cluster + +Because containers in this guide have private `192.168.0.0/16` IPs, you will need NAT to allow connectivity between containers and the internet. However, in a production data center deployment, NAT is not always necessary, since Calico can peer with the data center's border routers over BGP. + +### NAT on the nodes + +The simplest method for enabling connectivity from containers to the internet is to use outgoing NAT on your Kubernetes nodes. + +Calico can provide outgoing NAT for containers. To enable it, use the following `calicoctl` command: ``` -sudo coreos-install -d /dev/sda -C stable -c node-config.yaml +ETCD_AUTHORITY= calicoctl pool add --nat-outgoing ``` -Once complete, eject the bootable disc and restart the server. When it comes back up, you should have SSH access as the `core` user using the public key provided in the `node-config.yaml` file. It will take some time for the node to be fully configured. Once fully configured, you can check that the node is running with the following command on the Kubernetes master. +By default, `` will be `192.168.0.0/16`. You can find out which pools have been configured with the following command: ``` -kubectl get nodes +ETCD_AUTHORITY= calicoctl pool show ``` +### NAT at the border router + +In a data center environment, it is recommended to configure Calico to peer with the border routers over BGP. This means that the container IPs will be routable anywhere in the data center, and so NAT is not needed on the nodes (though it may be enabled at the data center edge to allow outbound-only internet connectivity). + +The Calico documentation contains more information on how to configure Calico to [peer with existing infrastructure](https://github.com/projectcalico/calico-containers/blob/master/docs/ExternalConnectivity.md). + +[![Analytics](https://ga-beacon.appspot.com/UA-52125893-3/kubernetes/docs/getting-started-guides/coreos/bare_metal_calico.md?pixel)](https://github.com/igrigorik/ga-beacon) + [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/getting-started-guides/coreos/bare_metal_calico.md?pixel)]() diff --git a/docs/user-guide/debugging-services.md b/docs/user-guide/debugging-services.md index cb69e2cc668..810a37cb3cc 100644 --- a/docs/user-guide/debugging-services.md +++ b/docs/user-guide/debugging-services.md @@ -513,11 +513,11 @@ then look at the logs again. ```console u@node$ iptables-save | grep hostnames --A KUBE-SEP-57KPRZ3JQVENLNBR -s 10.244.3.6/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x4d415351/0xffffffff +-A KUBE-SEP-57KPRZ3JQVENLNBR -s 10.244.3.6/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x00004000/0x00004000 -A KUBE-SEP-57KPRZ3JQVENLNBR -p tcp -m comment --comment "default/hostnames:" -m tcp -j DNAT --to-destination 10.244.3.6:9376 --A KUBE-SEP-WNBA2IHDGP2BOBGZ -s 10.244.1.7/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x4d415351/0xffffffff +-A KUBE-SEP-WNBA2IHDGP2BOBGZ -s 10.244.1.7/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x00004000/0x00004000 -A KUBE-SEP-WNBA2IHDGP2BOBGZ -p tcp -m comment --comment "default/hostnames:" -m tcp -j DNAT --to-destination 10.244.1.7:9376 --A KUBE-SEP-X3P2623AGDH6CDF3 -s 10.244.2.3/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x4d415351/0xffffffff +-A KUBE-SEP-X3P2623AGDH6CDF3 -s 10.244.2.3/32 -m comment --comment "default/hostnames:" -j MARK --set-xmark 0x00004000/0x00004000 -A KUBE-SEP-X3P2623AGDH6CDF3 -p tcp -m comment --comment "default/hostnames:" -m tcp -j DNAT --to-destination 10.244.2.3:9376 -A KUBE-SERVICES -d 10.0.1.175/32 -p tcp -m comment --comment "default/hostnames: cluster IP" -m tcp --dport 80 -j KUBE-SVC-NWV5X2332I4OT4T3 -A KUBE-SVC-NWV5X2332I4OT4T3 -m comment --comment "default/hostnames:" -m statistic --mode random --probability 0.33332999982 -j KUBE-SEP-WNBA2IHDGP2BOBGZ diff --git a/docs/user-guide/secrets.md b/docs/user-guide/secrets.md index e26421a0de3..2c6dd21079d 100644 --- a/docs/user-guide/secrets.md +++ b/docs/user-guide/secrets.md @@ -47,19 +47,20 @@ a docker image. See [Secrets design document](../design/secrets.md) for more inf - [Built-in Secrets](#built-in-secrets) - [Service Accounts Automatically Create and Attach Secrets with API Credentials](#service-accounts-automatically-create-and-attach-secrets-with-api-credentials) - [Creating your own Secrets](#creating-your-own-secrets) - - [Creating a Secret Using kubectl secret](#creating-a-secret-using-kubectl-secret) + - [Creating a Secret Using kubectl create secret](#creating-a-secret-using-kubectl-create-secret) - [Creating a Secret Manually](#creating-a-secret-manually) - [Decoding a Secret](#decoding-a-secret) - - [Manually specifying a Secret to be Mounted on a Pod](#manually-specifying-a-secret-to-be-mounted-on-a-pod) - [Using Secrets](#using-secrets) + - [Using Secrets as Files from a Pod](#using-secrets-as-files-from-a-pod) + - [Consuming Secret Values from Volumes](#consuming-secret-values-from-volumes) + - [Using Secrets as Environment Variables](#using-secrets-as-environment-variables) + - [Consuming Secret Values from Environment Variables](#consuming-secret-values-from-environment-variables) - [Using imagePullSecrets](#using-imagepullsecrets) - [Manually specifying an imagePullSecret](#manually-specifying-an-imagepullsecret) - [Arranging for imagePullSecrets to be Automatically Attached](#arranging-for-imagepullsecrets-to-be-automatically-attached) - - [Using Secrets as Files from a Pod](#using-secrets-as-files-from-a-pod) - [Automatic Mounting of Manually Created Secrets](#automatic-mounting-of-manually-created-secrets) - [Details](#details) - [Restrictions](#restrictions) - - [Consuming Secret Values](#consuming-secret-values) - [Secret and Pod Lifetime interaction](#secret-and-pod-lifetime-interaction) - [Use cases](#use-cases) - [Use-Case: Pod with ssh keys](#use-case-pod-with-ssh-keys) @@ -82,8 +83,8 @@ more control over how it is used, and reduces the risk of accidental exposure. Users can create secrets, and the system also creates some secrets. To use a secret, a pod needs to reference the secret. -A secret can be used with a pod in two ways: either as files in a [volume](volumes.md) mounted on one or more of -its containers, or used by kubelet when pulling images for the pod. +A secret can be used with a pod in two ways: as files in a [volume](volumes.md) mounted on one or more of +its containers, in environment variables, or used by kubelet when pulling images for the pod. ### Built-in Secrets @@ -102,7 +103,7 @@ information on how Service Accounts work. ### Creating your own Secrets -#### Creating a Secret Using kubectl secret +#### Creating a Secret Using kubectl create secret Say that some pods need to access a database. The username and password that the pods should use is in the files @@ -219,9 +220,22 @@ $ echo "MWYyZDFlMmU2N2RmCg==" | base64 -D 1f2d1e2e67df ``` -### Manually specifying a Secret to be Mounted on a Pod +### Using Secrets -Once the secret is created, you can create a pod that consumes that secret. +Secrets can be mounted as data volumes or be exposed as environment variables to +be used by a container in a pod. They can also be used by other parts of the +system, without being directly exposed to the pod. For example, they can hold +credentials that other parts of the system should use to interact with external +systems on your behalf. + +#### Using Secrets as Files from a Pod + +To consume a Secret in a volume in a Pod: + +1. Create a secret or use an existing one. Multiple pods can reference the same secret. +1. Modify your Pod definition to add a volume under `spec.volumes[]`. Name the volume anything, and have a `spec.volumes[].secret.secretName` field equal to the name of the secret object. +1. Add a `spec.containers[].volumeMounts[]` to each container that needs the secret. Specify `spec.containers[].volumeMounts[].readOnly = true` and `spec.containers[].volumeMounts[].mountPath` to an unused directory name where you would like the secrets to appear. +1. Modify your image and/or command line so that the the program looks for files in that directory. Each key in the secret `data` map becomes the filename under `mountPath`. This is an example of a pod that mounts a secret in a volume: @@ -253,22 +267,80 @@ This is an example of a pod that mounts a secret in a volume: } ``` -Each secret you want to use needs its own `spec.volumes`. +Each secret you want to use needs to be referred to in `spec.volumes`. If there are multiple containers in the pod, then each container needs its own `volumeMounts` block, but only one `spec.volumes` is needed per secret. -You can package many files into one secret, or use many secrets, -whichever is convenient. +You can package many files into one secret, or use many secrets, whichever is convenient. See another example of creating a secret and a pod that consumes that secret in a volume [here](secrets/). -### Using Secrets +##### Consuming Secret Values from Volumes -Secrets can be mounted as data volumes to be used by a container in a pod. -They can also be used by other parts of the system, without being directly -exposed to the pod. For example, they can hold credentials that other -parts of the system should use to interact with external systems on your behalf. +Inside the container that mounts a secret volume, the secret keys appear as +files and the secret values are base-64 decoded and stored inside these files. +This is the result of commands +executed inside the container from the example above: + +```console +$ ls /etc/foo/ +username +password +$ cat /etc/foo/username +admin +$ cat /etc/foo/password +1f2d1e2e67df +``` + +The program in a container is responsible for reading the secret(s) from the +files. + +#### Using Secrets as Environment Variables + +To use a secret in an environment variable in a pod: + +1. Create a secret or use an existing one. Multiple pods can reference the same secret. +1. Modify your Pod definition in each container that you wish to consume the value of a secret key to add an environment variable for each secret key you wish to consume. The environment variable that consumes the secret key should populate the secret's name and key in `env[x].valueFrom.secretKeyRef`. +1. Modify your image and/or command line so that the the program looks for values in the specified environment variabless + +This is an example of a pod that mounts a secret in a volume: + +```yaml +apiVersion: v1 +kind: Pod +metadata: + name: secret-env-pod +spec: + containers: + - name: mycontainer + image: redis + env: + - name: SECRET_USERNAME + valueFrom: + secretKeyRef: + name: mysecret + key: username + - name: SECRET_PASSWORD + valueFrom: + secretKeyRef: + name: mysecret + key: password + restartPolicy: Never +``` + +##### Consuming Secret Values from Environment Variables + +Inside a container that consumes a secret in an environment variables, the secret keys appear as +normal environment variables containing the base-64 decoded values of the secret data. +This is the result of commands executed inside the container from the example above: + +```console +$ echo $SECRET_USERNAME +admin +$ cat /etc/foo/password +1f2d1e2e67df +``` #### Using imagePullSecrets @@ -288,17 +360,6 @@ field set to that of the service account. See [here](service-accounts.md#adding-imagepullsecrets-to-a-service-account) for a detailed explanation of that process. -#### Using Secrets as Files from a Pod - -To use a secret from a Pod: - -1. Create a secret or use an existing one. Multiple pods can reference the same secret. -1. Modify your Pod definition to add a volume under `spec.volumes[]`. Name the volume anything, and have a `spec.volumes[].secret.secretName` field equal to the name of the secret object. -1. Add a `spec.containers[].volumeMounts[]` to each container that needs the secret. Specify `spec.containers[].volumeMounts[].readOnly = true` and `spec.containers[].volumeMounts[].mountPath` to an unused directory name where you would like the secrets to appear. -1. Modify your image and/or command line so that the the program looks for files in that directory. Each key in the secret `data` map becomes the filename under `mountPath`. - -See the [Use Cases](#use-cases) section for detailed examples. - #### Automatic Mounting of Manually Created Secrets We plan to extend the service account behavior so that manually created @@ -328,31 +389,6 @@ controller. It does not include pods created via the kubelets `--manifest-url` flag, its `--config` flag, or its REST API (these are not common ways to create pods.) -### Consuming Secret Values - -Inside the container that mounts a secret volume, the secret keys appear as -files and the secret values are base-64 decoded and stored inside these files. -This is the result of commands -executed inside the container from the example above: - -```console -$ ls /etc/foo/ -username -password -$ cat /etc/foo/username -value-1 -$ cat /etc/foo/password -value-2 -``` - -The program in a container is responsible for reading the secret(s) from the -files. Currently, if a program expects a secret to be stored in an environment -variable, then the user needs to modify the image to populate the environment -variable from the file as an step before running the main program. Future -versions of Kubernetes are expected to provide more automation for populating -environment variables from files. - - ### Secret and Pod Lifetime interaction When a pod is created via the API, there is no check whether a referenced diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index a95c3c7e821..558716b38c7 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -148,6 +148,7 @@ input-dirs insecure-bind-address insecure-port insecure-skip-tls-verify +iptables-masquerade-bit iptables-sync-period ir-data-source ir-dbname diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index 0016e5e83b4..a69b01fa32d 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -81,16 +81,16 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [17]bool + var yyq2 [18]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false yyq2[0] = x.Kind != "" yyq2[1] = x.APIVersion != "" var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(17) + r.EncodeArrayStart(18) } else { - yynn2 = 15 + yynn2 = 16 for _, b := range yyq2 { if b { yynn2++ @@ -227,35 +227,64 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy22 := &x.IPTablesSyncPeriod - yym23 := z.EncBinary() - _ = yym23 - if false { - } else if z.HasExtensions() && z.EncExt(yy22) { - } else if !yym23 && z.IsJSONHandle() { - z.EncJSONMarshal(yy22) + if x.IPTablesMasqueradeBit == nil { + r.EncodeNil() } else { - z.EncFallback(yy22) + yy22 := *x.IPTablesMasqueradeBit + yym23 := z.EncBinary() + _ = yym23 + if false { + } else { + r.EncodeInt(int64(yy22)) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.IPTablesMasqueradeBit == nil { + r.EncodeNil() + } else { + yy24 := *x.IPTablesMasqueradeBit + yym25 := z.EncBinary() + _ = yym25 + if false { + } else { + r.EncodeInt(int64(yy24)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy27 := &x.IPTablesSyncPeriod + yym28 := z.EncBinary() + _ = yym28 + if false { + } else if z.HasExtensions() && z.EncExt(yy27) { + } else if !yym28 && z.IsJSONHandle() { + z.EncJSONMarshal(yy27) + } else { + z.EncFallback(yy27) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesSyncPeriodSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy24 := &x.IPTablesSyncPeriod - yym25 := z.EncBinary() - _ = yym25 + yy29 := &x.IPTablesSyncPeriod + yym30 := z.EncBinary() + _ = yym30 if false { - } else if z.HasExtensions() && z.EncExt(yy24) { - } else if !yym25 && z.IsJSONHandle() { - z.EncJSONMarshal(yy24) + } else if z.HasExtensions() && z.EncExt(yy29) { + } else if !yym30 && z.IsJSONHandle() { + z.EncJSONMarshal(yy29) } else { - z.EncFallback(yy24) + z.EncFallback(yy29) } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym27 := z.EncBinary() - _ = yym27 + yym32 := z.EncBinary() + _ = yym32 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeconfigPath)) @@ -264,8 +293,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeconfigPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym28 := z.EncBinary() - _ = yym28 + yym33 := z.EncBinary() + _ = yym33 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeconfigPath)) @@ -273,8 +302,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym30 := z.EncBinary() - _ = yym30 + yym35 := z.EncBinary() + _ = yym35 if false { } else { r.EncodeBool(bool(x.MasqueradeAll)) @@ -283,8 +312,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("masqueradeAll")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym31 := z.EncBinary() - _ = yym31 + yym36 := z.EncBinary() + _ = yym36 if false { } else { r.EncodeBool(bool(x.MasqueradeAll)) @@ -292,8 +321,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym33 := z.EncBinary() - _ = yym33 + yym38 := z.EncBinary() + _ = yym38 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Master)) @@ -302,8 +331,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("master")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym34 := z.EncBinary() - _ = yym34 + yym39 := z.EncBinary() + _ = yym39 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Master)) @@ -314,12 +343,12 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.OOMScoreAdj == nil { r.EncodeNil() } else { - yy36 := *x.OOMScoreAdj - yym37 := z.EncBinary() - _ = yym37 + yy41 := *x.OOMScoreAdj + yym42 := z.EncBinary() + _ = yym42 if false { } else { - r.EncodeInt(int64(yy36)) + r.EncodeInt(int64(yy41)) } } } else { @@ -329,12 +358,12 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.OOMScoreAdj == nil { r.EncodeNil() } else { - yy38 := *x.OOMScoreAdj - yym39 := z.EncBinary() - _ = yym39 + yy43 := *x.OOMScoreAdj + yym44 := z.EncBinary() + _ = yym44 if false { } else { - r.EncodeInt(int64(yy38)) + r.EncodeInt(int64(yy43)) } } } @@ -349,8 +378,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym42 := z.EncBinary() - _ = yym42 + yym47 := z.EncBinary() + _ = yym47 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PortRange)) @@ -359,8 +388,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("portRange")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym43 := z.EncBinary() - _ = yym43 + yym48 := z.EncBinary() + _ = yym48 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PortRange)) @@ -368,8 +397,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym45 := z.EncBinary() - _ = yym45 + yym50 := z.EncBinary() + _ = yym50 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) @@ -378,8 +407,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceContainer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym46 := z.EncBinary() - _ = yym46 + yym51 := z.EncBinary() + _ = yym51 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) @@ -387,35 +416,35 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy48 := &x.UDPIdleTimeout - yym49 := z.EncBinary() - _ = yym49 + yy53 := &x.UDPIdleTimeout + yym54 := z.EncBinary() + _ = yym54 if false { - } else if z.HasExtensions() && z.EncExt(yy48) { - } else if !yym49 && z.IsJSONHandle() { - z.EncJSONMarshal(yy48) + } else if z.HasExtensions() && z.EncExt(yy53) { + } else if !yym54 && z.IsJSONHandle() { + z.EncJSONMarshal(yy53) } else { - z.EncFallback(yy48) + z.EncFallback(yy53) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("udpTimeoutMilliseconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy50 := &x.UDPIdleTimeout - yym51 := z.EncBinary() - _ = yym51 + yy55 := &x.UDPIdleTimeout + yym56 := z.EncBinary() + _ = yym56 if false { - } else if z.HasExtensions() && z.EncExt(yy50) { - } else if !yym51 && z.IsJSONHandle() { - z.EncJSONMarshal(yy50) + } else if z.HasExtensions() && z.EncExt(yy55) { + } else if !yym56 && z.IsJSONHandle() { + z.EncJSONMarshal(yy55) } else { - z.EncFallback(yy50) + z.EncFallback(yy55) } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym53 := z.EncBinary() - _ = yym53 + yym58 := z.EncBinary() + _ = yym58 if false { } else { r.EncodeInt(int64(x.ConntrackMax)) @@ -424,8 +453,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conntrackMax")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym54 := z.EncBinary() - _ = yym54 + yym59 := z.EncBinary() + _ = yym59 if false { } else { r.EncodeInt(int64(x.ConntrackMax)) @@ -433,29 +462,29 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy56 := &x.ConntrackTCPEstablishedTimeout - yym57 := z.EncBinary() - _ = yym57 + yy61 := &x.ConntrackTCPEstablishedTimeout + yym62 := z.EncBinary() + _ = yym62 if false { - } else if z.HasExtensions() && z.EncExt(yy56) { - } else if !yym57 && z.IsJSONHandle() { - z.EncJSONMarshal(yy56) + } else if z.HasExtensions() && z.EncExt(yy61) { + } else if !yym62 && z.IsJSONHandle() { + z.EncJSONMarshal(yy61) } else { - z.EncFallback(yy56) + z.EncFallback(yy61) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conntrackTCPEstablishedTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy58 := &x.ConntrackTCPEstablishedTimeout - yym59 := z.EncBinary() - _ = yym59 + yy63 := &x.ConntrackTCPEstablishedTimeout + yym64 := z.EncBinary() + _ = yym64 if false { - } else if z.HasExtensions() && z.EncExt(yy58) { - } else if !yym59 && z.IsJSONHandle() { - z.EncJSONMarshal(yy58) + } else if z.HasExtensions() && z.EncExt(yy63) { + } else if !yym64 && z.IsJSONHandle() { + z.EncJSONMarshal(yy63) } else { - z.EncFallback(yy58) + z.EncFallback(yy63) } } if yyr2 || yy2arr2 { @@ -471,25 +500,25 @@ func (x *KubeProxyConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym60 := z.DecBinary() - _ = yym60 + yym65 := z.DecBinary() + _ = yym65 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct61 := r.ContainerType() - if yyct61 == codecSelferValueTypeMap1234 { - yyl61 := r.ReadMapStart() - if yyl61 == 0 { + yyct66 := r.ContainerType() + if yyct66 == codecSelferValueTypeMap1234 { + yyl66 := r.ReadMapStart() + if yyl66 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl61, d) + x.codecDecodeSelfFromMap(yyl66, d) } - } else if yyct61 == codecSelferValueTypeArray1234 { - yyl61 := r.ReadArrayStart() - if yyl61 == 0 { + } else if yyct66 == codecSelferValueTypeArray1234 { + yyl66 := r.ReadArrayStart() + if yyl66 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl61, d) + x.codecDecodeSelfFromArray(yyl66, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -501,12 +530,12 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys62Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys62Slc - var yyhl62 bool = l >= 0 - for yyj62 := 0; ; yyj62++ { - if yyhl62 { - if yyj62 >= l { + var yys67Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys67Slc + var yyhl67 bool = l >= 0 + for yyj67 := 0; ; yyj67++ { + if yyhl67 { + if yyj67 >= l { break } } else { @@ -515,10 +544,10 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys62Slc = r.DecodeBytes(yys62Slc, true, true) - yys62 := string(yys62Slc) + yys67Slc = r.DecodeBytes(yys67Slc, true, true) + yys67 := string(yys67Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys62 { + switch yys67 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -555,19 +584,35 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } + case "iptablesMasqueradeBit": + if r.TryDecodeAsNil() { + if x.IPTablesMasqueradeBit != nil { + x.IPTablesMasqueradeBit = nil + } + } else { + if x.IPTablesMasqueradeBit == nil { + x.IPTablesMasqueradeBit = new(int) + } + yym75 := z.DecBinary() + _ = yym75 + if false { + } else { + *((*int)(x.IPTablesMasqueradeBit)) = int(r.DecodeInt(codecSelferBitsize1234)) + } + } case "iptablesSyncPeriodSeconds": if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv69 := &x.IPTablesSyncPeriod - yym70 := z.DecBinary() - _ = yym70 + yyv76 := &x.IPTablesSyncPeriod + yym77 := z.DecBinary() + _ = yym77 if false { - } else if z.HasExtensions() && z.DecExt(yyv69) { - } else if !yym70 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv69) + } else if z.HasExtensions() && z.DecExt(yyv76) { + } else if !yym77 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv76) } else { - z.DecFallback(yyv69, false) + z.DecFallback(yyv76, false) } } case "kubeconfigPath": @@ -597,8 +642,8 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int) } - yym75 := z.DecBinary() - _ = yym75 + yym82 := z.DecBinary() + _ = yym82 if false { } else { *((*int)(x.OOMScoreAdj)) = int(r.DecodeInt(codecSelferBitsize1234)) @@ -626,15 +671,15 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv79 := &x.UDPIdleTimeout - yym80 := z.DecBinary() - _ = yym80 + yyv86 := &x.UDPIdleTimeout + yym87 := z.DecBinary() + _ = yym87 if false { - } else if z.HasExtensions() && z.DecExt(yyv79) { - } else if !yym80 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv79) + } else if z.HasExtensions() && z.DecExt(yyv86) { + } else if !yym87 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv86) } else { - z.DecFallback(yyv79, false) + z.DecFallback(yyv86, false) } } case "conntrackMax": @@ -647,21 +692,21 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} } else { - yyv82 := &x.ConntrackTCPEstablishedTimeout - yym83 := z.DecBinary() - _ = yym83 + yyv89 := &x.ConntrackTCPEstablishedTimeout + yym90 := z.DecBinary() + _ = yym90 if false { - } else if z.HasExtensions() && z.DecExt(yyv82) { - } else if !yym83 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv82) + } else if z.HasExtensions() && z.DecExt(yyv89) { + } else if !yym90 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv89) } else { - z.DecFallback(yyv82, false) + z.DecFallback(yyv89, false) } } default: - z.DecStructFieldNotFound(-1, yys62) - } // end switch yys62 - } // end for yyj62 + z.DecStructFieldNotFound(-1, yys67) + } // end switch yys67 + } // end for yyj67 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -669,16 +714,16 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj84 int - var yyb84 bool - var yyhl84 bool = l >= 0 - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + var yyj91 int + var yyb91 bool + var yyhl91 bool = l >= 0 + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -688,13 +733,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Kind = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -704,13 +749,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.APIVersion = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -720,13 +765,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.BindAddress = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -736,13 +781,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -752,13 +797,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzPort = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -768,13 +813,39 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HostnameOverride = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.IPTablesMasqueradeBit != nil { + x.IPTablesMasqueradeBit = nil + } + } else { + if x.IPTablesMasqueradeBit == nil { + x.IPTablesMasqueradeBit = new(int) + } + yym99 := z.DecBinary() + _ = yym99 + if false { + } else { + *((*int)(x.IPTablesMasqueradeBit)) = int(r.DecodeInt(codecSelferBitsize1234)) + } + } + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l + } else { + yyb91 = r.CheckBreak() + } + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -782,24 +853,24 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv91 := &x.IPTablesSyncPeriod - yym92 := z.DecBinary() - _ = yym92 + yyv100 := &x.IPTablesSyncPeriod + yym101 := z.DecBinary() + _ = yym101 if false { - } else if z.HasExtensions() && z.DecExt(yyv91) { - } else if !yym92 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv91) + } else if z.HasExtensions() && z.DecExt(yyv100) { + } else if !yym101 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv100) } else { - z.DecFallback(yyv91, false) + z.DecFallback(yyv100, false) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -809,13 +880,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.KubeconfigPath = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -825,13 +896,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.MasqueradeAll = bool(r.DecodeBool()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -841,13 +912,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Master = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -860,20 +931,20 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int) } - yym97 := z.DecBinary() - _ = yym97 + yym106 := z.DecBinary() + _ = yym106 if false { } else { *((*int)(x.OOMScoreAdj)) = int(r.DecodeInt(codecSelferBitsize1234)) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -883,13 +954,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Mode = ProxyMode(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -899,13 +970,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.PortRange = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -915,13 +986,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ResourceContainer = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -929,24 +1000,24 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv101 := &x.UDPIdleTimeout - yym102 := z.DecBinary() - _ = yym102 + yyv110 := &x.UDPIdleTimeout + yym111 := z.DecBinary() + _ = yym111 if false { - } else if z.HasExtensions() && z.DecExt(yyv101) { - } else if !yym102 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv101) + } else if z.HasExtensions() && z.DecExt(yyv110) { + } else if !yym111 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv110) } else { - z.DecFallback(yyv101, false) + z.DecFallback(yyv110, false) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -956,13 +1027,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ConntrackMax = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -970,29 +1041,29 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} } else { - yyv104 := &x.ConntrackTCPEstablishedTimeout - yym105 := z.DecBinary() - _ = yym105 + yyv113 := &x.ConntrackTCPEstablishedTimeout + yym114 := z.DecBinary() + _ = yym114 if false { - } else if z.HasExtensions() && z.DecExt(yyv104) { - } else if !yym105 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv104) + } else if z.HasExtensions() && z.DecExt(yyv113) { + } else if !yym114 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv113) } else { - z.DecFallback(yyv104, false) + z.DecFallback(yyv113, false) } } for { - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj84-1, "") + z.DecStructFieldNotFound(yyj91-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -1001,8 +1072,8 @@ func (x ProxyMode) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym106 := z.EncBinary() - _ = yym106 + yym115 := z.EncBinary() + _ = yym115 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -1014,8 +1085,8 @@ func (x *ProxyMode) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym107 := z.DecBinary() - _ = yym107 + yym116 := z.DecBinary() + _ = yym116 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -1030,41 +1101,41 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym108 := z.EncBinary() - _ = yym108 + yym117 := z.EncBinary() + _ = yym117 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep109 := !z.EncBinary() - yy2arr109 := z.EncBasicHandle().StructToArray - var yyq109 [73]bool - _, _, _ = yysep109, yyq109, yy2arr109 - const yyr109 bool = false - yyq109[46] = x.CloudProvider != "" - yyq109[47] = x.CloudConfigFile != "" - yyq109[48] = x.ResourceContainer != "" - yyq109[49] = x.CgroupRoot != "" - yyq109[51] = x.RktPath != "" - yyq109[52] = x.RktStage1Image != "" - yyq109[68] = true - yyq109[69] = x.NodeIP != "" - var yynn109 int - if yyr109 || yy2arr109 { + yysep118 := !z.EncBinary() + yy2arr118 := z.EncBasicHandle().StructToArray + var yyq118 [73]bool + _, _, _ = yysep118, yyq118, yy2arr118 + const yyr118 bool = false + yyq118[46] = x.CloudProvider != "" + yyq118[47] = x.CloudConfigFile != "" + yyq118[48] = x.ResourceContainer != "" + yyq118[49] = x.CgroupRoot != "" + yyq118[51] = x.RktPath != "" + yyq118[52] = x.RktStage1Image != "" + yyq118[68] = true + yyq118[69] = x.NodeIP != "" + var yynn118 int + if yyr118 || yy2arr118 { r.EncodeArrayStart(73) } else { - yynn109 = 65 - for _, b := range yyq109 { + yynn118 = 65 + for _, b := range yyq118 { if b { - yynn109++ + yynn118++ } } - r.EncodeMapStart(yynn109) - yynn109 = 0 + r.EncodeMapStart(yynn118) + yynn118 = 0 } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym111 := z.EncBinary() - _ = yym111 + yym120 := z.EncBinary() + _ = yym120 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Config)) @@ -1073,98 +1144,98 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("config")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym112 := z.EncBinary() - _ = yym112 + yym121 := z.EncBinary() + _ = yym121 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Config)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy114 := &x.SyncFrequency - yym115 := z.EncBinary() - _ = yym115 + yy123 := &x.SyncFrequency + yym124 := z.EncBinary() + _ = yym124 if false { - } else if z.HasExtensions() && z.EncExt(yy114) { - } else if !yym115 && z.IsJSONHandle() { - z.EncJSONMarshal(yy114) + } else if z.HasExtensions() && z.EncExt(yy123) { + } else if !yym124 && z.IsJSONHandle() { + z.EncJSONMarshal(yy123) } else { - z.EncFallback(yy114) + z.EncFallback(yy123) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("syncFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy116 := &x.SyncFrequency - yym117 := z.EncBinary() - _ = yym117 + yy125 := &x.SyncFrequency + yym126 := z.EncBinary() + _ = yym126 if false { - } else if z.HasExtensions() && z.EncExt(yy116) { - } else if !yym117 && z.IsJSONHandle() { - z.EncJSONMarshal(yy116) + } else if z.HasExtensions() && z.EncExt(yy125) { + } else if !yym126 && z.IsJSONHandle() { + z.EncJSONMarshal(yy125) } else { - z.EncFallback(yy116) + z.EncFallback(yy125) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy119 := &x.FileCheckFrequency - yym120 := z.EncBinary() - _ = yym120 + yy128 := &x.FileCheckFrequency + yym129 := z.EncBinary() + _ = yym129 if false { - } else if z.HasExtensions() && z.EncExt(yy119) { - } else if !yym120 && z.IsJSONHandle() { - z.EncJSONMarshal(yy119) + } else if z.HasExtensions() && z.EncExt(yy128) { + } else if !yym129 && z.IsJSONHandle() { + z.EncJSONMarshal(yy128) } else { - z.EncFallback(yy119) + z.EncFallback(yy128) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fileCheckFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy121 := &x.FileCheckFrequency - yym122 := z.EncBinary() - _ = yym122 + yy130 := &x.FileCheckFrequency + yym131 := z.EncBinary() + _ = yym131 if false { - } else if z.HasExtensions() && z.EncExt(yy121) { - } else if !yym122 && z.IsJSONHandle() { - z.EncJSONMarshal(yy121) + } else if z.HasExtensions() && z.EncExt(yy130) { + } else if !yym131 && z.IsJSONHandle() { + z.EncJSONMarshal(yy130) } else { - z.EncFallback(yy121) + z.EncFallback(yy130) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy124 := &x.HTTPCheckFrequency - yym125 := z.EncBinary() - _ = yym125 + yy133 := &x.HTTPCheckFrequency + yym134 := z.EncBinary() + _ = yym134 if false { - } else if z.HasExtensions() && z.EncExt(yy124) { - } else if !yym125 && z.IsJSONHandle() { - z.EncJSONMarshal(yy124) + } else if z.HasExtensions() && z.EncExt(yy133) { + } else if !yym134 && z.IsJSONHandle() { + z.EncJSONMarshal(yy133) } else { - z.EncFallback(yy124) + z.EncFallback(yy133) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("httpCheckFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy126 := &x.HTTPCheckFrequency - yym127 := z.EncBinary() - _ = yym127 + yy135 := &x.HTTPCheckFrequency + yym136 := z.EncBinary() + _ = yym136 if false { - } else if z.HasExtensions() && z.EncExt(yy126) { - } else if !yym127 && z.IsJSONHandle() { - z.EncJSONMarshal(yy126) + } else if z.HasExtensions() && z.EncExt(yy135) { + } else if !yym136 && z.IsJSONHandle() { + z.EncJSONMarshal(yy135) } else { - z.EncFallback(yy126) + z.EncFallback(yy135) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym129 := z.EncBinary() - _ = yym129 + yym138 := z.EncBinary() + _ = yym138 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURL)) @@ -1173,17 +1244,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("manifestURL")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym130 := z.EncBinary() - _ = yym130 + yym139 := z.EncBinary() + _ = yym139 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURL)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym132 := z.EncBinary() - _ = yym132 + yym141 := z.EncBinary() + _ = yym141 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURLHeader)) @@ -1192,17 +1263,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("manifestURLHeader")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym133 := z.EncBinary() - _ = yym133 + yym142 := z.EncBinary() + _ = yym142 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURLHeader)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym135 := z.EncBinary() - _ = yym135 + yym144 := z.EncBinary() + _ = yym144 if false { } else { r.EncodeBool(bool(x.EnableServer)) @@ -1211,17 +1282,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableServer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym136 := z.EncBinary() - _ = yym136 + yym145 := z.EncBinary() + _ = yym145 if false { } else { r.EncodeBool(bool(x.EnableServer)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym138 := z.EncBinary() - _ = yym138 + yym147 := z.EncBinary() + _ = yym147 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -1230,17 +1301,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym139 := z.EncBinary() - _ = yym139 + yym148 := z.EncBinary() + _ = yym148 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym141 := z.EncBinary() - _ = yym141 + yym150 := z.EncBinary() + _ = yym150 if false { } else { r.EncodeUint(uint64(x.Port)) @@ -1249,17 +1320,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym142 := z.EncBinary() - _ = yym142 + yym151 := z.EncBinary() + _ = yym151 if false { } else { r.EncodeUint(uint64(x.Port)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym144 := z.EncBinary() - _ = yym144 + yym153 := z.EncBinary() + _ = yym153 if false { } else { r.EncodeUint(uint64(x.ReadOnlyPort)) @@ -1268,17 +1339,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readOnlyPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym145 := z.EncBinary() - _ = yym145 + yym154 := z.EncBinary() + _ = yym154 if false { } else { r.EncodeUint(uint64(x.ReadOnlyPort)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym147 := z.EncBinary() - _ = yym147 + yym156 := z.EncBinary() + _ = yym156 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSCertFile)) @@ -1287,17 +1358,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tLSCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym148 := z.EncBinary() - _ = yym148 + yym157 := z.EncBinary() + _ = yym157 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSCertFile)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym150 := z.EncBinary() - _ = yym150 + yym159 := z.EncBinary() + _ = yym159 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSPrivateKeyFile)) @@ -1306,17 +1377,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tLSPrivateKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym151 := z.EncBinary() - _ = yym151 + yym160 := z.EncBinary() + _ = yym160 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSPrivateKeyFile)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym153 := z.EncBinary() - _ = yym153 + yym162 := z.EncBinary() + _ = yym162 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CertDirectory)) @@ -1325,17 +1396,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("certDirectory")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym154 := z.EncBinary() - _ = yym154 + yym163 := z.EncBinary() + _ = yym163 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CertDirectory)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym156 := z.EncBinary() - _ = yym156 + yym165 := z.EncBinary() + _ = yym165 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostnameOverride)) @@ -1344,17 +1415,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostnameOverride")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym157 := z.EncBinary() - _ = yym157 + yym166 := z.EncBinary() + _ = yym166 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostnameOverride)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym159 := z.EncBinary() - _ = yym159 + yym168 := z.EncBinary() + _ = yym168 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodInfraContainerImage)) @@ -1363,17 +1434,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podInfraContainerImage")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym160 := z.EncBinary() - _ = yym160 + yym169 := z.EncBinary() + _ = yym169 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodInfraContainerImage)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym162 := z.EncBinary() - _ = yym162 + yym171 := z.EncBinary() + _ = yym171 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerEndpoint)) @@ -1382,17 +1453,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("dockerEndpoint")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym163 := z.EncBinary() - _ = yym163 + yym172 := z.EncBinary() + _ = yym172 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerEndpoint)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym165 := z.EncBinary() - _ = yym165 + yym174 := z.EncBinary() + _ = yym174 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootDirectory)) @@ -1401,17 +1472,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootDirectory")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym166 := z.EncBinary() - _ = yym166 + yym175 := z.EncBinary() + _ = yym175 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootDirectory)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym168 := z.EncBinary() - _ = yym168 + yym177 := z.EncBinary() + _ = yym177 if false { } else { r.EncodeBool(bool(x.AllowPrivileged)) @@ -1420,17 +1491,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allowPrivileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym169 := z.EncBinary() - _ = yym169 + yym178 := z.EncBinary() + _ = yym178 if false { } else { r.EncodeBool(bool(x.AllowPrivileged)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym171 := z.EncBinary() - _ = yym171 + yym180 := z.EncBinary() + _ = yym180 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) @@ -1439,17 +1510,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostNetworkSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym172 := z.EncBinary() - _ = yym172 + yym181 := z.EncBinary() + _ = yym181 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostNetworkSources)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym174 := z.EncBinary() - _ = yym174 + yym183 := z.EncBinary() + _ = yym183 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) @@ -1458,17 +1529,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostPIDSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym175 := z.EncBinary() - _ = yym175 + yym184 := z.EncBinary() + _ = yym184 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostPIDSources)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym177 := z.EncBinary() - _ = yym177 + yym186 := z.EncBinary() + _ = yym186 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) @@ -1477,17 +1548,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostIPCSources")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym178 := z.EncBinary() - _ = yym178 + yym187 := z.EncBinary() + _ = yym187 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostIPCSources)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym180 := z.EncBinary() - _ = yym180 + yym189 := z.EncBinary() + _ = yym189 if false { } else { r.EncodeFloat64(float64(x.RegistryPullQPS)) @@ -1496,17 +1567,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registryPullQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym181 := z.EncBinary() - _ = yym181 + yym190 := z.EncBinary() + _ = yym190 if false { } else { r.EncodeFloat64(float64(x.RegistryPullQPS)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym183 := z.EncBinary() - _ = yym183 + yym192 := z.EncBinary() + _ = yym192 if false { } else { r.EncodeInt(int64(x.RegistryBurst)) @@ -1515,17 +1586,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registryBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym184 := z.EncBinary() - _ = yym184 + yym193 := z.EncBinary() + _ = yym193 if false { } else { r.EncodeInt(int64(x.RegistryBurst)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym186 := z.EncBinary() - _ = yym186 + yym195 := z.EncBinary() + _ = yym195 if false { } else { r.EncodeFloat32(float32(x.EventRecordQPS)) @@ -1534,17 +1605,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("eventRecordQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym187 := z.EncBinary() - _ = yym187 + yym196 := z.EncBinary() + _ = yym196 if false { } else { r.EncodeFloat32(float32(x.EventRecordQPS)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym189 := z.EncBinary() - _ = yym189 + yym198 := z.EncBinary() + _ = yym198 if false { } else { r.EncodeInt(int64(x.EventBurst)) @@ -1553,17 +1624,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("eventBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym190 := z.EncBinary() - _ = yym190 + yym199 := z.EncBinary() + _ = yym199 if false { } else { r.EncodeInt(int64(x.EventBurst)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym192 := z.EncBinary() - _ = yym192 + yym201 := z.EncBinary() + _ = yym201 if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) @@ -1572,44 +1643,44 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDebuggingHandlers")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym193 := z.EncBinary() - _ = yym193 + yym202 := z.EncBinary() + _ = yym202 if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy195 := &x.MinimumGCAge - yym196 := z.EncBinary() - _ = yym196 + yy204 := &x.MinimumGCAge + yym205 := z.EncBinary() + _ = yym205 if false { - } else if z.HasExtensions() && z.EncExt(yy195) { - } else if !yym196 && z.IsJSONHandle() { - z.EncJSONMarshal(yy195) + } else if z.HasExtensions() && z.EncExt(yy204) { + } else if !yym205 && z.IsJSONHandle() { + z.EncJSONMarshal(yy204) } else { - z.EncFallback(yy195) + z.EncFallback(yy204) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumGCAge")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy197 := &x.MinimumGCAge - yym198 := z.EncBinary() - _ = yym198 + yy206 := &x.MinimumGCAge + yym207 := z.EncBinary() + _ = yym207 if false { - } else if z.HasExtensions() && z.EncExt(yy197) { - } else if !yym198 && z.IsJSONHandle() { - z.EncJSONMarshal(yy197) + } else if z.HasExtensions() && z.EncExt(yy206) { + } else if !yym207 && z.IsJSONHandle() { + z.EncJSONMarshal(yy206) } else { - z.EncFallback(yy197) + z.EncFallback(yy206) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym200 := z.EncBinary() - _ = yym200 + yym209 := z.EncBinary() + _ = yym209 if false { } else { r.EncodeInt(int64(x.MaxPerPodContainerCount)) @@ -1618,17 +1689,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxPerPodContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym201 := z.EncBinary() - _ = yym201 + yym210 := z.EncBinary() + _ = yym210 if false { } else { r.EncodeInt(int64(x.MaxPerPodContainerCount)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym203 := z.EncBinary() - _ = yym203 + yym212 := z.EncBinary() + _ = yym212 if false { } else { r.EncodeInt(int64(x.MaxContainerCount)) @@ -1637,17 +1708,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym204 := z.EncBinary() - _ = yym204 + yym213 := z.EncBinary() + _ = yym213 if false { } else { r.EncodeInt(int64(x.MaxContainerCount)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym206 := z.EncBinary() - _ = yym206 + yym215 := z.EncBinary() + _ = yym215 if false { } else { r.EncodeUint(uint64(x.CAdvisorPort)) @@ -1656,17 +1727,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cAdvisorPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym207 := z.EncBinary() - _ = yym207 + yym216 := z.EncBinary() + _ = yym216 if false { } else { r.EncodeUint(uint64(x.CAdvisorPort)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym209 := z.EncBinary() - _ = yym209 + yym218 := z.EncBinary() + _ = yym218 if false { } else { r.EncodeInt(int64(x.HealthzPort)) @@ -1675,17 +1746,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("healthzPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym210 := z.EncBinary() - _ = yym210 + yym219 := z.EncBinary() + _ = yym219 if false { } else { r.EncodeInt(int64(x.HealthzPort)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym212 := z.EncBinary() - _ = yym212 + yym221 := z.EncBinary() + _ = yym221 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) @@ -1694,17 +1765,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("healthzBindAddress")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym213 := z.EncBinary() - _ = yym213 + yym222 := z.EncBinary() + _ = yym222 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym215 := z.EncBinary() - _ = yym215 + yym224 := z.EncBinary() + _ = yym224 if false { } else { r.EncodeInt(int64(x.OOMScoreAdj)) @@ -1713,17 +1784,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("oomScoreAdj")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym216 := z.EncBinary() - _ = yym216 + yym225 := z.EncBinary() + _ = yym225 if false { } else { r.EncodeInt(int64(x.OOMScoreAdj)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym218 := z.EncBinary() - _ = yym218 + yym227 := z.EncBinary() + _ = yym227 if false { } else { r.EncodeBool(bool(x.RegisterNode)) @@ -1732,17 +1803,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerNode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym219 := z.EncBinary() - _ = yym219 + yym228 := z.EncBinary() + _ = yym228 if false { } else { r.EncodeBool(bool(x.RegisterNode)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym221 := z.EncBinary() - _ = yym221 + yym230 := z.EncBinary() + _ = yym230 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) @@ -1751,17 +1822,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterDomain")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym222 := z.EncBinary() - _ = yym222 + yym231 := z.EncBinary() + _ = yym231 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym224 := z.EncBinary() - _ = yym224 + yym233 := z.EncBinary() + _ = yym233 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) @@ -1770,17 +1841,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("masterServiceNamespace")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym225 := z.EncBinary() - _ = yym225 + yym234 := z.EncBinary() + _ = yym234 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym227 := z.EncBinary() - _ = yym227 + yym236 := z.EncBinary() + _ = yym236 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) @@ -1789,71 +1860,71 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterDNS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym228 := z.EncBinary() - _ = yym228 + yym237 := z.EncBinary() + _ = yym237 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy230 := &x.StreamingConnectionIdleTimeout - yym231 := z.EncBinary() - _ = yym231 + yy239 := &x.StreamingConnectionIdleTimeout + yym240 := z.EncBinary() + _ = yym240 if false { - } else if z.HasExtensions() && z.EncExt(yy230) { - } else if !yym231 && z.IsJSONHandle() { - z.EncJSONMarshal(yy230) + } else if z.HasExtensions() && z.EncExt(yy239) { + } else if !yym240 && z.IsJSONHandle() { + z.EncJSONMarshal(yy239) } else { - z.EncFallback(yy230) + z.EncFallback(yy239) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("streamingConnectionIdleTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy232 := &x.StreamingConnectionIdleTimeout - yym233 := z.EncBinary() - _ = yym233 + yy241 := &x.StreamingConnectionIdleTimeout + yym242 := z.EncBinary() + _ = yym242 if false { - } else if z.HasExtensions() && z.EncExt(yy232) { - } else if !yym233 && z.IsJSONHandle() { - z.EncJSONMarshal(yy232) + } else if z.HasExtensions() && z.EncExt(yy241) { + } else if !yym242 && z.IsJSONHandle() { + z.EncJSONMarshal(yy241) } else { - z.EncFallback(yy232) + z.EncFallback(yy241) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy235 := &x.NodeStatusUpdateFrequency - yym236 := z.EncBinary() - _ = yym236 + yy244 := &x.NodeStatusUpdateFrequency + yym245 := z.EncBinary() + _ = yym245 if false { - } else if z.HasExtensions() && z.EncExt(yy235) { - } else if !yym236 && z.IsJSONHandle() { - z.EncJSONMarshal(yy235) + } else if z.HasExtensions() && z.EncExt(yy244) { + } else if !yym245 && z.IsJSONHandle() { + z.EncJSONMarshal(yy244) } else { - z.EncFallback(yy235) + z.EncFallback(yy244) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeStatusUpdateFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy237 := &x.NodeStatusUpdateFrequency - yym238 := z.EncBinary() - _ = yym238 + yy246 := &x.NodeStatusUpdateFrequency + yym247 := z.EncBinary() + _ = yym247 if false { - } else if z.HasExtensions() && z.EncExt(yy237) { - } else if !yym238 && z.IsJSONHandle() { - z.EncJSONMarshal(yy237) + } else if z.HasExtensions() && z.EncExt(yy246) { + } else if !yym247 && z.IsJSONHandle() { + z.EncJSONMarshal(yy246) } else { - z.EncFallback(yy237) + z.EncFallback(yy246) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym240 := z.EncBinary() - _ = yym240 + yym249 := z.EncBinary() + _ = yym249 if false { } else { r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) @@ -1862,17 +1933,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCHighThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym241 := z.EncBinary() - _ = yym241 + yym250 := z.EncBinary() + _ = yym250 if false { } else { r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym243 := z.EncBinary() - _ = yym243 + yym252 := z.EncBinary() + _ = yym252 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) @@ -1881,17 +1952,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCLowThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym244 := z.EncBinary() - _ = yym244 + yym253 := z.EncBinary() + _ = yym253 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym246 := z.EncBinary() - _ = yym246 + yym255 := z.EncBinary() + _ = yym255 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) @@ -1900,44 +1971,44 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lowDiskSpaceThresholdMB")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym247 := z.EncBinary() - _ = yym247 + yym256 := z.EncBinary() + _ = yym256 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy249 := &x.VolumeStatsAggPeriod - yym250 := z.EncBinary() - _ = yym250 + yy258 := &x.VolumeStatsAggPeriod + yym259 := z.EncBinary() + _ = yym259 if false { - } else if z.HasExtensions() && z.EncExt(yy249) { - } else if !yym250 && z.IsJSONHandle() { - z.EncJSONMarshal(yy249) + } else if z.HasExtensions() && z.EncExt(yy258) { + } else if !yym259 && z.IsJSONHandle() { + z.EncJSONMarshal(yy258) } else { - z.EncFallback(yy249) + z.EncFallback(yy258) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("VolumeStatsAggPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy251 := &x.VolumeStatsAggPeriod - yym252 := z.EncBinary() - _ = yym252 + yy260 := &x.VolumeStatsAggPeriod + yym261 := z.EncBinary() + _ = yym261 if false { - } else if z.HasExtensions() && z.EncExt(yy251) { - } else if !yym252 && z.IsJSONHandle() { - z.EncJSONMarshal(yy251) + } else if z.HasExtensions() && z.EncExt(yy260) { + } else if !yym261 && z.IsJSONHandle() { + z.EncJSONMarshal(yy260) } else { - z.EncFallback(yy251) + z.EncFallback(yy260) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym254 := z.EncBinary() - _ = yym254 + yym263 := z.EncBinary() + _ = yym263 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) @@ -1946,17 +2017,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym255 := z.EncBinary() - _ = yym255 + yym264 := z.EncBinary() + _ = yym264 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym257 := z.EncBinary() - _ = yym257 + yym266 := z.EncBinary() + _ = yym266 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) @@ -1965,17 +2036,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym258 := z.EncBinary() - _ = yym258 + yym267 := z.EncBinary() + _ = yym267 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym260 := z.EncBinary() - _ = yym260 + yym269 := z.EncBinary() + _ = yym269 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) @@ -1984,117 +2055,117 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym261 := z.EncBinary() - _ = yym261 + yym270 := z.EncBinary() + _ = yym270 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[46] { - yym263 := z.EncBinary() - _ = yym263 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq109[46] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym264 := z.EncBinary() - _ = yym264 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } - } - if yyr109 || yy2arr109 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[47] { - yym266 := z.EncBinary() - _ = yym266 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq109[47] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym267 := z.EncBinary() - _ = yym267 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } - } - if yyr109 || yy2arr109 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[48] { - yym269 := z.EncBinary() - _ = yym269 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq109[48] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resourceContainer")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym270 := z.EncBinary() - _ = yym270 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) - } - } - } - if yyr109 || yy2arr109 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[49] { + if yyq118[46] { yym272 := z.EncBinary() _ = yym272 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[49] { + if yyq118[46] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) + r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym273 := z.EncBinary() _ = yym273 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) + } + } + } + if yyr118 || yy2arr118 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq118[47] { + yym275 := z.EncBinary() + _ = yym275 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq118[47] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym276 := z.EncBinary() + _ = yym276 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + } + } + } + if yyr118 || yy2arr118 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq118[48] { + yym278 := z.EncBinary() + _ = yym278 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq118[48] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("resourceContainer")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym279 := z.EncBinary() + _ = yym279 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) + } + } + } + if yyr118 || yy2arr118 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq118[49] { + yym281 := z.EncBinary() + _ = yym281 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq118[49] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym282 := z.EncBinary() + _ = yym282 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym275 := z.EncBinary() - _ = yym275 + yym284 := z.EncBinary() + _ = yym284 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) @@ -2103,18 +2174,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerRuntime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym276 := z.EncBinary() - _ = yym276 + yym285 := z.EncBinary() + _ = yym285 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[51] { - yym278 := z.EncBinary() - _ = yym278 + if yyq118[51] { + yym287 := z.EncBinary() + _ = yym287 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) @@ -2123,23 +2194,23 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[51] { + if yyq118[51] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rktPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym279 := z.EncBinary() - _ = yym279 + yym288 := z.EncBinary() + _ = yym288 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[52] { - yym281 := z.EncBinary() - _ = yym281 + if yyq118[52] { + yym290 := z.EncBinary() + _ = yym290 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) @@ -2148,22 +2219,22 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[52] { + if yyq118[52] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rktStage1Image")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym282 := z.EncBinary() - _ = yym282 + yym291 := z.EncBinary() + _ = yym291 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym284 := z.EncBinary() - _ = yym284 + yym293 := z.EncBinary() + _ = yym293 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SystemContainer)) @@ -2172,17 +2243,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("systemContainer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym285 := z.EncBinary() - _ = yym285 + yym294 := z.EncBinary() + _ = yym294 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SystemContainer)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym287 := z.EncBinary() - _ = yym287 + yym296 := z.EncBinary() + _ = yym296 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) @@ -2191,17 +2262,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym288 := z.EncBinary() - _ = yym288 + yym297 := z.EncBinary() + _ = yym297 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym290 := z.EncBinary() - _ = yym290 + yym299 := z.EncBinary() + _ = yym299 if false { } else { r.EncodeInt(int64(x.MaxPods)) @@ -2210,17 +2281,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxPods")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym291 := z.EncBinary() - _ = yym291 + yym300 := z.EncBinary() + _ = yym300 if false { } else { r.EncodeInt(int64(x.MaxPods)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym293 := z.EncBinary() - _ = yym293 + yym302 := z.EncBinary() + _ = yym302 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) @@ -2229,17 +2300,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym294 := z.EncBinary() - _ = yym294 + yym303 := z.EncBinary() + _ = yym303 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym296 := z.EncBinary() - _ = yym296 + yym305 := z.EncBinary() + _ = yym305 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) @@ -2248,17 +2319,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym297 := z.EncBinary() - _ = yym297 + yym306 := z.EncBinary() + _ = yym306 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym299 := z.EncBinary() - _ = yym299 + yym308 := z.EncBinary() + _ = yym308 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) @@ -2267,17 +2338,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym300 := z.EncBinary() - _ = yym300 + yym309 := z.EncBinary() + _ = yym309 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym302 := z.EncBinary() - _ = yym302 + yym311 := z.EncBinary() + _ = yym311 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) @@ -2286,17 +2357,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym303 := z.EncBinary() - _ = yym303 + yym312 := z.EncBinary() + _ = yym312 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym305 := z.EncBinary() - _ = yym305 + yym314 := z.EncBinary() + _ = yym314 if false { } else { r.EncodeBool(bool(x.Containerized)) @@ -2305,17 +2376,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerized")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym306 := z.EncBinary() - _ = yym306 + yym315 := z.EncBinary() + _ = yym315 if false { } else { r.EncodeBool(bool(x.Containerized)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym308 := z.EncBinary() - _ = yym308 + yym317 := z.EncBinary() + _ = yym317 if false { } else { r.EncodeUint(uint64(x.MaxOpenFiles)) @@ -2324,17 +2395,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym309 := z.EncBinary() - _ = yym309 + yym318 := z.EncBinary() + _ = yym318 if false { } else { r.EncodeUint(uint64(x.MaxOpenFiles)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym311 := z.EncBinary() - _ = yym311 + yym320 := z.EncBinary() + _ = yym320 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) @@ -2343,17 +2414,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym312 := z.EncBinary() - _ = yym312 + yym321 := z.EncBinary() + _ = yym321 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym314 := z.EncBinary() - _ = yym314 + yym323 := z.EncBinary() + _ = yym323 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) @@ -2362,17 +2433,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym315 := z.EncBinary() - _ = yym315 + yym324 := z.EncBinary() + _ = yym324 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym317 := z.EncBinary() - _ = yym317 + yym326 := z.EncBinary() + _ = yym326 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -2381,17 +2452,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym318 := z.EncBinary() - _ = yym318 + yym327 := z.EncBinary() + _ = yym327 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym320 := z.EncBinary() - _ = yym320 + yym329 := z.EncBinary() + _ = yym329 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -2400,17 +2471,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym321 := z.EncBinary() - _ = yym321 + yym330 := z.EncBinary() + _ = yym330 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym323 := z.EncBinary() - _ = yym323 + yym332 := z.EncBinary() + _ = yym332 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) @@ -2419,17 +2490,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym324 := z.EncBinary() - _ = yym324 + yym333 := z.EncBinary() + _ = yym333 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym326 := z.EncBinary() - _ = yym326 + yym335 := z.EncBinary() + _ = yym335 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) @@ -2438,51 +2509,51 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalFlannelOverlay")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym327 := z.EncBinary() - _ = yym327 + yym336 := z.EncBinary() + _ = yym336 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[68] { - yy329 := &x.OutOfDiskTransitionFrequency - yym330 := z.EncBinary() - _ = yym330 + if yyq118[68] { + yy338 := &x.OutOfDiskTransitionFrequency + yym339 := z.EncBinary() + _ = yym339 if false { - } else if z.HasExtensions() && z.EncExt(yy329) { - } else if !yym330 && z.IsJSONHandle() { - z.EncJSONMarshal(yy329) + } else if z.HasExtensions() && z.EncExt(yy338) { + } else if !yym339 && z.IsJSONHandle() { + z.EncJSONMarshal(yy338) } else { - z.EncFallback(yy329) + z.EncFallback(yy338) } } else { r.EncodeNil() } } else { - if yyq109[68] { + if yyq118[68] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("outOfDiskTransitionFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy331 := &x.OutOfDiskTransitionFrequency - yym332 := z.EncBinary() - _ = yym332 + yy340 := &x.OutOfDiskTransitionFrequency + yym341 := z.EncBinary() + _ = yym341 if false { - } else if z.HasExtensions() && z.EncExt(yy331) { - } else if !yym332 && z.IsJSONHandle() { - z.EncJSONMarshal(yy331) + } else if z.HasExtensions() && z.EncExt(yy340) { + } else if !yym341 && z.IsJSONHandle() { + z.EncJSONMarshal(yy340) } else { - z.EncFallback(yy331) + z.EncFallback(yy340) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[69] { - yym334 := z.EncBinary() - _ = yym334 + if yyq118[69] { + yym343 := z.EncBinary() + _ = yym343 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -2491,25 +2562,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[69] { + if yyq118[69] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeIP")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym335 := z.EncBinary() - _ = yym335 + yym344 := z.EncBinary() + _ = yym344 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.NodeLabels == nil { r.EncodeNil() } else { - yym337 := z.EncBinary() - _ = yym337 + yym346 := z.EncBinary() + _ = yym346 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -2522,18 +2593,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym338 := z.EncBinary() - _ = yym338 + yym347 := z.EncBinary() + _ = yym347 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym340 := z.EncBinary() - _ = yym340 + yym349 := z.EncBinary() + _ = yym349 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -2542,17 +2613,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nonMasqueradeCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym341 := z.EncBinary() - _ = yym341 + yym350 := z.EncBinary() + _ = yym350 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym343 := z.EncBinary() - _ = yym343 + yym352 := z.EncBinary() + _ = yym352 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -2561,14 +2632,14 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableCustomMetrics")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym344 := z.EncBinary() - _ = yym344 + yym353 := z.EncBinary() + _ = yym353 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -2581,25 +2652,25 @@ func (x *KubeletConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym345 := z.DecBinary() - _ = yym345 + yym354 := z.DecBinary() + _ = yym354 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct346 := r.ContainerType() - if yyct346 == codecSelferValueTypeMap1234 { - yyl346 := r.ReadMapStart() - if yyl346 == 0 { + yyct355 := r.ContainerType() + if yyct355 == codecSelferValueTypeMap1234 { + yyl355 := r.ReadMapStart() + if yyl355 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl346, d) + x.codecDecodeSelfFromMap(yyl355, d) } - } else if yyct346 == codecSelferValueTypeArray1234 { - yyl346 := r.ReadArrayStart() - if yyl346 == 0 { + } else if yyct355 == codecSelferValueTypeArray1234 { + yyl355 := r.ReadArrayStart() + if yyl355 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl346, d) + x.codecDecodeSelfFromArray(yyl355, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -2611,12 +2682,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys347Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys347Slc - var yyhl347 bool = l >= 0 - for yyj347 := 0; ; yyj347++ { - if yyhl347 { - if yyj347 >= l { + var yys356Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys356Slc + var yyhl356 bool = l >= 0 + for yyj356 := 0; ; yyj356++ { + if yyhl356 { + if yyj356 >= l { break } } else { @@ -2625,10 +2696,10 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys347Slc = r.DecodeBytes(yys347Slc, true, true) - yys347 := string(yys347Slc) + yys356Slc = r.DecodeBytes(yys356Slc, true, true) + yys356 := string(yys356Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys347 { + switch yys356 { case "config": if r.TryDecodeAsNil() { x.Config = "" @@ -2639,45 +2710,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv349 := &x.SyncFrequency - yym350 := z.DecBinary() - _ = yym350 + yyv358 := &x.SyncFrequency + yym359 := z.DecBinary() + _ = yym359 if false { - } else if z.HasExtensions() && z.DecExt(yyv349) { - } else if !yym350 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv349) + } else if z.HasExtensions() && z.DecExt(yyv358) { + } else if !yym359 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv358) } else { - z.DecFallback(yyv349, false) + z.DecFallback(yyv358, false) } } case "fileCheckFrequency": if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv351 := &x.FileCheckFrequency - yym352 := z.DecBinary() - _ = yym352 + yyv360 := &x.FileCheckFrequency + yym361 := z.DecBinary() + _ = yym361 if false { - } else if z.HasExtensions() && z.DecExt(yyv351) { - } else if !yym352 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv351) + } else if z.HasExtensions() && z.DecExt(yyv360) { + } else if !yym361 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv360) } else { - z.DecFallback(yyv351, false) + z.DecFallback(yyv360, false) } } case "httpCheckFrequency": if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv353 := &x.HTTPCheckFrequency - yym354 := z.DecBinary() - _ = yym354 + yyv362 := &x.HTTPCheckFrequency + yym363 := z.DecBinary() + _ = yym363 if false { - } else if z.HasExtensions() && z.DecExt(yyv353) { - } else if !yym354 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv353) + } else if z.HasExtensions() && z.DecExt(yyv362) { + } else if !yym363 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv362) } else { - z.DecFallback(yyv353, false) + z.DecFallback(yyv362, false) } } case "manifestURL": @@ -2816,15 +2887,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv377 := &x.MinimumGCAge - yym378 := z.DecBinary() - _ = yym378 + yyv386 := &x.MinimumGCAge + yym387 := z.DecBinary() + _ = yym387 if false { - } else if z.HasExtensions() && z.DecExt(yyv377) { - } else if !yym378 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv377) + } else if z.HasExtensions() && z.DecExt(yyv386) { + } else if !yym387 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv386) } else { - z.DecFallback(yyv377, false) + z.DecFallback(yyv386, false) } } case "maxPerPodContainerCount": @@ -2891,30 +2962,30 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv389 := &x.StreamingConnectionIdleTimeout - yym390 := z.DecBinary() - _ = yym390 + yyv398 := &x.StreamingConnectionIdleTimeout + yym399 := z.DecBinary() + _ = yym399 if false { - } else if z.HasExtensions() && z.DecExt(yyv389) { - } else if !yym390 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv389) + } else if z.HasExtensions() && z.DecExt(yyv398) { + } else if !yym399 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv398) } else { - z.DecFallback(yyv389, false) + z.DecFallback(yyv398, false) } } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv391 := &x.NodeStatusUpdateFrequency - yym392 := z.DecBinary() - _ = yym392 + yyv400 := &x.NodeStatusUpdateFrequency + yym401 := z.DecBinary() + _ = yym401 if false { - } else if z.HasExtensions() && z.DecExt(yyv391) { - } else if !yym392 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv391) + } else if z.HasExtensions() && z.DecExt(yyv400) { + } else if !yym401 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv400) } else { - z.DecFallback(yyv391, false) + z.DecFallback(yyv400, false) } } case "imageGCHighThresholdPercent": @@ -2939,15 +3010,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv396 := &x.VolumeStatsAggPeriod - yym397 := z.DecBinary() - _ = yym397 + yyv405 := &x.VolumeStatsAggPeriod + yym406 := z.DecBinary() + _ = yym406 if false { - } else if z.HasExtensions() && z.DecExt(yyv396) { - } else if !yym397 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv396) + } else if z.HasExtensions() && z.DecExt(yyv405) { + } else if !yym406 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv405) } else { - z.DecFallback(yyv396, false) + z.DecFallback(yyv405, false) } } case "networkPluginName": @@ -3104,15 +3175,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv423 := &x.OutOfDiskTransitionFrequency - yym424 := z.DecBinary() - _ = yym424 + yyv432 := &x.OutOfDiskTransitionFrequency + yym433 := z.DecBinary() + _ = yym433 if false { - } else if z.HasExtensions() && z.DecExt(yyv423) { - } else if !yym424 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv423) + } else if z.HasExtensions() && z.DecExt(yyv432) { + } else if !yym433 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv432) } else { - z.DecFallback(yyv423, false) + z.DecFallback(yyv432, false) } } case "nodeIP": @@ -3125,12 +3196,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv426 := &x.NodeLabels - yym427 := z.DecBinary() - _ = yym427 + yyv435 := &x.NodeLabels + yym436 := z.DecBinary() + _ = yym436 if false { } else { - z.F.DecMapStringStringX(yyv426, false, d) + z.F.DecMapStringStringX(yyv435, false, d) } } case "nonMasqueradeCIDR": @@ -3146,9 +3217,9 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.EnableCustomMetrics = bool(r.DecodeBool()) } default: - z.DecStructFieldNotFound(-1, yys347) - } // end switch yys347 - } // end for yyj347 + z.DecStructFieldNotFound(-1, yys356) + } // end switch yys356 + } // end for yyj356 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -3156,16 +3227,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj430 int - var yyb430 bool - var yyhl430 bool = l >= 0 - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + var yyj439 int + var yyb439 bool + var yyhl439 bool = l >= 0 + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3175,13 +3246,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Config = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3189,24 +3260,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv432 := &x.SyncFrequency - yym433 := z.DecBinary() - _ = yym433 + yyv441 := &x.SyncFrequency + yym442 := z.DecBinary() + _ = yym442 if false { - } else if z.HasExtensions() && z.DecExt(yyv432) { - } else if !yym433 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv432) + } else if z.HasExtensions() && z.DecExt(yyv441) { + } else if !yym442 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv441) } else { - z.DecFallback(yyv432, false) + z.DecFallback(yyv441, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3214,24 +3285,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv434 := &x.FileCheckFrequency - yym435 := z.DecBinary() - _ = yym435 + yyv443 := &x.FileCheckFrequency + yym444 := z.DecBinary() + _ = yym444 if false { - } else if z.HasExtensions() && z.DecExt(yyv434) { - } else if !yym435 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv434) + } else if z.HasExtensions() && z.DecExt(yyv443) { + } else if !yym444 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv443) } else { - z.DecFallback(yyv434, false) + z.DecFallback(yyv443, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3239,24 +3310,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv436 := &x.HTTPCheckFrequency - yym437 := z.DecBinary() - _ = yym437 + yyv445 := &x.HTTPCheckFrequency + yym446 := z.DecBinary() + _ = yym446 if false { - } else if z.HasExtensions() && z.DecExt(yyv436) { - } else if !yym437 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv436) + } else if z.HasExtensions() && z.DecExt(yyv445) { + } else if !yym446 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv445) } else { - z.DecFallback(yyv436, false) + z.DecFallback(yyv445, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3266,13 +3337,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3282,13 +3353,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3298,13 +3369,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3314,13 +3385,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3330,13 +3401,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3346,13 +3417,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3362,13 +3433,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3378,13 +3449,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3394,13 +3465,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3410,13 +3481,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3426,13 +3497,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3442,13 +3513,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3458,13 +3529,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3474,13 +3545,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3490,13 +3561,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostNetworkSources = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3506,13 +3577,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostPIDSources = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3522,13 +3593,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostIPCSources = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3538,13 +3609,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = float64(r.DecodeFloat(false)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3554,13 +3625,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3570,13 +3641,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = float32(r.DecodeFloat(true)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3586,13 +3657,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3602,13 +3673,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3616,24 +3687,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv460 := &x.MinimumGCAge - yym461 := z.DecBinary() - _ = yym461 + yyv469 := &x.MinimumGCAge + yym470 := z.DecBinary() + _ = yym470 if false { - } else if z.HasExtensions() && z.DecExt(yyv460) { - } else if !yym461 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv460) + } else if z.HasExtensions() && z.DecExt(yyv469) { + } else if !yym470 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv469) } else { - z.DecFallback(yyv460, false) + z.DecFallback(yyv469, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3643,13 +3714,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3659,13 +3730,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3675,13 +3746,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = uint(r.DecodeUint(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3691,13 +3762,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3707,13 +3778,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3723,13 +3794,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3739,13 +3810,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3755,13 +3826,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3771,13 +3842,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3787,13 +3858,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3801,24 +3872,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv472 := &x.StreamingConnectionIdleTimeout - yym473 := z.DecBinary() - _ = yym473 + yyv481 := &x.StreamingConnectionIdleTimeout + yym482 := z.DecBinary() + _ = yym482 if false { - } else if z.HasExtensions() && z.DecExt(yyv472) { - } else if !yym473 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv472) + } else if z.HasExtensions() && z.DecExt(yyv481) { + } else if !yym482 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv481) } else { - z.DecFallback(yyv472, false) + z.DecFallback(yyv481, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3826,24 +3897,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv474 := &x.NodeStatusUpdateFrequency - yym475 := z.DecBinary() - _ = yym475 + yyv483 := &x.NodeStatusUpdateFrequency + yym484 := z.DecBinary() + _ = yym484 if false { - } else if z.HasExtensions() && z.DecExt(yyv474) { - } else if !yym475 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv474) + } else if z.HasExtensions() && z.DecExt(yyv483) { + } else if !yym484 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv483) } else { - z.DecFallback(yyv474, false) + z.DecFallback(yyv483, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3853,13 +3924,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCHighThresholdPercent = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3869,13 +3940,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCLowThresholdPercent = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3885,13 +3956,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LowDiskSpaceThresholdMB = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3899,24 +3970,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv479 := &x.VolumeStatsAggPeriod - yym480 := z.DecBinary() - _ = yym480 + yyv488 := &x.VolumeStatsAggPeriod + yym489 := z.DecBinary() + _ = yym489 if false { - } else if z.HasExtensions() && z.DecExt(yyv479) { - } else if !yym480 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv479) + } else if z.HasExtensions() && z.DecExt(yyv488) { + } else if !yym489 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv488) } else { - z.DecFallback(yyv479, false) + z.DecFallback(yyv488, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3926,13 +3997,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3942,13 +4013,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3958,13 +4029,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3974,13 +4045,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -3990,13 +4061,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4006,13 +4077,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResourceContainer = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4022,13 +4093,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4038,13 +4109,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4054,13 +4125,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4070,13 +4141,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4086,13 +4157,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemContainer = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4102,13 +4173,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ConfigureCBR0 = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4118,13 +4189,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4134,13 +4205,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4150,13 +4221,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4166,13 +4237,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4182,13 +4253,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4198,13 +4269,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4214,13 +4285,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = uint64(r.DecodeUint(64)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4230,13 +4301,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4246,13 +4317,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4262,13 +4333,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4278,13 +4349,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4294,13 +4365,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4310,13 +4381,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalFlannelOverlay = bool(r.DecodeBool()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4324,24 +4395,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv506 := &x.OutOfDiskTransitionFrequency - yym507 := z.DecBinary() - _ = yym507 + yyv515 := &x.OutOfDiskTransitionFrequency + yym516 := z.DecBinary() + _ = yym516 if false { - } else if z.HasExtensions() && z.DecExt(yyv506) { - } else if !yym507 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv506) + } else if z.HasExtensions() && z.DecExt(yyv515) { + } else if !yym516 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv515) } else { - z.DecFallback(yyv506, false) + z.DecFallback(yyv515, false) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4351,13 +4422,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4365,21 +4436,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv509 := &x.NodeLabels - yym510 := z.DecBinary() - _ = yym510 + yyv518 := &x.NodeLabels + yym519 := z.DecBinary() + _ = yym519 if false { } else { - z.F.DecMapStringStringX(yyv509, false, d) + z.F.DecMapStringStringX(yyv518, false, d) } } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4389,13 +4460,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4406,17 +4477,17 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.EnableCustomMetrics = bool(r.DecodeBool()) } for { - yyj430++ - if yyhl430 { - yyb430 = yyj430 > l + yyj439++ + if yyhl439 { + yyb439 = yyj439 > l } else { - yyb430 = r.CheckBreak() + yyb439 = r.CheckBreak() } - if yyb430 { + if yyb439 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj430-1, "") + z.DecStructFieldNotFound(yyj439-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -4428,36 +4499,36 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym513 := z.EncBinary() - _ = yym513 + yym522 := z.EncBinary() + _ = yym522 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep514 := !z.EncBinary() - yy2arr514 := z.EncBasicHandle().StructToArray - var yyq514 [11]bool - _, _, _ = yysep514, yyq514, yy2arr514 - const yyr514 bool = false - yyq514[0] = x.Kind != "" - yyq514[1] = x.APIVersion != "" - var yynn514 int - if yyr514 || yy2arr514 { + yysep523 := !z.EncBinary() + yy2arr523 := z.EncBasicHandle().StructToArray + var yyq523 [11]bool + _, _, _ = yysep523, yyq523, yy2arr523 + const yyr523 bool = false + yyq523[0] = x.Kind != "" + yyq523[1] = x.APIVersion != "" + var yynn523 int + if yyr523 || yy2arr523 { r.EncodeArrayStart(11) } else { - yynn514 = 9 - for _, b := range yyq514 { + yynn523 = 9 + for _, b := range yyq523 { if b { - yynn514++ + yynn523++ } } - r.EncodeMapStart(yynn514) - yynn514 = 0 + r.EncodeMapStart(yynn523) + yynn523 = 0 } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq514[0] { - yym516 := z.EncBinary() - _ = yym516 + if yyq523[0] { + yym525 := z.EncBinary() + _ = yym525 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -4466,23 +4537,23 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq514[0] { + if yyq523[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym517 := z.EncBinary() - _ = yym517 + yym526 := z.EncBinary() + _ = yym526 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq514[1] { - yym519 := z.EncBinary() - _ = yym519 + if yyq523[1] { + yym528 := z.EncBinary() + _ = yym528 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -4491,22 +4562,22 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq514[1] { + if yyq523[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym520 := z.EncBinary() - _ = yym520 + yym529 := z.EncBinary() + _ = yym529 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym522 := z.EncBinary() - _ = yym522 + yym531 := z.EncBinary() + _ = yym531 if false { } else { r.EncodeInt(int64(x.Port)) @@ -4515,17 +4586,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym523 := z.EncBinary() - _ = yym523 + yym532 := z.EncBinary() + _ = yym532 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym525 := z.EncBinary() - _ = yym525 + yym534 := z.EncBinary() + _ = yym534 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -4534,17 +4605,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym526 := z.EncBinary() - _ = yym526 + yym535 := z.EncBinary() + _ = yym535 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym528 := z.EncBinary() - _ = yym528 + yym537 := z.EncBinary() + _ = yym537 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) @@ -4553,17 +4624,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("algorithmProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym529 := z.EncBinary() - _ = yym529 + yym538 := z.EncBinary() + _ = yym538 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym531 := z.EncBinary() - _ = yym531 + yym540 := z.EncBinary() + _ = yym540 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) @@ -4572,17 +4643,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("policyConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym532 := z.EncBinary() - _ = yym532 + yym541 := z.EncBinary() + _ = yym541 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym534 := z.EncBinary() - _ = yym534 + yym543 := z.EncBinary() + _ = yym543 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -4591,17 +4662,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym535 := z.EncBinary() - _ = yym535 + yym544 := z.EncBinary() + _ = yym544 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym537 := z.EncBinary() - _ = yym537 + yym546 := z.EncBinary() + _ = yym546 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -4610,17 +4681,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym538 := z.EncBinary() - _ = yym538 + yym547 := z.EncBinary() + _ = yym547 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym540 := z.EncBinary() - _ = yym540 + yym549 := z.EncBinary() + _ = yym549 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -4629,17 +4700,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym541 := z.EncBinary() - _ = yym541 + yym550 := z.EncBinary() + _ = yym550 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym543 := z.EncBinary() - _ = yym543 + yym552 := z.EncBinary() + _ = yym552 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) @@ -4648,25 +4719,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym544 := z.EncBinary() - _ = yym544 + yym553 := z.EncBinary() + _ = yym553 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy546 := &x.LeaderElection - yy546.CodecEncodeSelf(e) + yy555 := &x.LeaderElection + yy555.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy547 := &x.LeaderElection - yy547.CodecEncodeSelf(e) + yy556 := &x.LeaderElection + yy556.CodecEncodeSelf(e) } - if yyr514 || yy2arr514 { + if yyr523 || yy2arr523 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -4679,25 +4750,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym548 := z.DecBinary() - _ = yym548 + yym557 := z.DecBinary() + _ = yym557 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct549 := r.ContainerType() - if yyct549 == codecSelferValueTypeMap1234 { - yyl549 := r.ReadMapStart() - if yyl549 == 0 { + yyct558 := r.ContainerType() + if yyct558 == codecSelferValueTypeMap1234 { + yyl558 := r.ReadMapStart() + if yyl558 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl549, d) + x.codecDecodeSelfFromMap(yyl558, d) } - } else if yyct549 == codecSelferValueTypeArray1234 { - yyl549 := r.ReadArrayStart() - if yyl549 == 0 { + } else if yyct558 == codecSelferValueTypeArray1234 { + yyl558 := r.ReadArrayStart() + if yyl558 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl549, d) + x.codecDecodeSelfFromArray(yyl558, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -4709,12 +4780,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys550Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys550Slc - var yyhl550 bool = l >= 0 - for yyj550 := 0; ; yyj550++ { - if yyhl550 { - if yyj550 >= l { + var yys559Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys559Slc + var yyhl559 bool = l >= 0 + for yyj559 := 0; ; yyj559++ { + if yyhl559 { + if yyj559 >= l { break } } else { @@ -4723,10 +4794,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys550Slc = r.DecodeBytes(yys550Slc, true, true) - yys550 := string(yys550Slc) + yys559Slc = r.DecodeBytes(yys559Slc, true, true) + yys559 := string(yys559Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys550 { + switch yys559 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -4791,13 +4862,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv561 := &x.LeaderElection - yyv561.CodecDecodeSelf(d) + yyv570 := &x.LeaderElection + yyv570.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys550) - } // end switch yys550 - } // end for yyj550 + z.DecStructFieldNotFound(-1, yys559) + } // end switch yys559 + } // end for yyj559 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -4805,16 +4876,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj562 int - var yyb562 bool - var yyhl562 bool = l >= 0 - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + var yyj571 int + var yyb571 bool + var yyhl571 bool = l >= 0 + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4824,13 +4895,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4840,13 +4911,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4856,13 +4927,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4872,13 +4943,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4888,13 +4959,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4904,13 +4975,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4920,13 +4991,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4936,13 +5007,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4952,13 +5023,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4968,13 +5039,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4982,21 +5053,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv573 := &x.LeaderElection - yyv573.CodecDecodeSelf(d) + yyv582 := &x.LeaderElection + yyv582.CodecDecodeSelf(d) } for { - yyj562++ - if yyhl562 { - yyb562 = yyj562 > l + yyj571++ + if yyhl571 { + yyb571 = yyj571 > l } else { - yyb562 = r.CheckBreak() + yyb571 = r.CheckBreak() } - if yyb562 { + if yyb571 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj562-1, "") + z.DecStructFieldNotFound(yyj571-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -5008,33 +5079,33 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym574 := z.EncBinary() - _ = yym574 + yym583 := z.EncBinary() + _ = yym583 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep575 := !z.EncBinary() - yy2arr575 := z.EncBasicHandle().StructToArray - var yyq575 [4]bool - _, _, _ = yysep575, yyq575, yy2arr575 - const yyr575 bool = false - var yynn575 int - if yyr575 || yy2arr575 { + yysep584 := !z.EncBinary() + yy2arr584 := z.EncBasicHandle().StructToArray + var yyq584 [4]bool + _, _, _ = yysep584, yyq584, yy2arr584 + const yyr584 bool = false + var yynn584 int + if yyr584 || yy2arr584 { r.EncodeArrayStart(4) } else { - yynn575 = 4 - for _, b := range yyq575 { + yynn584 = 4 + for _, b := range yyq584 { if b { - yynn575++ + yynn584++ } } - r.EncodeMapStart(yynn575) - yynn575 = 0 + r.EncodeMapStart(yynn584) + yynn584 = 0 } - if yyr575 || yy2arr575 { + if yyr584 || yy2arr584 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym577 := z.EncBinary() - _ = yym577 + yym586 := z.EncBinary() + _ = yym586 if false { } else { r.EncodeBool(bool(x.LeaderElect)) @@ -5043,95 +5114,95 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElect")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym578 := z.EncBinary() - _ = yym578 + yym587 := z.EncBinary() + _ = yym587 if false { } else { r.EncodeBool(bool(x.LeaderElect)) } } - if yyr575 || yy2arr575 { + if yyr584 || yy2arr584 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy580 := &x.LeaseDuration - yym581 := z.EncBinary() - _ = yym581 + yy589 := &x.LeaseDuration + yym590 := z.EncBinary() + _ = yym590 if false { - } else if z.HasExtensions() && z.EncExt(yy580) { - } else if !yym581 && z.IsJSONHandle() { - z.EncJSONMarshal(yy580) + } else if z.HasExtensions() && z.EncExt(yy589) { + } else if !yym590 && z.IsJSONHandle() { + z.EncJSONMarshal(yy589) } else { - z.EncFallback(yy580) + z.EncFallback(yy589) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy582 := &x.LeaseDuration - yym583 := z.EncBinary() - _ = yym583 + yy591 := &x.LeaseDuration + yym592 := z.EncBinary() + _ = yym592 if false { - } else if z.HasExtensions() && z.EncExt(yy582) { - } else if !yym583 && z.IsJSONHandle() { - z.EncJSONMarshal(yy582) + } else if z.HasExtensions() && z.EncExt(yy591) { + } else if !yym592 && z.IsJSONHandle() { + z.EncJSONMarshal(yy591) } else { - z.EncFallback(yy582) + z.EncFallback(yy591) } } - if yyr575 || yy2arr575 { + if yyr584 || yy2arr584 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy585 := &x.RenewDeadline - yym586 := z.EncBinary() - _ = yym586 + yy594 := &x.RenewDeadline + yym595 := z.EncBinary() + _ = yym595 if false { - } else if z.HasExtensions() && z.EncExt(yy585) { - } else if !yym586 && z.IsJSONHandle() { - z.EncJSONMarshal(yy585) + } else if z.HasExtensions() && z.EncExt(yy594) { + } else if !yym595 && z.IsJSONHandle() { + z.EncJSONMarshal(yy594) } else { - z.EncFallback(yy585) + z.EncFallback(yy594) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy587 := &x.RenewDeadline - yym588 := z.EncBinary() - _ = yym588 + yy596 := &x.RenewDeadline + yym597 := z.EncBinary() + _ = yym597 if false { - } else if z.HasExtensions() && z.EncExt(yy587) { - } else if !yym588 && z.IsJSONHandle() { - z.EncJSONMarshal(yy587) + } else if z.HasExtensions() && z.EncExt(yy596) { + } else if !yym597 && z.IsJSONHandle() { + z.EncJSONMarshal(yy596) } else { - z.EncFallback(yy587) + z.EncFallback(yy596) } } - if yyr575 || yy2arr575 { + if yyr584 || yy2arr584 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy590 := &x.RetryPeriod - yym591 := z.EncBinary() - _ = yym591 + yy599 := &x.RetryPeriod + yym600 := z.EncBinary() + _ = yym600 if false { - } else if z.HasExtensions() && z.EncExt(yy590) { - } else if !yym591 && z.IsJSONHandle() { - z.EncJSONMarshal(yy590) + } else if z.HasExtensions() && z.EncExt(yy599) { + } else if !yym600 && z.IsJSONHandle() { + z.EncJSONMarshal(yy599) } else { - z.EncFallback(yy590) + z.EncFallback(yy599) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy592 := &x.RetryPeriod - yym593 := z.EncBinary() - _ = yym593 + yy601 := &x.RetryPeriod + yym602 := z.EncBinary() + _ = yym602 if false { - } else if z.HasExtensions() && z.EncExt(yy592) { - } else if !yym593 && z.IsJSONHandle() { - z.EncJSONMarshal(yy592) + } else if z.HasExtensions() && z.EncExt(yy601) { + } else if !yym602 && z.IsJSONHandle() { + z.EncJSONMarshal(yy601) } else { - z.EncFallback(yy592) + z.EncFallback(yy601) } } - if yyr575 || yy2arr575 { + if yyr584 || yy2arr584 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -5144,25 +5215,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym594 := z.DecBinary() - _ = yym594 + yym603 := z.DecBinary() + _ = yym603 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct595 := r.ContainerType() - if yyct595 == codecSelferValueTypeMap1234 { - yyl595 := r.ReadMapStart() - if yyl595 == 0 { + yyct604 := r.ContainerType() + if yyct604 == codecSelferValueTypeMap1234 { + yyl604 := r.ReadMapStart() + if yyl604 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl595, d) + x.codecDecodeSelfFromMap(yyl604, d) } - } else if yyct595 == codecSelferValueTypeArray1234 { - yyl595 := r.ReadArrayStart() - if yyl595 == 0 { + } else if yyct604 == codecSelferValueTypeArray1234 { + yyl604 := r.ReadArrayStart() + if yyl604 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl595, d) + x.codecDecodeSelfFromArray(yyl604, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -5174,12 +5245,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys596Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys596Slc - var yyhl596 bool = l >= 0 - for yyj596 := 0; ; yyj596++ { - if yyhl596 { - if yyj596 >= l { + var yys605Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys605Slc + var yyhl605 bool = l >= 0 + for yyj605 := 0; ; yyj605++ { + if yyhl605 { + if yyj605 >= l { break } } else { @@ -5188,10 +5259,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys596Slc = r.DecodeBytes(yys596Slc, true, true) - yys596 := string(yys596Slc) + yys605Slc = r.DecodeBytes(yys605Slc, true, true) + yys605 := string(yys605Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys596 { + switch yys605 { case "leaderElect": if r.TryDecodeAsNil() { x.LeaderElect = false @@ -5202,51 +5273,51 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv598 := &x.LeaseDuration - yym599 := z.DecBinary() - _ = yym599 + yyv607 := &x.LeaseDuration + yym608 := z.DecBinary() + _ = yym608 if false { - } else if z.HasExtensions() && z.DecExt(yyv598) { - } else if !yym599 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv598) + } else if z.HasExtensions() && z.DecExt(yyv607) { + } else if !yym608 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv607) } else { - z.DecFallback(yyv598, false) + z.DecFallback(yyv607, false) } } case "renewDeadline": if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv600 := &x.RenewDeadline - yym601 := z.DecBinary() - _ = yym601 + yyv609 := &x.RenewDeadline + yym610 := z.DecBinary() + _ = yym610 if false { - } else if z.HasExtensions() && z.DecExt(yyv600) { - } else if !yym601 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv600) + } else if z.HasExtensions() && z.DecExt(yyv609) { + } else if !yym610 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv609) } else { - z.DecFallback(yyv600, false) + z.DecFallback(yyv609, false) } } case "retryPeriod": if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv602 := &x.RetryPeriod - yym603 := z.DecBinary() - _ = yym603 + yyv611 := &x.RetryPeriod + yym612 := z.DecBinary() + _ = yym612 if false { - } else if z.HasExtensions() && z.DecExt(yyv602) { - } else if !yym603 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv602) + } else if z.HasExtensions() && z.DecExt(yyv611) { + } else if !yym612 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv611) } else { - z.DecFallback(yyv602, false) + z.DecFallback(yyv611, false) } } default: - z.DecStructFieldNotFound(-1, yys596) - } // end switch yys596 - } // end for yyj596 + z.DecStructFieldNotFound(-1, yys605) + } // end switch yys605 + } // end for yyj605 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -5254,16 +5325,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj604 int - var yyb604 bool - var yyhl604 bool = l >= 0 - yyj604++ - if yyhl604 { - yyb604 = yyj604 > l + var yyj613 int + var yyb613 bool + var yyhl613 bool = l >= 0 + yyj613++ + if yyhl613 { + yyb613 = yyj613 > l } else { - yyb604 = r.CheckBreak() + yyb613 = r.CheckBreak() } - if yyb604 { + if yyb613 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5273,13 +5344,13 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } else { x.LeaderElect = bool(r.DecodeBool()) } - yyj604++ - if yyhl604 { - yyb604 = yyj604 > l + yyj613++ + if yyhl613 { + yyb613 = yyj613 > l } else { - yyb604 = r.CheckBreak() + yyb613 = r.CheckBreak() } - if yyb604 { + if yyb613 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5287,24 +5358,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv606 := &x.LeaseDuration - yym607 := z.DecBinary() - _ = yym607 + yyv615 := &x.LeaseDuration + yym616 := z.DecBinary() + _ = yym616 if false { - } else if z.HasExtensions() && z.DecExt(yyv606) { - } else if !yym607 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv606) + } else if z.HasExtensions() && z.DecExt(yyv615) { + } else if !yym616 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv615) } else { - z.DecFallback(yyv606, false) + z.DecFallback(yyv615, false) } } - yyj604++ - if yyhl604 { - yyb604 = yyj604 > l + yyj613++ + if yyhl613 { + yyb613 = yyj613 > l } else { - yyb604 = r.CheckBreak() + yyb613 = r.CheckBreak() } - if yyb604 { + if yyb613 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5312,24 +5383,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv608 := &x.RenewDeadline - yym609 := z.DecBinary() - _ = yym609 + yyv617 := &x.RenewDeadline + yym618 := z.DecBinary() + _ = yym618 if false { - } else if z.HasExtensions() && z.DecExt(yyv608) { - } else if !yym609 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv608) + } else if z.HasExtensions() && z.DecExt(yyv617) { + } else if !yym618 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv617) } else { - z.DecFallback(yyv608, false) + z.DecFallback(yyv617, false) } } - yyj604++ - if yyhl604 { - yyb604 = yyj604 > l + yyj613++ + if yyhl613 { + yyb613 = yyj613 > l } else { - yyb604 = r.CheckBreak() + yyb613 = r.CheckBreak() } - if yyb604 { + if yyb613 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5337,29 +5408,29 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv610 := &x.RetryPeriod - yym611 := z.DecBinary() - _ = yym611 + yyv619 := &x.RetryPeriod + yym620 := z.DecBinary() + _ = yym620 if false { - } else if z.HasExtensions() && z.DecExt(yyv610) { - } else if !yym611 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv610) + } else if z.HasExtensions() && z.DecExt(yyv619) { + } else if !yym620 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv619) } else { - z.DecFallback(yyv610, false) + z.DecFallback(yyv619, false) } } for { - yyj604++ - if yyhl604 { - yyb604 = yyj604 > l + yyj613++ + if yyhl613 { + yyb613 = yyj613 > l } else { - yyb604 = r.CheckBreak() + yyb613 = r.CheckBreak() } - if yyb604 { + if yyb613 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj604-1, "") + z.DecStructFieldNotFound(yyj613-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index e7cb029627c..2d70b04f695 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -31,6 +31,9 @@ type KubeProxyConfiguration struct { HealthzPort int `json:"healthzPort"` // hostnameOverride, if non-empty, will be used as the identity instead of the actual hostname. HostnameOverride string `json:"hostnameOverride"` + // iptablesMasqueradeBit is the bit of the iptables fwmark space to use for SNAT if using + // the pure iptables proxy mode. Values must be within the range [0, 31]. + IPTablesMasqueradeBit *int `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` diff --git a/pkg/apis/componentconfig/v1alpha1/conversion_generated.go b/pkg/apis/componentconfig/v1alpha1/conversion_generated.go index c11acb52ef6..b4bff5c816d 100644 --- a/pkg/apis/componentconfig/v1alpha1/conversion_generated.go +++ b/pkg/apis/componentconfig/v1alpha1/conversion_generated.go @@ -37,6 +37,12 @@ func autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyCon out.HealthzBindAddress = in.HealthzBindAddress out.HealthzPort = int32(in.HealthzPort) out.HostnameOverride = in.HostnameOverride + if in.IPTablesMasqueradeBit != nil { + out.IPTablesMasqueradeBit = new(int32) + *out.IPTablesMasqueradeBit = int32(*in.IPTablesMasqueradeBit) + } else { + out.IPTablesMasqueradeBit = nil + } if err := s.Convert(&in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, 0); err != nil { return err } @@ -127,6 +133,12 @@ func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyCon out.HealthzBindAddress = in.HealthzBindAddress out.HealthzPort = int(in.HealthzPort) out.HostnameOverride = in.HostnameOverride + if in.IPTablesMasqueradeBit != nil { + out.IPTablesMasqueradeBit = new(int) + *out.IPTablesMasqueradeBit = int(*in.IPTablesMasqueradeBit) + } else { + out.IPTablesMasqueradeBit = nil + } if err := s.Convert(&in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, 0); err != nil { return err } diff --git a/pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go b/pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go index 0012e90414e..92849134260 100644 --- a/pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go +++ b/pkg/apis/componentconfig/v1alpha1/deep_copy_generated.go @@ -43,6 +43,12 @@ func deepCopy_v1alpha1_KubeProxyConfiguration(in KubeProxyConfiguration, out *Ku out.HealthzBindAddress = in.HealthzBindAddress out.HealthzPort = in.HealthzPort out.HostnameOverride = in.HostnameOverride + if in.IPTablesMasqueradeBit != nil { + out.IPTablesMasqueradeBit = new(int32) + *out.IPTablesMasqueradeBit = *in.IPTablesMasqueradeBit + } else { + out.IPTablesMasqueradeBit = nil + } if err := deepCopy_unversioned_Duration(in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, c); err != nil { return err } diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 26eef1d47b6..af35c7d3884 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -55,6 +55,10 @@ func addDefaultingFuncs(scheme *runtime.Scheme) { if obj.ConntrackMax == 0 { obj.ConntrackMax = 256 * 1024 // 4x default (64k) } + if obj.IPTablesMasqueradeBit == nil { + temp := int32(14) + obj.IPTablesMasqueradeBit = &temp + } if obj.ConntrackTCPEstablishedTimeout == zero { obj.ConntrackTCPEstablishedTimeout = unversioned.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default) } diff --git a/pkg/apis/componentconfig/v1alpha1/types.generated.go b/pkg/apis/componentconfig/v1alpha1/types.generated.go index 1326d7526be..b4a54592f60 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.generated.go +++ b/pkg/apis/componentconfig/v1alpha1/types.generated.go @@ -81,16 +81,16 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [17]bool + var yyq2 [18]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false yyq2[0] = x.Kind != "" yyq2[1] = x.APIVersion != "" var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(17) + r.EncodeArrayStart(18) } else { - yynn2 = 15 + yynn2 = 16 for _, b := range yyq2 { if b { yynn2++ @@ -227,35 +227,64 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy22 := &x.IPTablesSyncPeriod - yym23 := z.EncBinary() - _ = yym23 - if false { - } else if z.HasExtensions() && z.EncExt(yy22) { - } else if !yym23 && z.IsJSONHandle() { - z.EncJSONMarshal(yy22) + if x.IPTablesMasqueradeBit == nil { + r.EncodeNil() } else { - z.EncFallback(yy22) + yy22 := *x.IPTablesMasqueradeBit + yym23 := z.EncBinary() + _ = yym23 + if false { + } else { + r.EncodeInt(int64(yy22)) + } + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.IPTablesMasqueradeBit == nil { + r.EncodeNil() + } else { + yy24 := *x.IPTablesMasqueradeBit + yym25 := z.EncBinary() + _ = yym25 + if false { + } else { + r.EncodeInt(int64(yy24)) + } + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy27 := &x.IPTablesSyncPeriod + yym28 := z.EncBinary() + _ = yym28 + if false { + } else if z.HasExtensions() && z.EncExt(yy27) { + } else if !yym28 && z.IsJSONHandle() { + z.EncJSONMarshal(yy27) + } else { + z.EncFallback(yy27) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesSyncPeriodSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy24 := &x.IPTablesSyncPeriod - yym25 := z.EncBinary() - _ = yym25 + yy29 := &x.IPTablesSyncPeriod + yym30 := z.EncBinary() + _ = yym30 if false { - } else if z.HasExtensions() && z.EncExt(yy24) { - } else if !yym25 && z.IsJSONHandle() { - z.EncJSONMarshal(yy24) + } else if z.HasExtensions() && z.EncExt(yy29) { + } else if !yym30 && z.IsJSONHandle() { + z.EncJSONMarshal(yy29) } else { - z.EncFallback(yy24) + z.EncFallback(yy29) } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym27 := z.EncBinary() - _ = yym27 + yym32 := z.EncBinary() + _ = yym32 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeconfigPath)) @@ -264,8 +293,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeconfigPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym28 := z.EncBinary() - _ = yym28 + yym33 := z.EncBinary() + _ = yym33 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeconfigPath)) @@ -273,8 +302,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym30 := z.EncBinary() - _ = yym30 + yym35 := z.EncBinary() + _ = yym35 if false { } else { r.EncodeBool(bool(x.MasqueradeAll)) @@ -283,8 +312,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("masqueradeAll")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym31 := z.EncBinary() - _ = yym31 + yym36 := z.EncBinary() + _ = yym36 if false { } else { r.EncodeBool(bool(x.MasqueradeAll)) @@ -292,8 +321,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym33 := z.EncBinary() - _ = yym33 + yym38 := z.EncBinary() + _ = yym38 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Master)) @@ -302,8 +331,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("master")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym34 := z.EncBinary() - _ = yym34 + yym39 := z.EncBinary() + _ = yym39 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Master)) @@ -314,12 +343,12 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.OOMScoreAdj == nil { r.EncodeNil() } else { - yy36 := *x.OOMScoreAdj - yym37 := z.EncBinary() - _ = yym37 + yy41 := *x.OOMScoreAdj + yym42 := z.EncBinary() + _ = yym42 if false { } else { - r.EncodeInt(int64(yy36)) + r.EncodeInt(int64(yy41)) } } } else { @@ -329,12 +358,12 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.OOMScoreAdj == nil { r.EncodeNil() } else { - yy38 := *x.OOMScoreAdj - yym39 := z.EncBinary() - _ = yym39 + yy43 := *x.OOMScoreAdj + yym44 := z.EncBinary() + _ = yym44 if false { } else { - r.EncodeInt(int64(yy38)) + r.EncodeInt(int64(yy43)) } } } @@ -349,8 +378,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym42 := z.EncBinary() - _ = yym42 + yym47 := z.EncBinary() + _ = yym47 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PortRange)) @@ -359,8 +388,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("portRange")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym43 := z.EncBinary() - _ = yym43 + yym48 := z.EncBinary() + _ = yym48 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PortRange)) @@ -368,8 +397,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym45 := z.EncBinary() - _ = yym45 + yym50 := z.EncBinary() + _ = yym50 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) @@ -378,8 +407,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceContainer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym46 := z.EncBinary() - _ = yym46 + yym51 := z.EncBinary() + _ = yym51 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceContainer)) @@ -387,35 +416,35 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy48 := &x.UDPIdleTimeout - yym49 := z.EncBinary() - _ = yym49 + yy53 := &x.UDPIdleTimeout + yym54 := z.EncBinary() + _ = yym54 if false { - } else if z.HasExtensions() && z.EncExt(yy48) { - } else if !yym49 && z.IsJSONHandle() { - z.EncJSONMarshal(yy48) + } else if z.HasExtensions() && z.EncExt(yy53) { + } else if !yym54 && z.IsJSONHandle() { + z.EncJSONMarshal(yy53) } else { - z.EncFallback(yy48) + z.EncFallback(yy53) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("udpTimeoutMilliseconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy50 := &x.UDPIdleTimeout - yym51 := z.EncBinary() - _ = yym51 + yy55 := &x.UDPIdleTimeout + yym56 := z.EncBinary() + _ = yym56 if false { - } else if z.HasExtensions() && z.EncExt(yy50) { - } else if !yym51 && z.IsJSONHandle() { - z.EncJSONMarshal(yy50) + } else if z.HasExtensions() && z.EncExt(yy55) { + } else if !yym56 && z.IsJSONHandle() { + z.EncJSONMarshal(yy55) } else { - z.EncFallback(yy50) + z.EncFallback(yy55) } } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym53 := z.EncBinary() - _ = yym53 + yym58 := z.EncBinary() + _ = yym58 if false { } else { r.EncodeInt(int64(x.ConntrackMax)) @@ -424,8 +453,8 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conntrackMax")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym54 := z.EncBinary() - _ = yym54 + yym59 := z.EncBinary() + _ = yym59 if false { } else { r.EncodeInt(int64(x.ConntrackMax)) @@ -433,29 +462,29 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy56 := &x.ConntrackTCPEstablishedTimeout - yym57 := z.EncBinary() - _ = yym57 + yy61 := &x.ConntrackTCPEstablishedTimeout + yym62 := z.EncBinary() + _ = yym62 if false { - } else if z.HasExtensions() && z.EncExt(yy56) { - } else if !yym57 && z.IsJSONHandle() { - z.EncJSONMarshal(yy56) + } else if z.HasExtensions() && z.EncExt(yy61) { + } else if !yym62 && z.IsJSONHandle() { + z.EncJSONMarshal(yy61) } else { - z.EncFallback(yy56) + z.EncFallback(yy61) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conntrackTCPEstablishedTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy58 := &x.ConntrackTCPEstablishedTimeout - yym59 := z.EncBinary() - _ = yym59 + yy63 := &x.ConntrackTCPEstablishedTimeout + yym64 := z.EncBinary() + _ = yym64 if false { - } else if z.HasExtensions() && z.EncExt(yy58) { - } else if !yym59 && z.IsJSONHandle() { - z.EncJSONMarshal(yy58) + } else if z.HasExtensions() && z.EncExt(yy63) { + } else if !yym64 && z.IsJSONHandle() { + z.EncJSONMarshal(yy63) } else { - z.EncFallback(yy58) + z.EncFallback(yy63) } } if yyr2 || yy2arr2 { @@ -471,25 +500,25 @@ func (x *KubeProxyConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym60 := z.DecBinary() - _ = yym60 + yym65 := z.DecBinary() + _ = yym65 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct61 := r.ContainerType() - if yyct61 == codecSelferValueTypeMap1234 { - yyl61 := r.ReadMapStart() - if yyl61 == 0 { + yyct66 := r.ContainerType() + if yyct66 == codecSelferValueTypeMap1234 { + yyl66 := r.ReadMapStart() + if yyl66 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl61, d) + x.codecDecodeSelfFromMap(yyl66, d) } - } else if yyct61 == codecSelferValueTypeArray1234 { - yyl61 := r.ReadArrayStart() - if yyl61 == 0 { + } else if yyct66 == codecSelferValueTypeArray1234 { + yyl66 := r.ReadArrayStart() + if yyl66 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl61, d) + x.codecDecodeSelfFromArray(yyl66, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -501,12 +530,12 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys62Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys62Slc - var yyhl62 bool = l >= 0 - for yyj62 := 0; ; yyj62++ { - if yyhl62 { - if yyj62 >= l { + var yys67Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys67Slc + var yyhl67 bool = l >= 0 + for yyj67 := 0; ; yyj67++ { + if yyhl67 { + if yyj67 >= l { break } } else { @@ -515,10 +544,10 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys62Slc = r.DecodeBytes(yys62Slc, true, true) - yys62 := string(yys62Slc) + yys67Slc = r.DecodeBytes(yys67Slc, true, true) + yys67 := string(yys67Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys62 { + switch yys67 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -555,19 +584,35 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } + case "iptablesMasqueradeBit": + if r.TryDecodeAsNil() { + if x.IPTablesMasqueradeBit != nil { + x.IPTablesMasqueradeBit = nil + } + } else { + if x.IPTablesMasqueradeBit == nil { + x.IPTablesMasqueradeBit = new(int32) + } + yym75 := z.DecBinary() + _ = yym75 + if false { + } else { + *((*int32)(x.IPTablesMasqueradeBit)) = int32(r.DecodeInt(32)) + } + } case "iptablesSyncPeriodSeconds": if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv69 := &x.IPTablesSyncPeriod - yym70 := z.DecBinary() - _ = yym70 + yyv76 := &x.IPTablesSyncPeriod + yym77 := z.DecBinary() + _ = yym77 if false { - } else if z.HasExtensions() && z.DecExt(yyv69) { - } else if !yym70 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv69) + } else if z.HasExtensions() && z.DecExt(yyv76) { + } else if !yym77 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv76) } else { - z.DecFallback(yyv69, false) + z.DecFallback(yyv76, false) } } case "kubeconfigPath": @@ -597,8 +642,8 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int32) } - yym75 := z.DecBinary() - _ = yym75 + yym82 := z.DecBinary() + _ = yym82 if false { } else { *((*int32)(x.OOMScoreAdj)) = int32(r.DecodeInt(32)) @@ -626,15 +671,15 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv79 := &x.UDPIdleTimeout - yym80 := z.DecBinary() - _ = yym80 + yyv86 := &x.UDPIdleTimeout + yym87 := z.DecBinary() + _ = yym87 if false { - } else if z.HasExtensions() && z.DecExt(yyv79) { - } else if !yym80 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv79) + } else if z.HasExtensions() && z.DecExt(yyv86) { + } else if !yym87 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv86) } else { - z.DecFallback(yyv79, false) + z.DecFallback(yyv86, false) } } case "conntrackMax": @@ -647,21 +692,21 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} } else { - yyv82 := &x.ConntrackTCPEstablishedTimeout - yym83 := z.DecBinary() - _ = yym83 + yyv89 := &x.ConntrackTCPEstablishedTimeout + yym90 := z.DecBinary() + _ = yym90 if false { - } else if z.HasExtensions() && z.DecExt(yyv82) { - } else if !yym83 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv82) + } else if z.HasExtensions() && z.DecExt(yyv89) { + } else if !yym90 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv89) } else { - z.DecFallback(yyv82, false) + z.DecFallback(yyv89, false) } } default: - z.DecStructFieldNotFound(-1, yys62) - } // end switch yys62 - } // end for yyj62 + z.DecStructFieldNotFound(-1, yys67) + } // end switch yys67 + } // end for yyj67 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -669,16 +714,16 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj84 int - var yyb84 bool - var yyhl84 bool = l >= 0 - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + var yyj91 int + var yyb91 bool + var yyhl91 bool = l >= 0 + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -688,13 +733,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Kind = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -704,13 +749,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.APIVersion = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -720,13 +765,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.BindAddress = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -736,13 +781,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -752,13 +797,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -768,13 +813,39 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HostnameOverride = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + if x.IPTablesMasqueradeBit != nil { + x.IPTablesMasqueradeBit = nil + } + } else { + if x.IPTablesMasqueradeBit == nil { + x.IPTablesMasqueradeBit = new(int32) + } + yym99 := z.DecBinary() + _ = yym99 + if false { + } else { + *((*int32)(x.IPTablesMasqueradeBit)) = int32(r.DecodeInt(32)) + } + } + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l + } else { + yyb91 = r.CheckBreak() + } + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -782,24 +853,24 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv91 := &x.IPTablesSyncPeriod - yym92 := z.DecBinary() - _ = yym92 + yyv100 := &x.IPTablesSyncPeriod + yym101 := z.DecBinary() + _ = yym101 if false { - } else if z.HasExtensions() && z.DecExt(yyv91) { - } else if !yym92 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv91) + } else if z.HasExtensions() && z.DecExt(yyv100) { + } else if !yym101 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv100) } else { - z.DecFallback(yyv91, false) + z.DecFallback(yyv100, false) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -809,13 +880,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.KubeconfigPath = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -825,13 +896,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.MasqueradeAll = bool(r.DecodeBool()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -841,13 +912,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Master = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -860,20 +931,20 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int32) } - yym97 := z.DecBinary() - _ = yym97 + yym106 := z.DecBinary() + _ = yym106 if false { } else { *((*int32)(x.OOMScoreAdj)) = int32(r.DecodeInt(32)) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -883,13 +954,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Mode = ProxyMode(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -899,13 +970,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.PortRange = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -915,13 +986,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ResourceContainer = string(r.DecodeString()) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -929,24 +1000,24 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv101 := &x.UDPIdleTimeout - yym102 := z.DecBinary() - _ = yym102 + yyv110 := &x.UDPIdleTimeout + yym111 := z.DecBinary() + _ = yym111 if false { - } else if z.HasExtensions() && z.DecExt(yyv101) { - } else if !yym102 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv101) + } else if z.HasExtensions() && z.DecExt(yyv110) { + } else if !yym111 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv110) } else { - z.DecFallback(yyv101, false) + z.DecFallback(yyv110, false) } } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -956,13 +1027,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ConntrackMax = int32(r.DecodeInt(32)) } - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -970,29 +1041,29 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} } else { - yyv104 := &x.ConntrackTCPEstablishedTimeout - yym105 := z.DecBinary() - _ = yym105 + yyv113 := &x.ConntrackTCPEstablishedTimeout + yym114 := z.DecBinary() + _ = yym114 if false { - } else if z.HasExtensions() && z.DecExt(yyv104) { - } else if !yym105 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv104) + } else if z.HasExtensions() && z.DecExt(yyv113) { + } else if !yym114 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv113) } else { - z.DecFallback(yyv104, false) + z.DecFallback(yyv113, false) } } for { - yyj84++ - if yyhl84 { - yyb84 = yyj84 > l + yyj91++ + if yyhl91 { + yyb91 = yyj91 > l } else { - yyb84 = r.CheckBreak() + yyb91 = r.CheckBreak() } - if yyb84 { + if yyb91 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj84-1, "") + z.DecStructFieldNotFound(yyj91-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -1001,8 +1072,8 @@ func (x ProxyMode) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym106 := z.EncBinary() - _ = yym106 + yym115 := z.EncBinary() + _ = yym115 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -1014,8 +1085,8 @@ func (x *ProxyMode) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym107 := z.DecBinary() - _ = yym107 + yym116 := z.DecBinary() + _ = yym116 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -1030,36 +1101,36 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym108 := z.EncBinary() - _ = yym108 + yym117 := z.EncBinary() + _ = yym117 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep109 := !z.EncBinary() - yy2arr109 := z.EncBasicHandle().StructToArray - var yyq109 [11]bool - _, _, _ = yysep109, yyq109, yy2arr109 - const yyr109 bool = false - yyq109[0] = x.Kind != "" - yyq109[1] = x.APIVersion != "" - var yynn109 int - if yyr109 || yy2arr109 { + yysep118 := !z.EncBinary() + yy2arr118 := z.EncBasicHandle().StructToArray + var yyq118 [11]bool + _, _, _ = yysep118, yyq118, yy2arr118 + const yyr118 bool = false + yyq118[0] = x.Kind != "" + yyq118[1] = x.APIVersion != "" + var yynn118 int + if yyr118 || yy2arr118 { r.EncodeArrayStart(11) } else { - yynn109 = 9 - for _, b := range yyq109 { + yynn118 = 9 + for _, b := range yyq118 { if b { - yynn109++ + yynn118++ } } - r.EncodeMapStart(yynn109) - yynn109 = 0 + r.EncodeMapStart(yynn118) + yynn118 = 0 } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[0] { - yym111 := z.EncBinary() - _ = yym111 + if yyq118[0] { + yym120 := z.EncBinary() + _ = yym120 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -1068,23 +1139,23 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[0] { + if yyq118[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym112 := z.EncBinary() - _ = yym112 + yym121 := z.EncBinary() + _ = yym121 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq109[1] { - yym114 := z.EncBinary() - _ = yym114 + if yyq118[1] { + yym123 := z.EncBinary() + _ = yym123 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -1093,22 +1164,22 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq109[1] { + if yyq118[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym115 := z.EncBinary() - _ = yym115 + yym124 := z.EncBinary() + _ = yym124 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym117 := z.EncBinary() - _ = yym117 + yym126 := z.EncBinary() + _ = yym126 if false { } else { r.EncodeInt(int64(x.Port)) @@ -1117,17 +1188,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym118 := z.EncBinary() - _ = yym118 + yym127 := z.EncBinary() + _ = yym127 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym120 := z.EncBinary() - _ = yym120 + yym129 := z.EncBinary() + _ = yym129 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -1136,17 +1207,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym121 := z.EncBinary() - _ = yym121 + yym130 := z.EncBinary() + _ = yym130 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym123 := z.EncBinary() - _ = yym123 + yym132 := z.EncBinary() + _ = yym132 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) @@ -1155,17 +1226,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("algorithmProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym124 := z.EncBinary() - _ = yym124 + yym133 := z.EncBinary() + _ = yym133 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym126 := z.EncBinary() - _ = yym126 + yym135 := z.EncBinary() + _ = yym135 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) @@ -1174,24 +1245,24 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("policyConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym127 := z.EncBinary() - _ = yym127 + yym136 := z.EncBinary() + _ = yym136 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.EnableProfiling == nil { r.EncodeNil() } else { - yy129 := *x.EnableProfiling - yym130 := z.EncBinary() - _ = yym130 + yy138 := *x.EnableProfiling + yym139 := z.EncBinary() + _ = yym139 if false { } else { - r.EncodeBool(bool(yy129)) + r.EncodeBool(bool(yy138)) } } } else { @@ -1201,19 +1272,19 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.EnableProfiling == nil { r.EncodeNil() } else { - yy131 := *x.EnableProfiling - yym132 := z.EncBinary() - _ = yym132 + yy140 := *x.EnableProfiling + yym141 := z.EncBinary() + _ = yym141 if false { } else { - r.EncodeBool(bool(yy131)) + r.EncodeBool(bool(yy140)) } } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym134 := z.EncBinary() - _ = yym134 + yym143 := z.EncBinary() + _ = yym143 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -1222,17 +1293,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym135 := z.EncBinary() - _ = yym135 + yym144 := z.EncBinary() + _ = yym144 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym137 := z.EncBinary() - _ = yym137 + yym146 := z.EncBinary() + _ = yym146 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -1241,17 +1312,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym138 := z.EncBinary() - _ = yym138 + yym147 := z.EncBinary() + _ = yym147 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym140 := z.EncBinary() - _ = yym140 + yym149 := z.EncBinary() + _ = yym149 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) @@ -1260,25 +1331,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym141 := z.EncBinary() - _ = yym141 + yym150 := z.EncBinary() + _ = yym150 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy143 := &x.LeaderElection - yy143.CodecEncodeSelf(e) + yy152 := &x.LeaderElection + yy152.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy144 := &x.LeaderElection - yy144.CodecEncodeSelf(e) + yy153 := &x.LeaderElection + yy153.CodecEncodeSelf(e) } - if yyr109 || yy2arr109 { + if yyr118 || yy2arr118 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -1291,25 +1362,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym145 := z.DecBinary() - _ = yym145 + yym154 := z.DecBinary() + _ = yym154 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct146 := r.ContainerType() - if yyct146 == codecSelferValueTypeMap1234 { - yyl146 := r.ReadMapStart() - if yyl146 == 0 { + yyct155 := r.ContainerType() + if yyct155 == codecSelferValueTypeMap1234 { + yyl155 := r.ReadMapStart() + if yyl155 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl146, d) + x.codecDecodeSelfFromMap(yyl155, d) } - } else if yyct146 == codecSelferValueTypeArray1234 { - yyl146 := r.ReadArrayStart() - if yyl146 == 0 { + } else if yyct155 == codecSelferValueTypeArray1234 { + yyl155 := r.ReadArrayStart() + if yyl155 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl146, d) + x.codecDecodeSelfFromArray(yyl155, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -1321,12 +1392,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys147Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys147Slc - var yyhl147 bool = l >= 0 - for yyj147 := 0; ; yyj147++ { - if yyhl147 { - if yyj147 >= l { + var yys156Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys156Slc + var yyhl156 bool = l >= 0 + for yyj156 := 0; ; yyj156++ { + if yyhl156 { + if yyj156 >= l { break } } else { @@ -1335,10 +1406,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys147Slc = r.DecodeBytes(yys147Slc, true, true) - yys147 := string(yys147Slc) + yys156Slc = r.DecodeBytes(yys156Slc, true, true) + yys156 := string(yys156Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys147 { + switch yys156 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -1384,8 +1455,8 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if x.EnableProfiling == nil { x.EnableProfiling = new(bool) } - yym155 := z.DecBinary() - _ = yym155 + yym164 := z.DecBinary() + _ = yym164 if false { } else { *((*bool)(x.EnableProfiling)) = r.DecodeBool() @@ -1413,13 +1484,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv159 := &x.LeaderElection - yyv159.CodecDecodeSelf(d) + yyv168 := &x.LeaderElection + yyv168.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys147) - } // end switch yys147 - } // end for yyj147 + z.DecStructFieldNotFound(-1, yys156) + } // end switch yys156 + } // end for yyj156 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -1427,16 +1498,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj160 int - var yyb160 bool - var yyhl160 bool = l >= 0 - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + var yyj169 int + var yyb169 bool + var yyhl169 bool = l >= 0 + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1446,13 +1517,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1462,13 +1533,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1478,13 +1549,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1494,13 +1565,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1510,13 +1581,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1526,13 +1597,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1545,20 +1616,20 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if x.EnableProfiling == nil { x.EnableProfiling = new(bool) } - yym168 := z.DecBinary() - _ = yym168 + yym177 := z.DecBinary() + _ = yym177 if false { } else { *((*bool)(x.EnableProfiling)) = r.DecodeBool() } } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1568,13 +1639,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1584,13 +1655,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1600,13 +1671,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1614,21 +1685,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv172 := &x.LeaderElection - yyv172.CodecDecodeSelf(d) + yyv181 := &x.LeaderElection + yyv181.CodecDecodeSelf(d) } for { - yyj160++ - if yyhl160 { - yyb160 = yyj160 > l + yyj169++ + if yyhl169 { + yyb169 = yyj169 > l } else { - yyb160 = r.CheckBreak() + yyb169 = r.CheckBreak() } - if yyb160 { + if yyb169 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj160-1, "") + z.DecStructFieldNotFound(yyj169-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -1640,40 +1711,40 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym173 := z.EncBinary() - _ = yym173 + yym182 := z.EncBinary() + _ = yym182 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep174 := !z.EncBinary() - yy2arr174 := z.EncBasicHandle().StructToArray - var yyq174 [4]bool - _, _, _ = yysep174, yyq174, yy2arr174 - const yyr174 bool = false - var yynn174 int - if yyr174 || yy2arr174 { + yysep183 := !z.EncBinary() + yy2arr183 := z.EncBasicHandle().StructToArray + var yyq183 [4]bool + _, _, _ = yysep183, yyq183, yy2arr183 + const yyr183 bool = false + var yynn183 int + if yyr183 || yy2arr183 { r.EncodeArrayStart(4) } else { - yynn174 = 4 - for _, b := range yyq174 { + yynn183 = 4 + for _, b := range yyq183 { if b { - yynn174++ + yynn183++ } } - r.EncodeMapStart(yynn174) - yynn174 = 0 + r.EncodeMapStart(yynn183) + yynn183 = 0 } - if yyr174 || yy2arr174 { + if yyr183 || yy2arr183 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.LeaderElect == nil { r.EncodeNil() } else { - yy176 := *x.LeaderElect - yym177 := z.EncBinary() - _ = yym177 + yy185 := *x.LeaderElect + yym186 := z.EncBinary() + _ = yym186 if false { } else { - r.EncodeBool(bool(yy176)) + r.EncodeBool(bool(yy185)) } } } else { @@ -1683,97 +1754,97 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.LeaderElect == nil { r.EncodeNil() } else { - yy178 := *x.LeaderElect - yym179 := z.EncBinary() - _ = yym179 + yy187 := *x.LeaderElect + yym188 := z.EncBinary() + _ = yym188 if false { } else { - r.EncodeBool(bool(yy178)) + r.EncodeBool(bool(yy187)) } } } - if yyr174 || yy2arr174 { + if yyr183 || yy2arr183 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy181 := &x.LeaseDuration - yym182 := z.EncBinary() - _ = yym182 + yy190 := &x.LeaseDuration + yym191 := z.EncBinary() + _ = yym191 if false { - } else if z.HasExtensions() && z.EncExt(yy181) { - } else if !yym182 && z.IsJSONHandle() { - z.EncJSONMarshal(yy181) + } else if z.HasExtensions() && z.EncExt(yy190) { + } else if !yym191 && z.IsJSONHandle() { + z.EncJSONMarshal(yy190) } else { - z.EncFallback(yy181) + z.EncFallback(yy190) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy183 := &x.LeaseDuration - yym184 := z.EncBinary() - _ = yym184 + yy192 := &x.LeaseDuration + yym193 := z.EncBinary() + _ = yym193 if false { - } else if z.HasExtensions() && z.EncExt(yy183) { - } else if !yym184 && z.IsJSONHandle() { - z.EncJSONMarshal(yy183) + } else if z.HasExtensions() && z.EncExt(yy192) { + } else if !yym193 && z.IsJSONHandle() { + z.EncJSONMarshal(yy192) } else { - z.EncFallback(yy183) + z.EncFallback(yy192) } } - if yyr174 || yy2arr174 { + if yyr183 || yy2arr183 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy186 := &x.RenewDeadline - yym187 := z.EncBinary() - _ = yym187 + yy195 := &x.RenewDeadline + yym196 := z.EncBinary() + _ = yym196 if false { - } else if z.HasExtensions() && z.EncExt(yy186) { - } else if !yym187 && z.IsJSONHandle() { - z.EncJSONMarshal(yy186) + } else if z.HasExtensions() && z.EncExt(yy195) { + } else if !yym196 && z.IsJSONHandle() { + z.EncJSONMarshal(yy195) } else { - z.EncFallback(yy186) + z.EncFallback(yy195) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy188 := &x.RenewDeadline - yym189 := z.EncBinary() - _ = yym189 + yy197 := &x.RenewDeadline + yym198 := z.EncBinary() + _ = yym198 if false { - } else if z.HasExtensions() && z.EncExt(yy188) { - } else if !yym189 && z.IsJSONHandle() { - z.EncJSONMarshal(yy188) + } else if z.HasExtensions() && z.EncExt(yy197) { + } else if !yym198 && z.IsJSONHandle() { + z.EncJSONMarshal(yy197) } else { - z.EncFallback(yy188) + z.EncFallback(yy197) } } - if yyr174 || yy2arr174 { + if yyr183 || yy2arr183 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy191 := &x.RetryPeriod - yym192 := z.EncBinary() - _ = yym192 + yy200 := &x.RetryPeriod + yym201 := z.EncBinary() + _ = yym201 if false { - } else if z.HasExtensions() && z.EncExt(yy191) { - } else if !yym192 && z.IsJSONHandle() { - z.EncJSONMarshal(yy191) + } else if z.HasExtensions() && z.EncExt(yy200) { + } else if !yym201 && z.IsJSONHandle() { + z.EncJSONMarshal(yy200) } else { - z.EncFallback(yy191) + z.EncFallback(yy200) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy193 := &x.RetryPeriod - yym194 := z.EncBinary() - _ = yym194 + yy202 := &x.RetryPeriod + yym203 := z.EncBinary() + _ = yym203 if false { - } else if z.HasExtensions() && z.EncExt(yy193) { - } else if !yym194 && z.IsJSONHandle() { - z.EncJSONMarshal(yy193) + } else if z.HasExtensions() && z.EncExt(yy202) { + } else if !yym203 && z.IsJSONHandle() { + z.EncJSONMarshal(yy202) } else { - z.EncFallback(yy193) + z.EncFallback(yy202) } } - if yyr174 || yy2arr174 { + if yyr183 || yy2arr183 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -1786,25 +1857,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym195 := z.DecBinary() - _ = yym195 + yym204 := z.DecBinary() + _ = yym204 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct196 := r.ContainerType() - if yyct196 == codecSelferValueTypeMap1234 { - yyl196 := r.ReadMapStart() - if yyl196 == 0 { + yyct205 := r.ContainerType() + if yyct205 == codecSelferValueTypeMap1234 { + yyl205 := r.ReadMapStart() + if yyl205 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl196, d) + x.codecDecodeSelfFromMap(yyl205, d) } - } else if yyct196 == codecSelferValueTypeArray1234 { - yyl196 := r.ReadArrayStart() - if yyl196 == 0 { + } else if yyct205 == codecSelferValueTypeArray1234 { + yyl205 := r.ReadArrayStart() + if yyl205 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl196, d) + x.codecDecodeSelfFromArray(yyl205, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -1816,12 +1887,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys197Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys197Slc - var yyhl197 bool = l >= 0 - for yyj197 := 0; ; yyj197++ { - if yyhl197 { - if yyj197 >= l { + var yys206Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys206Slc + var yyhl206 bool = l >= 0 + for yyj206 := 0; ; yyj206++ { + if yyhl206 { + if yyj206 >= l { break } } else { @@ -1830,10 +1901,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys197Slc = r.DecodeBytes(yys197Slc, true, true) - yys197 := string(yys197Slc) + yys206Slc = r.DecodeBytes(yys206Slc, true, true) + yys206 := string(yys206Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys197 { + switch yys206 { case "leaderElect": if r.TryDecodeAsNil() { if x.LeaderElect != nil { @@ -1843,8 +1914,8 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if x.LeaderElect == nil { x.LeaderElect = new(bool) } - yym199 := z.DecBinary() - _ = yym199 + yym208 := z.DecBinary() + _ = yym208 if false { } else { *((*bool)(x.LeaderElect)) = r.DecodeBool() @@ -1854,51 +1925,51 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv200 := &x.LeaseDuration - yym201 := z.DecBinary() - _ = yym201 + yyv209 := &x.LeaseDuration + yym210 := z.DecBinary() + _ = yym210 if false { - } else if z.HasExtensions() && z.DecExt(yyv200) { - } else if !yym201 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv200) + } else if z.HasExtensions() && z.DecExt(yyv209) { + } else if !yym210 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv209) } else { - z.DecFallback(yyv200, false) + z.DecFallback(yyv209, false) } } case "renewDeadline": if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv202 := &x.RenewDeadline - yym203 := z.DecBinary() - _ = yym203 + yyv211 := &x.RenewDeadline + yym212 := z.DecBinary() + _ = yym212 if false { - } else if z.HasExtensions() && z.DecExt(yyv202) { - } else if !yym203 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv202) + } else if z.HasExtensions() && z.DecExt(yyv211) { + } else if !yym212 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv211) } else { - z.DecFallback(yyv202, false) + z.DecFallback(yyv211, false) } } case "retryPeriod": if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv204 := &x.RetryPeriod - yym205 := z.DecBinary() - _ = yym205 + yyv213 := &x.RetryPeriod + yym214 := z.DecBinary() + _ = yym214 if false { - } else if z.HasExtensions() && z.DecExt(yyv204) { - } else if !yym205 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv204) + } else if z.HasExtensions() && z.DecExt(yyv213) { + } else if !yym214 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv213) } else { - z.DecFallback(yyv204, false) + z.DecFallback(yyv213, false) } } default: - z.DecStructFieldNotFound(-1, yys197) - } // end switch yys197 - } // end for yyj197 + z.DecStructFieldNotFound(-1, yys206) + } // end switch yys206 + } // end for yyj206 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -1906,16 +1977,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj206 int - var yyb206 bool - var yyhl206 bool = l >= 0 - yyj206++ - if yyhl206 { - yyb206 = yyj206 > l + var yyj215 int + var yyb215 bool + var yyhl215 bool = l >= 0 + yyj215++ + if yyhl215 { + yyb215 = yyj215 > l } else { - yyb206 = r.CheckBreak() + yyb215 = r.CheckBreak() } - if yyb206 { + if yyb215 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1928,20 +1999,20 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if x.LeaderElect == nil { x.LeaderElect = new(bool) } - yym208 := z.DecBinary() - _ = yym208 + yym217 := z.DecBinary() + _ = yym217 if false { } else { *((*bool)(x.LeaderElect)) = r.DecodeBool() } } - yyj206++ - if yyhl206 { - yyb206 = yyj206 > l + yyj215++ + if yyhl215 { + yyb215 = yyj215 > l } else { - yyb206 = r.CheckBreak() + yyb215 = r.CheckBreak() } - if yyb206 { + if yyb215 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1949,24 +2020,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv209 := &x.LeaseDuration - yym210 := z.DecBinary() - _ = yym210 + yyv218 := &x.LeaseDuration + yym219 := z.DecBinary() + _ = yym219 if false { - } else if z.HasExtensions() && z.DecExt(yyv209) { - } else if !yym210 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv209) + } else if z.HasExtensions() && z.DecExt(yyv218) { + } else if !yym219 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv218) } else { - z.DecFallback(yyv209, false) + z.DecFallback(yyv218, false) } } - yyj206++ - if yyhl206 { - yyb206 = yyj206 > l + yyj215++ + if yyhl215 { + yyb215 = yyj215 > l } else { - yyb206 = r.CheckBreak() + yyb215 = r.CheckBreak() } - if yyb206 { + if yyb215 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1974,24 +2045,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv211 := &x.RenewDeadline - yym212 := z.DecBinary() - _ = yym212 + yyv220 := &x.RenewDeadline + yym221 := z.DecBinary() + _ = yym221 if false { - } else if z.HasExtensions() && z.DecExt(yyv211) { - } else if !yym212 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv211) + } else if z.HasExtensions() && z.DecExt(yyv220) { + } else if !yym221 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv220) } else { - z.DecFallback(yyv211, false) + z.DecFallback(yyv220, false) } } - yyj206++ - if yyhl206 { - yyb206 = yyj206 > l + yyj215++ + if yyhl215 { + yyb215 = yyj215 > l } else { - yyb206 = r.CheckBreak() + yyb215 = r.CheckBreak() } - if yyb206 { + if yyb215 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1999,29 +2070,29 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv213 := &x.RetryPeriod - yym214 := z.DecBinary() - _ = yym214 + yyv222 := &x.RetryPeriod + yym223 := z.DecBinary() + _ = yym223 if false { - } else if z.HasExtensions() && z.DecExt(yyv213) { - } else if !yym214 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv213) + } else if z.HasExtensions() && z.DecExt(yyv222) { + } else if !yym223 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv222) } else { - z.DecFallback(yyv213, false) + z.DecFallback(yyv222, false) } } for { - yyj206++ - if yyhl206 { - yyb206 = yyj206 > l + yyj215++ + if yyhl215 { + yyb215 = yyj215 > l } else { - yyb206 = r.CheckBreak() + yyb215 = r.CheckBreak() } - if yyb206 { + if yyb215 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj206-1, "") + z.DecStructFieldNotFound(yyj215-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 47cab1ec409..7210541ddf1 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -31,6 +31,9 @@ type KubeProxyConfiguration struct { HealthzPort int32 `json:"healthzPort"` // hostnameOverride, if non-empty, will be used as the identity instead of the actual hostname. HostnameOverride string `json:"hostnameOverride"` + // iptablesMasqueradeBit is the bit of the iptables fwmark space to use for SNAT if using + // the pure iptables proxy mode. Values must be within the range [0, 31]. + IPTablesMasqueradeBit *int32 `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index 8d499c4db70..91f6ba1ae74 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -81,6 +81,17 @@ type KubeletContainerName struct { ContainerName string } +// containerNamePrefix is used to identify the containers on the node managed by this +// process. +var containerNamePrefix = "k8s" + +// SetContainerNamePrefix allows the container prefix name for this process to be changed. +// This is intended to support testing and bootstrapping experimentation. It cannot be +// changed once the Kubelet starts. +func SetContainerNamePrefix(prefix string) { + containerNamePrefix = prefix +} + // DockerPuller is an abstract interface for testability. It abstracts image pull operations. type DockerPuller interface { Pull(image string, secrets []api.Secret) error @@ -209,8 +220,6 @@ func (p throttledDockerPuller) IsImagePresent(name string) (bool, error) { return p.puller.IsImagePresent(name) } -const containerNamePrefix = "k8s" - // Creates a name which can be reversed to identify both full pod name and container name. func BuildDockerName(dockerName KubeletContainerName, container *api.Container) (string, string) { containerName := dockerName.ContainerName + "." + strconv.FormatUint(kubecontainer.HashContainer(container), 16) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 9818814e8ec..2fb6bf67f29 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -1357,6 +1357,38 @@ func containerAndPodFromLabels(inspect *docker.Container) (pod *api.Pod, contain return } +func (dm *DockerManager) applyOOMScoreAdj(container *api.Container, containerInfo *docker.Container) error { + cgroupName, err := dm.procFs.GetFullContainerName(containerInfo.State.Pid) + if err != nil { + if err == os.ErrNotExist { + // Container exited. We cannot do anything about it. Ignore this error. + glog.V(2).Infof("Failed to apply OOM score adj on container %q with ID %q. Init process does not exist.", containerInfo.Name, containerInfo.ID) + return nil + } + return err + } + // Set OOM score of the container based on the priority of the container. + // Processes in lower-priority pods should be killed first if the system runs out of memory. + // The main pod infrastructure container is considered high priority, since if it is killed the + // whole pod will die. + // TODO: Cache this value. + var oomScoreAdj int + if containerInfo.Name == PodInfraContainerName { + oomScoreAdj = qos.PodInfraOOMAdj + } else { + oomScoreAdj = qos.GetContainerOOMScoreAdjust(container, int64(dm.machineInfo.MemoryCapacity)) + } + if err = dm.oomAdjuster.ApplyOOMScoreAdjContainer(cgroupName, oomScoreAdj, 5); err != nil { + if err == os.ErrNotExist { + // Container exited. We cannot do anything about it. Ignore this error. + glog.V(2).Infof("Failed to apply OOM score adj on container %q with ID %q. Init process does not exist.", containerInfo.Name, containerInfo.ID) + return nil + } + return err + } + return nil +} + // Run a single container from a pod. Returns the docker container ID // If do not need to pass labels, just pass nil. func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Container, netMode, ipcMode, pidMode string, restartCount int) (kubecontainer.ContainerID, error) { @@ -1418,24 +1450,9 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe return kubecontainer.ContainerID{}, fmt.Errorf("can't get init PID for container %q", id) } - // Set OOM score of the container based on the priority of the container. - // Processes in lower-priority pods should be killed first if the system runs out of memory. - // The main pod infrastructure container is considered high priority, since if it is killed the - // whole pod will die. - var oomScoreAdj int - if container.Name == PodInfraContainerName { - oomScoreAdj = qos.PodInfraOOMAdj - } else { - oomScoreAdj = qos.GetContainerOOMScoreAdjust(container, int64(dm.machineInfo.MemoryCapacity)) + if err := dm.applyOOMScoreAdj(container, containerInfo); err != nil { + return kubecontainer.ContainerID{}, fmt.Errorf("failed to apply oom-score-adj to container %q- %v", err, containerInfo.Name) } - cgroupName, err := dm.procFs.GetFullContainerName(containerInfo.State.Pid) - if err != nil { - return kubecontainer.ContainerID{}, fmt.Errorf("GetFullContainerName: %v", err) - } - if err = dm.oomAdjuster.ApplyOOMScoreAdjContainer(cgroupName, oomScoreAdj, 5); err != nil { - return kubecontainer.ContainerID{}, fmt.Errorf("ApplyOOMScoreAdjContainer: %v", err) - } - // The addNDotsOption call appends the ndots option to the resolv.conf file generated by docker. // This resolv.conf file is shared by all containers of the same pod, and needs to be modified only once per pod. // we modify it when the pause container is created since it is the first container created in the pod since it holds diff --git a/pkg/kubelet/prober/manager.go b/pkg/kubelet/prober/manager.go index 4541c21d5c8..2282d8e6285 100644 --- a/pkg/kubelet/prober/manager.go +++ b/pkg/kubelet/prober/manager.go @@ -171,7 +171,7 @@ func (m *manager) RemovePod(pod *api.Pod) { for _, probeType := range [...]probeType{readiness, liveness} { key.probeType = probeType if worker, ok := m.workers[key]; ok { - close(worker.stop) + worker.stop() } } } @@ -188,7 +188,7 @@ func (m *manager) CleanupPods(activePods []*api.Pod) { for key, worker := range m.workers { if _, ok := desiredPods[key.podUID]; !ok { - close(worker.stop) + worker.stop() } } } diff --git a/pkg/kubelet/prober/manager_test.go b/pkg/kubelet/prober/manager_test.go index f01ba50cf04..ac64843f0ff 100644 --- a/pkg/kubelet/prober/manager_test.go +++ b/pkg/kubelet/prober/manager_test.go @@ -18,6 +18,7 @@ package prober import ( "fmt" + "strconv" "testing" "time" @@ -26,6 +27,7 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/prober/results" "k8s.io/kubernetes/pkg/probe" + "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" ) @@ -173,6 +175,31 @@ func TestCleanupPods(t *testing.T) { } } +func TestCleanupRepeated(t *testing.T) { + m := newTestManager() + defer cleanup(t, m) + podTemplate := api.Pod{ + Spec: api.PodSpec{ + Containers: []api.Container{{ + Name: "prober1", + ReadinessProbe: defaultProbe, + LivenessProbe: defaultProbe, + }}, + }, + } + + const numTestPods = 100 + for i := 0; i < numTestPods; i++ { + pod := podTemplate + pod.UID = types.UID(strconv.Itoa(i)) + m.AddPod(&pod) + } + + for i := 0; i < 10; i++ { + m.CleanupPods([]*api.Pod{}) + } +} + func TestUpdatePodStatus(t *testing.T) { unprobed := api.ContainerStatus{ Name: "unprobed_container", diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go index 60f4c6d6747..c3d0f2241c4 100644 --- a/pkg/kubelet/prober/worker.go +++ b/pkg/kubelet/prober/worker.go @@ -32,8 +32,8 @@ import ( // stop channel is closed. The worker uses the probe Manager's statusManager to get up-to-date // container IDs. type worker struct { - // Channel for stopping the probe, it should be closed to trigger a stop. - stop chan struct{} + // Channel for stopping the probe. + stopCh chan struct{} // The pod containing this probe (read-only) pod *api.Pod @@ -70,7 +70,7 @@ func newWorker( container api.Container) *worker { w := &worker{ - stop: make(chan struct{}), + stopCh: make(chan struct{}, 1), // Buffer so stop() can be non-blocking. pod: pod, container: container, probeType: probeType, @@ -109,7 +109,7 @@ probeLoop: for w.doProbe() { // Wait for next probe tick. select { - case <-w.stop: + case <-w.stopCh: break probeLoop case <-probeTicker.C: // continue @@ -117,6 +117,15 @@ probeLoop: } } +// stop stops the probe worker. The worker handles cleanup and removes itself from its manager. +// It is safe to call stop multiple times. +func (w *worker) stop() { + select { + case w.stopCh <- struct{}{}: + default: // Non-blocking. + } +} + // doProbe probes the container once and records the result. // Returns whether the worker should continue. func (w *worker) doProbe() (keepGoing bool) { diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index 192bc30c0c5..26a87dd2dcf 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -236,7 +236,9 @@ func TestCleanUp(t *testing.T) { } } - close(w.stop) + for i := 0; i < 10; i++ { + w.stop() // Stop should be callable multiple times without consequence. + } if err := waitForWorkerExit(m, []probeKey{key}); err != nil { t.Fatalf("[%s] error waiting for worker exit: %v", probeType, err) } diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index ba5c03637b5..6c4f0ede9d9 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -54,13 +54,20 @@ import ( const iptablesMinVersion = utiliptables.MinCheckVersion // the services chain -const iptablesServicesChain utiliptables.Chain = "KUBE-SERVICES" +const kubeServicesChain utiliptables.Chain = "KUBE-SERVICES" // the nodeports chain -const iptablesNodePortsChain utiliptables.Chain = "KUBE-NODEPORTS" +const kubeNodePortsChain utiliptables.Chain = "KUBE-NODEPORTS" + +// the kubernetes postrouting chain +const kubePostroutingChain utiliptables.Chain = "KUBE-POSTROUTING" + +// the mark-for-masquerade chain +const kubeMarkMasqChain utiliptables.Chain = "KUBE-MARK-MASQ" // the mark we apply to traffic needing SNAT -const iptablesMasqueradeMark = "0x4d415351" +// TODO(thockin): Remove this for v1.3 or v1.4. +const oldIptablesMasqueradeMark = "0x4d415351" // IptablesVersioner can query the current iptables version. type IptablesVersioner interface { @@ -126,8 +133,7 @@ type serviceInfo struct { loadBalancerStatus api.LoadBalancerStatus sessionAffinityType api.ServiceAffinity stickyMaxAgeSeconds int - // Deprecated, but required for back-compat (including e2e) - externalIPs []string + externalIPs []string } // returns a new serviceInfo struct @@ -149,9 +155,10 @@ type Proxier struct { haveReceivedEndpointsUpdate bool // true once we've seen an OnEndpointsUpdate event // These are effectively const and do not need the mutex to be held. - syncPeriod time.Duration - iptables utiliptables.Interface - masqueradeAll bool + syncPeriod time.Duration + iptables utiliptables.Interface + masqueradeAll bool + masqueradeMark string } type localPort struct { @@ -177,7 +184,7 @@ var _ proxy.ProxyProvider = &Proxier{} // An error will be returned if iptables fails to update or acquire the initial lock. // Once a proxier is created, it will keep iptables up to date in the background and // will not terminate if a particular iptables call fails. -func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod time.Duration, masqueradeAll bool) (*Proxier, error) { +func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod time.Duration, masqueradeAll bool, masqueradeBit int) (*Proxier, error) { // Set the route_localnet sysctl we need for if err := utilsysctl.SetSysctl(sysctlRouteLocalnet, 1); err != nil { return nil, fmt.Errorf("can't set sysctl %s: %v", sysctlRouteLocalnet, err) @@ -191,50 +198,122 @@ func NewProxier(ipt utiliptables.Interface, exec utilexec.Interface, syncPeriod glog.Warningf("can't set sysctl %s: %v", sysctlBridgeCallIptables, err) } + // Generate the masquerade mark to use for SNAT rules. + if masqueradeBit < 0 || masqueradeBit > 31 { + return nil, fmt.Errorf("invalid iptables-masquerade-bit %v not in [0, 31]", masqueradeBit) + } + masqueradeValue := 1 << uint(masqueradeBit) + masqueradeMark := fmt.Sprintf("%#08x/%#08x", masqueradeValue, masqueradeValue) + return &Proxier{ - serviceMap: make(map[proxy.ServicePortName]*serviceInfo), - endpointsMap: make(map[proxy.ServicePortName][]string), - portsMap: make(map[localPort]closeable), - syncPeriod: syncPeriod, - iptables: ipt, - masqueradeAll: masqueradeAll, + serviceMap: make(map[proxy.ServicePortName]*serviceInfo), + endpointsMap: make(map[proxy.ServicePortName][]string), + portsMap: make(map[localPort]closeable), + syncPeriod: syncPeriod, + iptables: ipt, + masqueradeAll: masqueradeAll, + masqueradeMark: masqueradeMark, }, nil } // CleanupLeftovers removes all iptables rules and chains created by the Proxier // It returns true if an error was encountered. Errors are logged. func CleanupLeftovers(ipt utiliptables.Interface) (encounteredError bool) { - //TODO: actually tear down all rules and chains. - args := []string{"-m", "comment", "--comment", "kubernetes service portals", "-j", string(iptablesServicesChain)} - if err := ipt.DeleteRule(utiliptables.TableNAT, utiliptables.ChainOutput, args...); err != nil { - glog.Errorf("Error removing pure-iptables proxy rule: %v", err) - encounteredError = true + // Unlink the services chain. + args := []string{ + "-m", "comment", "--comment", "kubernetes service portals", + "-j", string(kubeServicesChain), } - if err := ipt.DeleteRule(utiliptables.TableNAT, utiliptables.ChainPrerouting, args...); err != nil { - glog.Errorf("Error removing pure-iptables proxy rule: %v", err) - encounteredError = true + tableChainsWithJumpServices := []struct { + table utiliptables.Table + chain utiliptables.Chain + }{ + {utiliptables.TableFilter, utiliptables.ChainOutput}, + {utiliptables.TableNAT, utiliptables.ChainOutput}, + {utiliptables.TableNAT, utiliptables.ChainPrerouting}, } - - args = []string{"-m", "comment", "--comment", "kubernetes service traffic requiring SNAT", "-m", "mark", "--mark", iptablesMasqueradeMark, "-j", "MASQUERADE"} - if err := ipt.DeleteRule(utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { - glog.Errorf("Error removing pure-iptables proxy rule: %v", err) - encounteredError = true - } - - // flush and delete chains. - chains := []utiliptables.Chain{iptablesServicesChain, iptablesNodePortsChain} - for _, c := range chains { - // flush chain, then if sucessful delete, delete will fail if flush fails. - if err := ipt.FlushChain(utiliptables.TableNAT, c); err != nil { - glog.Errorf("Error flushing pure-iptables proxy chain: %v", err) - encounteredError = true - } else { - if err = ipt.DeleteChain(utiliptables.TableNAT, c); err != nil { - glog.Errorf("Error deleting pure-iptables proxy chain: %v", err) + for _, tc := range tableChainsWithJumpServices { + if err := ipt.DeleteRule(tc.table, tc.chain, args...); err != nil { + if !utiliptables.IsNotFoundError(err) { + glog.Errorf("Error removing pure-iptables proxy rule: %v", err) encounteredError = true } } } + + // Unlink the postrouting chain. + args = []string{ + "-m", "comment", "--comment", "kubernetes postrouting rules", + "-j", string(kubePostroutingChain), + } + if err := ipt.DeleteRule(utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { + if !utiliptables.IsNotFoundError(err) { + glog.Errorf("Error removing pure-iptables proxy rule: %v", err) + encounteredError = true + } + } + + // Flush and remove all of our chains. + if iptablesSaveRaw, err := ipt.Save(utiliptables.TableNAT); err != nil { + glog.Errorf("Failed to execute iptables-save for %s: %v", utiliptables.TableNAT, err) + encounteredError = true + } else { + existingNATChains := getChainLines(utiliptables.TableNAT, iptablesSaveRaw) + natChains := bytes.NewBuffer(nil) + natRules := bytes.NewBuffer(nil) + writeLine(natChains, "*nat") + // Start with chains we know we need to remove. + for _, chain := range []utiliptables.Chain{kubeServicesChain, kubeNodePortsChain, kubePostroutingChain, kubeMarkMasqChain} { + if _, found := existingNATChains[chain]; found { + chainString := string(chain) + writeLine(natChains, existingNATChains[chain]) // flush + writeLine(natRules, "-X", chainString) // delete + } + } + // Hunt for service and endpoint chains. + for chain := range existingNATChains { + chainString := string(chain) + if strings.HasPrefix(chainString, "KUBE-SVC-") || strings.HasPrefix(chainString, "KUBE-SEP-") { + writeLine(natChains, existingNATChains[chain]) // flush + writeLine(natRules, "-X", chainString) // delete + } + } + writeLine(natRules, "COMMIT") + natLines := append(natChains.Bytes(), natRules.Bytes()...) + // Write it. + err = ipt.Restore(utiliptables.TableNAT, natLines, utiliptables.NoFlushTables, utiliptables.RestoreCounters) + if err != nil { + glog.Errorf("Failed to execute iptables-restore for %s: %v", utiliptables.TableNAT, err) + encounteredError = true + } + } + { + filterBuf := bytes.NewBuffer(nil) + writeLine(filterBuf, "*filter") + writeLine(filterBuf, fmt.Sprintf(":%s - [0:0]", kubeServicesChain)) + writeLine(filterBuf, fmt.Sprintf("-X %s", kubeServicesChain)) + writeLine(filterBuf, "COMMIT") + // Write it. + if err := ipt.Restore(utiliptables.TableFilter, filterBuf.Bytes(), utiliptables.NoFlushTables, utiliptables.RestoreCounters); err != nil { + glog.Errorf("Failed to execute iptables-restore for %s: %v", utiliptables.TableFilter, err) + encounteredError = true + } + } + + // Clean up the older SNAT rule which was directly in POSTROUTING. + // TODO(thockin): Remove this for v1.3 or v1.4. + args = []string{ + "-m", "comment", "--comment", "kubernetes service traffic requiring SNAT", + "-m", "mark", "--mark", oldIptablesMasqueradeMark, + "-j", "MASQUERADE", + } + if err := ipt.DeleteRule(utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { + if !utiliptables.IsNotFoundError(err) { + glog.Errorf("Error removing old-style SNAT rule: %v", err) + encounteredError = true + } + } + return encounteredError } @@ -481,37 +560,45 @@ func (proxier *Proxier) syncProxyRules() { } glog.V(3).Infof("Syncing iptables rules") - // Ensure main chains and rules are installed. - tablesNeedServicesChain := []utiliptables.Table{utiliptables.TableFilter, utiliptables.TableNAT} - for _, table := range tablesNeedServicesChain { - if _, err := proxier.iptables.EnsureChain(table, iptablesServicesChain); err != nil { - glog.Errorf("Failed to ensure that %s chain %s exists: %v", table, iptablesServicesChain, err) - return - } - } - // Link the services chain. - tableChainsNeedJumpServices := []struct { - table utiliptables.Table - chain utiliptables.Chain - }{ - {utiliptables.TableFilter, utiliptables.ChainOutput}, - {utiliptables.TableNAT, utiliptables.ChainOutput}, - {utiliptables.TableNAT, utiliptables.ChainPrerouting}, - } - comment := "kubernetes service portals" - args := []string{"-m", "comment", "--comment", comment, "-j", string(iptablesServicesChain)} - for _, tc := range tableChainsNeedJumpServices { - if _, err := proxier.iptables.EnsureRule(utiliptables.Prepend, tc.table, tc.chain, args...); err != nil { - glog.Errorf("Failed to ensure that %s chain %s jumps to %s: %v", tc.table, tc.chain, iptablesServicesChain, err) - return - } - } - // Link the output rules. + // Create and link the kube services chain. { - comment := "kubernetes service traffic requiring SNAT" - args := []string{"-m", "comment", "--comment", comment, "-m", "mark", "--mark", iptablesMasqueradeMark, "-j", "MASQUERADE"} - if _, err := proxier.iptables.EnsureRule(utiliptables.Append, utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { - glog.Errorf("Failed to ensure that chain %s obeys MASQUERADE mark: %v", utiliptables.ChainPostrouting, err) + tablesNeedServicesChain := []utiliptables.Table{utiliptables.TableFilter, utiliptables.TableNAT} + for _, table := range tablesNeedServicesChain { + if _, err := proxier.iptables.EnsureChain(table, kubeServicesChain); err != nil { + glog.Errorf("Failed to ensure that %s chain %s exists: %v", table, kubeServicesChain, err) + return + } + } + + tableChainsNeedJumpServices := []struct { + table utiliptables.Table + chain utiliptables.Chain + }{ + {utiliptables.TableFilter, utiliptables.ChainOutput}, + {utiliptables.TableNAT, utiliptables.ChainOutput}, + {utiliptables.TableNAT, utiliptables.ChainPrerouting}, + } + comment := "kubernetes service portals" + args := []string{"-m", "comment", "--comment", comment, "-j", string(kubeServicesChain)} + for _, tc := range tableChainsNeedJumpServices { + if _, err := proxier.iptables.EnsureRule(utiliptables.Prepend, tc.table, tc.chain, args...); err != nil { + glog.Errorf("Failed to ensure that %s chain %s jumps to %s: %v", tc.table, tc.chain, kubeServicesChain, err) + return + } + } + } + + // Create and link the kube postrouting chain. + { + if _, err := proxier.iptables.EnsureChain(utiliptables.TableNAT, kubePostroutingChain); err != nil { + glog.Errorf("Failed to ensure that %s chain %s exists: %v", utiliptables.TableNAT, kubePostroutingChain, err) + return + } + + comment := "kubernetes postrouting rules" + args := []string{"-m", "comment", "--comment", comment, "-j", string(kubePostroutingChain)} + if _, err := proxier.iptables.EnsureRule(utiliptables.Prepend, utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { + glog.Errorf("Failed to ensure that %s chain %s jumps to %s: %v", utiliptables.TableNAT, utiliptables.ChainPostrouting, kubePostroutingChain, err) return } } @@ -521,7 +608,7 @@ func (proxier *Proxier) syncProxyRules() { existingFilterChains := make(map[utiliptables.Chain]string) iptablesSaveRaw, err := proxier.iptables.Save(utiliptables.TableFilter) if err != nil { // if we failed to get any rules - glog.Errorf("Failed to execute iptables-save, syncing all rules. %s", err.Error()) + glog.Errorf("Failed to execute iptables-save, syncing all rules: %v", err) } else { // otherwise parse the output existingFilterChains = getChainLines(utiliptables.TableFilter, iptablesSaveRaw) } @@ -529,7 +616,7 @@ func (proxier *Proxier) syncProxyRules() { existingNATChains := make(map[utiliptables.Chain]string) iptablesSaveRaw, err = proxier.iptables.Save(utiliptables.TableNAT) if err != nil { // if we failed to get any rules - glog.Errorf("Failed to execute iptables-save, syncing all rules. %s", err.Error()) + glog.Errorf("Failed to execute iptables-save, syncing all rules: %v", err) } else { // otherwise parse the output existingNATChains = getChainLines(utiliptables.TableNAT, iptablesSaveRaw) } @@ -544,24 +631,52 @@ func (proxier *Proxier) syncProxyRules() { writeLine(natChains, "*nat") // Make sure we keep stats for the top-level chains, if they existed - // (which they should have because we created them above). - if chain, ok := existingFilterChains[iptablesServicesChain]; ok { + // (which most should have because we created them above). + if chain, ok := existingFilterChains[kubeServicesChain]; ok { writeLine(filterChains, chain) } else { - writeLine(filterChains, makeChainLine(iptablesServicesChain)) + writeLine(filterChains, makeChainLine(kubeServicesChain)) } - if chain, ok := existingNATChains[iptablesServicesChain]; ok { + if chain, ok := existingNATChains[kubeServicesChain]; ok { writeLine(natChains, chain) } else { - writeLine(natChains, makeChainLine(iptablesServicesChain)) + writeLine(natChains, makeChainLine(kubeServicesChain)) } - if chain, ok := existingNATChains[iptablesNodePortsChain]; ok { + if chain, ok := existingNATChains[kubeNodePortsChain]; ok { writeLine(natChains, chain) } else { - writeLine(natChains, makeChainLine(iptablesNodePortsChain)) + writeLine(natChains, makeChainLine(kubeNodePortsChain)) + } + if chain, ok := existingNATChains[kubePostroutingChain]; ok { + writeLine(natChains, chain) + } else { + writeLine(natChains, makeChainLine(kubePostroutingChain)) + } + if chain, ok := existingNATChains[kubeMarkMasqChain]; ok { + writeLine(natChains, chain) + } else { + writeLine(natChains, makeChainLine(kubeMarkMasqChain)) } - // Accumulate nat chains to keep. + // Install the kubernetes-specific postrouting rules. We use a whole chain for + // this so that it is easier to flush and change, for example if the mark + // value should ever change. + writeLine(natRules, []string{ + "-A", string(kubePostroutingChain), + "-m", "comment", "--comment", `"kubernetes service traffic requiring SNAT"`, + "-m", "mark", "--mark", proxier.masqueradeMark, + "-j", "MASQUERADE", + }...) + + // Install the kubernetes-specific masquerade mark rule. We use a whole chain for + // this so that it is easier to flush and change, for example if the mark + // value should ever change. + writeLine(natRules, []string{ + "-A", string(kubeMarkMasqChain), + "-j", "MARK", "--set-xmark", proxier.masqueradeMark, + }...) + + // Accumulate NAT chains to keep. activeNATChains := map[utiliptables.Chain]bool{} // use a map as a set // Accumulate new local ports that we have opened. @@ -582,18 +697,16 @@ func (proxier *Proxier) syncProxyRules() { // Capture the clusterIP. args := []string{ - "-A", string(iptablesServicesChain), - "-m", "comment", "--comment", fmt.Sprintf("\"%s cluster IP\"", svcName.String()), + "-A", string(kubeServicesChain), + "-m", "comment", "--comment", fmt.Sprintf(`"%s cluster IP"`, svcName.String()), "-m", protocol, "-p", protocol, "-d", fmt.Sprintf("%s/32", svcInfo.clusterIP.String()), "--dport", fmt.Sprintf("%d", svcInfo.port), } if proxier.masqueradeAll { - writeLine(natRules, append(args, - "-j", "MARK", "--set-xmark", fmt.Sprintf("%s/0xffffffff", iptablesMasqueradeMark))...) + writeLine(natRules, append(args, "-j", string(kubeMarkMasqChain))...) } - writeLine(natRules, append(args, - "-j", string(svcChain))...) + writeLine(natRules, append(args, "-j", string(svcChain))...) // Capture externalIPs. for _, externalIP := range svcInfo.externalIPs { @@ -621,15 +734,14 @@ func (proxier *Proxier) syncProxyRules() { } } // We're holding the port, so it's OK to install iptables rules. args := []string{ - "-A", string(iptablesServicesChain), - "-m", "comment", "--comment", fmt.Sprintf("\"%s external IP\"", svcName.String()), + "-A", string(kubeServicesChain), + "-m", "comment", "--comment", fmt.Sprintf(`"%s external IP"`, svcName.String()), "-m", protocol, "-p", protocol, "-d", fmt.Sprintf("%s/32", externalIP), "--dport", fmt.Sprintf("%d", svcInfo.port), } // We have to SNAT packets to external IPs. - writeLine(natRules, append(args, - "-j", "MARK", "--set-xmark", fmt.Sprintf("%s/0xffffffff", iptablesMasqueradeMark))...) + writeLine(natRules, append(args, "-j", string(kubeMarkMasqChain))...) // Allow traffic for external IPs that does not come from a bridge (i.e. not from a container) // nor from a local process to be forwarded to the service. @@ -638,30 +750,26 @@ func (proxier *Proxier) syncProxyRules() { externalTrafficOnlyArgs := append(args, "-m", "physdev", "!", "--physdev-is-in", "-m", "addrtype", "!", "--src-type", "LOCAL") - writeLine(natRules, append(externalTrafficOnlyArgs, - "-j", string(svcChain))...) + writeLine(natRules, append(externalTrafficOnlyArgs, "-j", string(svcChain))...) dstLocalOnlyArgs := append(args, "-m", "addrtype", "--dst-type", "LOCAL") // Allow traffic bound for external IPs that happen to be recognized as local IPs to stay local. // This covers cases like GCE load-balancers which get added to the local routing table. - writeLine(natRules, append(dstLocalOnlyArgs, - "-j", string(svcChain))...) + writeLine(natRules, append(dstLocalOnlyArgs, "-j", string(svcChain))...) } // Capture load-balancer ingress. for _, ingress := range svcInfo.loadBalancerStatus.Ingress { if ingress.IP != "" { args := []string{ - "-A", string(iptablesServicesChain), - "-m", "comment", "--comment", fmt.Sprintf("\"%s loadbalancer IP\"", svcName.String()), + "-A", string(kubeServicesChain), + "-m", "comment", "--comment", fmt.Sprintf(`"%s loadbalancer IP"`, svcName.String()), "-m", protocol, "-p", protocol, "-d", fmt.Sprintf("%s/32", ingress.IP), "--dport", fmt.Sprintf("%d", svcInfo.port), } // We have to SNAT packets from external IPs. - writeLine(natRules, append(args, - "-j", "MARK", "--set-xmark", fmt.Sprintf("%s/0xffffffff", iptablesMasqueradeMark))...) - writeLine(natRules, append(args, - "-j", string(svcChain))...) + writeLine(natRules, append(args, "-j", string(kubeMarkMasqChain))...) + writeLine(natRules, append(args, "-j", string(svcChain))...) } } @@ -687,27 +795,24 @@ func (proxier *Proxier) syncProxyRules() { } newLocalPorts[lp] = socket } // We're holding the port, so it's OK to install iptables rules. + + args := []string{ + "-A", string(kubeNodePortsChain), + "-m", "comment", "--comment", svcName.String(), + "-m", protocol, "-p", protocol, + "--dport", fmt.Sprintf("%d", svcInfo.nodePort), + } // Nodeports need SNAT. - writeLine(natRules, - "-A", string(iptablesNodePortsChain), - "-m", "comment", "--comment", svcName.String(), - "-m", protocol, "-p", protocol, - "--dport", fmt.Sprintf("%d", svcInfo.nodePort), - "-j", "MARK", "--set-xmark", fmt.Sprintf("%s/0xffffffff", iptablesMasqueradeMark)) + writeLine(natRules, append(args, "-j", string(kubeMarkMasqChain))...) // Jump to the service chain. - writeLine(natRules, - "-A", string(iptablesNodePortsChain), - "-m", "comment", "--comment", svcName.String(), - "-m", protocol, "-p", protocol, - "--dport", fmt.Sprintf("%d", svcInfo.nodePort), - "-j", string(svcChain)) + writeLine(natRules, append(args, "-j", string(svcChain))...) } // If the service has no endpoints then reject packets. if len(proxier.endpointsMap[svcName]) == 0 { writeLine(filterRules, - "-A", string(iptablesServicesChain), - "-m", "comment", "--comment", fmt.Sprintf("\"%s has no endpoints\"", svcName.String()), + "-A", string(kubeServicesChain), + "-m", "comment", "--comment", fmt.Sprintf(`"%s has no endpoints"`, svcName.String()), "-m", protocol, "-p", protocol, "-d", fmt.Sprintf("%s/32", svcInfo.clusterIP.String()), "--dport", fmt.Sprintf("%d", svcInfo.port), @@ -777,16 +882,14 @@ func (proxier *Proxier) syncProxyRules() { // TODO: if we grow logic to get this node's pod CIDR, we can use it. writeLine(natRules, append(args, "-s", fmt.Sprintf("%s/32", strings.Split(endpoints[i], ":")[0]), - "-j", "MARK", "--set-xmark", fmt.Sprintf("%s/0xffffffff", iptablesMasqueradeMark))...) + "-j", string(kubeMarkMasqChain))...) // Update client-affinity lists. if svcInfo.sessionAffinityType == api.ServiceAffinityClientIP { args = append(args, "-m", "recent", "--name", string(endpointChain), "--set") } // DNAT to final destination. - args = append(args, - "-m", protocol, "-p", protocol, - "-j", "DNAT", "--to-destination", endpoints[i]) + args = append(args, "-m", protocol, "-p", protocol, "-j", "DNAT", "--to-destination", endpoints[i]) writeLine(natRules, args...) } } @@ -810,10 +913,10 @@ func (proxier *Proxier) syncProxyRules() { // Finally, tail-call to the nodeports chain. This needs to be after all // other service portal rules. writeLine(natRules, - "-A", string(iptablesServicesChain), - "-m", "comment", "--comment", "\"kubernetes service nodeports; NOTE: this must be the last rule in this chain\"", + "-A", string(kubeServicesChain), + "-m", "comment", "--comment", `"kubernetes service nodeports; NOTE: this must be the last rule in this chain"`, "-m", "addrtype", "--dst-type", "LOCAL", - "-j", string(iptablesNodePortsChain)) + "-j", string(kubeNodePortsChain)) // Write the end-of-table markers. writeLine(filterRules, "COMMIT") @@ -825,23 +928,37 @@ func (proxier *Proxier) syncProxyRules() { natLines := append(natChains.Bytes(), natRules.Bytes()...) lines := append(filterLines, natLines...) - glog.V(3).Infof("Syncing iptables rules: %s", lines) + glog.V(3).Infof("Restoring iptables rules: %s", lines) err = proxier.iptables.RestoreAll(lines, utiliptables.NoFlushTables, utiliptables.RestoreCounters) if err != nil { - glog.Errorf("Failed to sync iptables rules: %v", err) + glog.Errorf("Failed to execute iptables-restore: %v", err) // Revert new local ports. for k, v := range newLocalPorts { glog.Errorf("Closing local port %s", k.String()) v.Close() } - } else { - // Close old local ports and save new ones. - for k, v := range proxier.portsMap { - if newLocalPorts[k] == nil { - v.Close() - } + return + } + + // Close old local ports and save new ones. + for k, v := range proxier.portsMap { + if newLocalPorts[k] == nil { + v.Close() + } + } + proxier.portsMap = newLocalPorts + + // Clean up the older SNAT rule which was directly in POSTROUTING. + // TODO(thockin): Remove this for v1.3 or v1.4. + args := []string{ + "-m", "comment", "--comment", "kubernetes service traffic requiring SNAT", + "-m", "mark", "--mark", oldIptablesMasqueradeMark, + "-j", "MASQUERADE", + } + if err := proxier.iptables.DeleteRule(utiliptables.TableNAT, utiliptables.ChainPostrouting, args...); err != nil { + if !utiliptables.IsNotFoundError(err) { + glog.Errorf("Error removing old-style SNAT rule: %v", err) } - proxier.portsMap = newLocalPorts } } diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go index 35a6b7585b2..76ba794811d 100644 --- a/pkg/proxy/userspace/proxier.go +++ b/pkg/proxy/userspace/proxier.go @@ -196,27 +196,37 @@ func CleanupLeftovers(ipt iptables.Interface) (encounteredError bool) { // Delete Rules first, then Flush and Delete Chains args := []string{"-m", "comment", "--comment", "handle ClusterIPs; NOTE: this must be before the NodePort rules"} if err := ipt.DeleteRule(iptables.TableNAT, iptables.ChainOutput, append(args, "-j", string(iptablesHostPortalChain))...); err != nil { - glog.Errorf("Error removing userspace rule: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error removing userspace rule: %v", err) + encounteredError = true + } } if err := ipt.DeleteRule(iptables.TableNAT, iptables.ChainPrerouting, append(args, "-j", string(iptablesContainerPortalChain))...); err != nil { - glog.Errorf("Error removing userspace rule: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error removing userspace rule: %v", err) + encounteredError = true + } } args = []string{"-m", "addrtype", "--dst-type", "LOCAL"} args = append(args, "-m", "comment", "--comment", "handle service NodePorts; NOTE: this must be the last rule in the chain") if err := ipt.DeleteRule(iptables.TableNAT, iptables.ChainOutput, append(args, "-j", string(iptablesHostNodePortChain))...); err != nil { - glog.Errorf("Error removing userspace rule: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error removing userspace rule: %v", err) + encounteredError = true + } } if err := ipt.DeleteRule(iptables.TableNAT, iptables.ChainPrerouting, append(args, "-j", string(iptablesContainerNodePortChain))...); err != nil { - glog.Errorf("Error removing userspace rule: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error removing userspace rule: %v", err) + encounteredError = true + } } args = []string{"-m", "comment", "--comment", "Ensure that non-local NodePort traffic can flow"} if err := ipt.DeleteRule(iptables.TableFilter, iptables.ChainInput, append(args, "-j", string(iptablesNonLocalNodePortChain))...); err != nil { - glog.Errorf("Error removing userspace rule: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error removing userspace rule: %v", err) + encounteredError = true + } } // flush and delete chains. @@ -228,12 +238,16 @@ func CleanupLeftovers(ipt iptables.Interface) (encounteredError bool) { for _, c := range chains { // flush chain, then if successful delete, delete will fail if flush fails. if err := ipt.FlushChain(table, c); err != nil { - glog.Errorf("Error flushing userspace chain: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error flushing userspace chain: %v", err) + encounteredError = true + } } else { if err = ipt.DeleteChain(table, c); err != nil { - glog.Errorf("Error deleting userspace chain: %v", err) - encounteredError = true + if !iptables.IsNotFoundError(err) { + glog.Errorf("Error deleting userspace chain: %v", err) + encounteredError = true + } } } } diff --git a/pkg/registry/pod/strategy.go b/pkg/registry/pod/strategy.go index 4e957fd1eb7..ffdeb988ef1 100644 --- a/pkg/registry/pod/strategy.go +++ b/pkg/registry/pod/strategy.go @@ -22,6 +22,7 @@ import ( "net/http" "net/url" "strconv" + "strings" "time" "k8s.io/kubernetes/pkg/api" @@ -231,6 +232,15 @@ func ResourceLocation(getter ResourceGetter, rt http.RoundTripper, ctx api.Conte return loc, rt, nil } +// getContainerNames returns a formatted string containing the container names +func getContainerNames(pod *api.Pod) string { + names := []string{} + for _, c := range pod.Spec.Containers { + names = append(names, c.Name) + } + return strings.Join(names, " ") +} + // LogLocation returns the log URL for a pod container. If opts.Container is blank // and only one container is present in the pod, that container is used. func LogLocation( @@ -249,10 +259,14 @@ func LogLocation( // If a container was provided, it must be valid container := opts.Container if len(container) == 0 { - if len(pod.Spec.Containers) == 1 { + switch len(pod.Spec.Containers) { + case 1: container = pod.Spec.Containers[0].Name - } else { + case 0: return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) + default: + containerNames := getContainerNames(pod) + return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s, choose one of: [%s]", name, containerNames)) } } else { if !podHasContainerWithName(pod, container) { @@ -386,10 +400,14 @@ func streamLocation( // Try to figure out a container // If a container was provided, it must be valid if container == "" { - if len(pod.Spec.Containers) == 1 { + switch len(pod.Spec.Containers) { + case 1: container = pod.Spec.Containers[0].Name - } else { + case 0: return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s", name)) + default: + containerNames := getContainerNames(pod) + return nil, nil, errors.NewBadRequest(fmt.Sprintf("a container name must be specified for pod %s, choose one of: [%s]", name, containerNames)) } } else { if !podHasContainerWithName(pod, container) { diff --git a/pkg/registry/pod/strategy_test.go b/pkg/registry/pod/strategy_test.go index 17e746dd9b2..08ed1680e18 100644 --- a/pkg/registry/pod/strategy_test.go +++ b/pkg/registry/pod/strategy_test.go @@ -129,7 +129,7 @@ func TestCheckLogLocation(t *testing.T) { Status: api.PodStatus{}, }, opts: &api.PodLogOptions{}, - expectedErr: errors.NewBadRequest("a container name must be specified for pod test"), + expectedErr: errors.NewBadRequest("a container name must be specified for pod test, choose one of: [container1 container2]"), }, { in: &api.Pod{ diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index 4329dcc3f5d..801cc8bf726 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -296,6 +296,7 @@ func (runner *runner) Save(table Table) ([]byte, error) { // run and return args := []string{"-t", string(table)} + glog.V(4).Infof("running iptables-save %v", args) return runner.exec.Command(cmdIptablesSave, args...).CombinedOutput() } @@ -305,6 +306,7 @@ func (runner *runner) SaveAll() ([]byte, error) { defer runner.mu.Unlock() // run and return + glog.V(4).Infof("running iptables-save") return runner.exec.Command(cmdIptablesSave, []string{}...).CombinedOutput() } @@ -354,6 +356,7 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla return err } // run the command and return the output or an error including the output and error + glog.V(4).Infof("running iptables-restore %v", args) b, err := runner.exec.Command(cmdIptablesRestore, args...).CombinedOutput() if err != nil { return fmt.Errorf("%v (%s)", err, b) @@ -576,3 +579,17 @@ func (runner *runner) reload() { f() } } + +// IsNotFoundError returns true if the error indicates "not found". It parses +// the error string looking for known values, which is imperfect but works in +// practice. +func IsNotFoundError(err error) bool { + es := err.Error() + if strings.Contains(es, "No such file or directory") { + return true + } + if strings.Contains(es, "No chain/target/match by that name") { + return true + } + return false +} diff --git a/pkg/util/oom/oom_linux.go b/pkg/util/oom/oom_linux.go index 9a89dbde261..5503bad8c2c 100644 --- a/pkg/util/oom/oom_linux.go +++ b/pkg/util/oom/oom_linux.go @@ -21,6 +21,7 @@ package oom import ( "fmt" "io/ioutil" + "os" "path" "strconv" @@ -48,7 +49,18 @@ func getPids(cgroupName string) ([]int, error) { return fsManager.GetPids() } +func syscallNotExists(err error) bool { + if err == nil { + return false + } + if e, ok := err.(*os.SyscallError); ok && os.IsNotExist(e) { + return true + } + return false +} + // Writes 'value' to /proc//oom_score_adj. PID = 0 means self +// Returns os.ErrNotExist if the `pid` does not exist. func applyOOMScoreAdj(pid int, oomScoreAdj int) error { if pid < 0 { return fmt.Errorf("invalid PID %d specified for oom_score_adj", pid) @@ -61,20 +73,18 @@ func applyOOMScoreAdj(pid int, oomScoreAdj int) error { pidStr = strconv.Itoa(pid) } - oomScoreAdjPath := path.Join("/proc", pidStr, "oom_score_adj") maxTries := 2 + oomScoreAdjPath := path.Join("/proc", pidStr, "oom_score_adj") + value := strconv.Itoa(oomScoreAdj) var err error for i := 0; i < maxTries; i++ { - _, readErr := ioutil.ReadFile(oomScoreAdjPath) - if readErr != nil { - err = fmt.Errorf("failed to read oom_score_adj: %v", readErr) - } else if writeErr := ioutil.WriteFile(oomScoreAdjPath, []byte(strconv.Itoa(oomScoreAdj)), 0700); writeErr != nil { - err = fmt.Errorf("failed to set oom_score_adj to %d: %v", oomScoreAdj, writeErr) - } else { - return nil + if err = ioutil.WriteFile(oomScoreAdjPath, []byte(value), 0700); err != nil { + if syscallNotExists(err) { + return os.ErrNotExist + } + err = fmt.Errorf("failed to apply oom-score-adj to pid %d (%v)", err) } } - return err } @@ -86,6 +96,10 @@ func (oomAdjuster *OOMAdjuster) applyOOMScoreAdjContainer(cgroupName string, oom continueAdjusting := false pidList, err := oomAdjuster.pidLister(cgroupName) if err != nil { + if syscallNotExists(err) { + // Nothing to do since the container doesn't exist anymore. + return os.ErrNotExist + } continueAdjusting = true glog.Errorf("Error getting process list for cgroup %s: %+v", cgroupName, err) } else if len(pidList) == 0 { @@ -97,6 +111,7 @@ func (oomAdjuster *OOMAdjuster) applyOOMScoreAdjContainer(cgroupName string, oom if err = oomAdjuster.ApplyOOMScoreAdj(pid, oomScoreAdj); err == nil { adjustedProcessSet[pid] = true } + // Processes can come and go while we try to apply oom score adjust value. So ignore errors here. } } } diff --git a/pkg/util/procfs/procfs.go b/pkg/util/procfs/procfs.go index c0a45725fbf..cc432255fb2 100644 --- a/pkg/util/procfs/procfs.go +++ b/pkg/util/procfs/procfs.go @@ -19,6 +19,7 @@ package procfs import ( "fmt" "io/ioutil" + "os" "path" "strconv" "strings" @@ -48,6 +49,9 @@ func (pfs *ProcFS) GetFullContainerName(pid int) (string, error) { filePath := path.Join("/proc", strconv.Itoa(pid), "cgroup") content, err := ioutil.ReadFile(filePath) if err != nil { + if e, ok := err.(*os.SyscallError); ok && os.IsNotExist(e) { + return "", os.ErrNotExist + } return "", err } return containerNameFromProcCgroup(string(content)) diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go index aa94d8b0d09..fc42b7d99ff 100644 --- a/plugin/pkg/scheduler/generic_scheduler.go +++ b/plugin/pkg/scheduler/generic_scheduler.go @@ -20,7 +20,6 @@ import ( "bytes" "fmt" "math/rand" - "sort" "strings" "sync" @@ -101,20 +100,31 @@ func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeListe return g.selectHost(priorityList) } -// This method takes a prioritized list of nodes and sorts them in reverse order based on scores -// and then picks one randomly from the nodes that had the highest score +// selectHost takes a prioritized list of nodes and then picks one +// randomly from the nodes that had the highest score. func (g *genericScheduler) selectHost(priorityList schedulerapi.HostPriorityList) (string, error) { if len(priorityList) == 0 { return "", fmt.Errorf("empty priorityList") } - sort.Sort(sort.Reverse(priorityList)) - hosts := getBestHosts(priorityList) + maxScore := priorityList[0].Score + // idx contains indices of elements with score == maxScore. + idx := []int{} + + for i, entry := range priorityList { + if entry.Score > maxScore { + maxScore = entry.Score + idx = []int{i} + } else if entry.Score == maxScore { + idx = append(idx, i) + } + } + g.randomLock.Lock() - defer g.randomLock.Unlock() + ix := g.random.Int() % len(idx) + g.randomLock.Unlock() - ix := g.random.Int() % len(hosts) - return hosts[ix], nil + return priorityList[idx[ix]].Host, nil } // Filters the nodes to find the ones that fit based on the given predicate functions @@ -258,18 +268,6 @@ func PrioritizeNodes(pod *api.Pod, machinesToPods map[string][]*api.Pod, podList return result, nil } -func getBestHosts(list schedulerapi.HostPriorityList) []string { - result := []string{} - for _, hostEntry := range list { - if hostEntry.Score == list[0].Score { - result = append(result, hostEntry.Host) - } else { - break - } - } - return result -} - // EqualPriority is a prioritizer function that gives an equal weight of one to all nodes func EqualPriority(_ *api.Pod, machinesToPods map[string][]*api.Pod, podLister algorithm.PodLister, nodeLister algorithm.NodeLister) (schedulerapi.HostPriorityList, error) { nodes, err := nodeLister.List() diff --git a/plugin/pkg/scheduler/generic_scheduler_test.go b/plugin/pkg/scheduler/generic_scheduler_test.go index 3c403037b61..bd8360b26e4 100644 --- a/plugin/pkg/scheduler/generic_scheduler_test.go +++ b/plugin/pkg/scheduler/generic_scheduler_test.go @@ -166,14 +166,14 @@ func TestSelectHost(t *testing.T) { func TestGenericScheduler(t *testing.T) { tests := []struct { - name string - predicates map[string]algorithm.FitPredicate - prioritizers []algorithm.PriorityConfig - nodes []string - pod *api.Pod - pods []*api.Pod - expectedHost string - expectsErr bool + name string + predicates map[string]algorithm.FitPredicate + prioritizers []algorithm.PriorityConfig + nodes []string + pod *api.Pod + pods []*api.Pod + expectedHosts sets.String + expectsErr bool }{ { predicates: map[string]algorithm.FitPredicate{"false": falsePredicate}, @@ -183,44 +183,43 @@ func TestGenericScheduler(t *testing.T) { name: "test 1", }, { - predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, - prioritizers: []algorithm.PriorityConfig{{Function: EqualPriority, Weight: 1}}, - nodes: []string{"machine1", "machine2"}, - // Random choice between both, the rand seeded above with zero, chooses "machine1" - expectedHost: "machine1", - name: "test 2", + predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, + prioritizers: []algorithm.PriorityConfig{{Function: EqualPriority, Weight: 1}}, + nodes: []string{"machine1", "machine2"}, + expectedHosts: sets.NewString("machine1", "machine2"), + name: "test 2", }, { // Fits on a machine where the pod ID matches the machine name - predicates: map[string]algorithm.FitPredicate{"matches": matchesPredicate}, - prioritizers: []algorithm.PriorityConfig{{Function: EqualPriority, Weight: 1}}, - nodes: []string{"machine1", "machine2"}, - pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "machine2"}}, - expectedHost: "machine2", - name: "test 3", + predicates: map[string]algorithm.FitPredicate{"matches": matchesPredicate}, + prioritizers: []algorithm.PriorityConfig{{Function: EqualPriority, Weight: 1}}, + nodes: []string{"machine1", "machine2"}, + pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "machine2"}}, + expectedHosts: sets.NewString("machine2"), + name: "test 3", }, { - predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, - prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}}, - nodes: []string{"3", "2", "1"}, - expectedHost: "3", - name: "test 4", + predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, + prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}}, + nodes: []string{"3", "2", "1"}, + expectedHosts: sets.NewString("3"), + name: "test 4", }, { - predicates: map[string]algorithm.FitPredicate{"matches": matchesPredicate}, - prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}}, - nodes: []string{"3", "2", "1"}, - pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "2"}}, - expectedHost: "2", - name: "test 5", + predicates: map[string]algorithm.FitPredicate{"matches": matchesPredicate}, + prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}}, + nodes: []string{"3", "2", "1"}, + pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "2"}}, + expectedHosts: sets.NewString("2"), + name: "test 5", }, { - predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, - prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}, {Function: reverseNumericPriority, Weight: 2}}, - nodes: []string{"3", "2", "1"}, - pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "2"}}, - expectedHost: "1", - name: "test 6", + predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, + prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}, {Function: reverseNumericPriority, Weight: 2}}, + nodes: []string{"3", "2", "1"}, + pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "2"}}, + expectedHosts: sets.NewString("1"), + name: "test 6", }, { predicates: map[string]algorithm.FitPredicate{"true": truePredicate, "false": falsePredicate}, @@ -266,8 +265,8 @@ func TestGenericScheduler(t *testing.T) { if err != nil { t.Errorf("Unexpected error: %v", err) } - if test.expectedHost != machine { - t.Errorf("Failed : %s, Expected: %s, Saw: %s", test.name, test.expectedHost, machine) + if !test.expectedHosts.Has(machine) { + t.Errorf("Failed : %s, Expected: %s, Saw: %s", test.name, test.expectedHosts, machine) } } } diff --git a/test/e2e/core.go b/test/e2e/core.go index e0adc5754dd..3dd1896a80d 100644 --- a/test/e2e/core.go +++ b/test/e2e/core.go @@ -57,6 +57,7 @@ func CoreDump(dir string) { cmds = append(cmds, []command{ {"cat /var/log/kubelet.log", "kubelet"}, {"cat /var/log/supervisor/supervisord.log", "supervisord"}, + {"cat /var/log/dmesg", "dmesg"}, }...) } diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 4bebbfd460e..9cb3894e95b 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -184,13 +184,9 @@ var _ = Describe("Kubelet", func() { Expect(vs.CapacityBytes).NotTo(BeZero()) Expect(vs.AvailableBytes).NotTo(BeZero()) Expect(vs.UsedBytes).NotTo(BeZero()) - if strings.HasPrefix(vs.Name, "default-token-") { - volumeNames = append(volumeNames, "default-token-") - } else { - volumeNames = append(volumeNames, vs.Name) - } + volumeNames = append(volumeNames, vs.Name) } - Expect(volumeNames).To(ConsistOf("default-token-", "test-empty-dir")) + Expect(volumeNames).To(ConsistOf("test-empty-dir")) // fs usage (not for system containers) Expect(container.Rootfs).NotTo(BeNil(), spew.Sdump(container)) diff --git a/test/e2e_node/runner/run_e2e.go b/test/e2e_node/runner/run_e2e.go index 2e6921ba54c..e20c1328405 100644 --- a/test/e2e_node/runner/run_e2e.go +++ b/test/e2e_node/runner/run_e2e.go @@ -52,7 +52,7 @@ var kubeOutputRelPath = flag.String("k8s-build-output", "_output/local/bin/linux var kubeRoot = "" const buildScriptRelPath = "hack/build-go.sh" -const ginkoTestRelPath = "test/e2e_node" +const ginkgoTestRelPath = "test/e2e_node" const healthyTimeoutDuration = time.Minute * 3 func main() { @@ -158,9 +158,9 @@ func runTests(fullhost string) ([]byte, error) { glog.Infof("Kubelet host %s tunnel running on port %s", host, ah.LPort) u.Wait() glog.Infof("Running ginkgo tests against host %s", host) - ginkoTests := filepath.Join(kubeRoot, ginkoTestRelPath) + ginkgoTests := filepath.Join(kubeRoot, ginkgoTestRelPath) return exec.Command( - "ginkgo", ginkoTests, "--", + "ginkgo", ginkgoTests, "--", "--kubelet-address", fmt.Sprintf("http://127.0.0.1:%s", kh.LPort), "--api-server-address", fmt.Sprintf("http://127.0.0.1:%s", ah.LPort), "--node-name", fullhost,