From 2085b894be2b07583bd5bed65af54b50e1eb94bc Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Wed, 12 Oct 2016 14:59:40 +0100 Subject: [PATCH] Upgrade to Kubernetes 1.4.1 --- Godeps/Godeps.json | 2073 +++-- pkg/localkube/kube2sky/kube2sky.go | 13 +- vendor/github.com/spf13/cobra/.travis.yml | 16 +- vendor/github.com/spf13/cobra/README.md | 2 +- .../spf13/cobra/bash_completions.go | 21 +- vendor/github.com/spf13/cobra/cobra.go | 36 +- vendor/github.com/spf13/cobra/command.go | 97 +- vendor/github.com/spf13/cobra/doc/man_docs.go | 2 +- vendor/github.com/spf13/pflag/.travis.yml | 4 - vendor/github.com/spf13/pflag/bool.go | 7 +- vendor/github.com/spf13/pflag/count.go | 7 +- vendor/github.com/spf13/pflag/flag.go | 63 +- vendor/github.com/spf13/pflag/float32.go | 7 +- vendor/github.com/spf13/pflag/float64.go | 7 +- vendor/github.com/spf13/pflag/int.go | 7 +- vendor/github.com/spf13/pflag/int32.go | 7 +- vendor/github.com/spf13/pflag/int64.go | 7 +- vendor/github.com/spf13/pflag/int8.go | 7 +- vendor/github.com/spf13/pflag/string.go | 4 +- vendor/github.com/spf13/pflag/string_array.go | 110 - vendor/github.com/spf13/pflag/string_slice.go | 31 +- vendor/github.com/spf13/pflag/uint.go | 7 +- vendor/github.com/spf13/pflag/uint16.go | 9 +- vendor/github.com/spf13/pflag/uint32.go | 11 +- vendor/github.com/spf13/pflag/uint64.go | 7 +- vendor/github.com/spf13/pflag/uint8.go | 7 +- .../cmd/kube-apiserver/app/server.go | 24 +- .../app/controllermanager.go | 2 +- .../cmd/kube-proxy/app/options/options.go | 7 +- .../kubernetes/cmd/kube-proxy/app/server.go | 19 +- .../k8s.io/kubernetes/pkg/admission/init.go | 2 +- .../k8s.io/kubernetes/pkg/admission/types.go | 2 +- .../pkg/api/validation/validation.go | 3 + .../apis/componentconfig/types.generated.go | 6881 +++++++++-------- .../pkg/apis/componentconfig/types.go | 8 +- .../apis/componentconfig/v1alpha1/defaults.go | 3 + .../apis/componentconfig/v1alpha1/types.go | 8 +- .../v1alpha1/zz_generated.conversion.go | 2 + .../v1alpha1/zz_generated.deepcopy.go | 1 + .../componentconfig/zz_generated.deepcopy.go | 1 + .../kubernetes/pkg/apiserver/audit/audit.go | 12 +- .../kubernetes/pkg/auth/handlers/handlers.go | 6 +- .../framework => client/cache}/controller.go | 73 +- .../cache}/shared_informer.go | 35 +- .../pkg/controller/certificates/controller.go | 7 +- .../pkg/controller/controller_utils.go | 5 +- .../pkg/controller/daemon/daemoncontroller.go | 27 +- .../deployment/deployment_controller.go | 19 +- .../pkg/controller/disruption/disruption.go | 31 +- .../endpoint/endpoints_controller.go | 19 +- .../pkg/controller/framework/doc.go | 18 - .../framework/fake_controller_source.go | 262 - .../garbagecollector/garbagecollector.go | 7 +- .../{framework => }/informers/core.go | 21 +- .../{framework => }/informers/factory.go | 25 +- .../pkg/controller/job/jobcontroller.go | 15 +- .../namespace/namespace_controller.go | 7 +- .../pkg/controller/node/nodecontroller.go | 25 +- .../pkg/controller/petset/pet_set.go | 13 +- .../controller/podautoscaler/horizontal.go | 9 +- .../podautoscaler/metrics/metrics_client.go | 6 +- .../pkg/controller/podgc/gc_controller.go | 7 +- .../pkg/controller/replicaset/replica_set.go | 19 +- .../replication/replication_controller.go | 19 +- .../resourcequota/replenishment_controller.go | 37 +- .../resource_quota_controller.go | 11 +- .../pkg/controller/route/routecontroller.go | 2 +- .../controller/service/servicecontroller.go | 7 +- .../serviceaccounts_controller.go | 13 +- .../serviceaccount/tokens_controller.go | 13 +- .../attachdetach/attach_detach_controller.go | 18 +- .../cache/actual_state_of_world.go | 57 +- .../desired_state_of_world_populator.go | 5 +- .../statusupdater/node_status_updater.go | 17 +- .../volume/persistentvolume/controller.go | 28 +- .../persistentvolume/controller_base.go | 25 +- .../pkg/genericapiserver/genericapiserver.go | 3 +- .../options/server_run_options.go | 6 +- .../pkg/genericapiserver/tunneler.go | 7 +- .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 3 - .../pkg/kubelet/kubelet_node_status.go | 16 +- .../kubernetes/pkg/kubelet/kubelet_volumes.go | 6 + .../cache/actual_state_of_world.go | 9 +- .../pkg/storage/etcd/etcd_watcher.go | 10 +- vendor/k8s.io/kubernetes/pkg/version/base.go | 2 +- .../pkg/volume/host_path/host_path.go | 26 +- .../k8s.io/kubernetes/pkg/volume/nfs/nfs.go | 28 +- .../k8s.io/kubernetes/pkg/volume/plugins.go | 9 +- vendor/k8s.io/kubernetes/pkg/volume/util.go | 157 +- .../namespace/autoprovision/admission.go | 6 +- .../admission/namespace/exists/admission.go | 6 +- .../namespace/lifecycle/admission.go | 6 +- .../scheduler/algorithm/predicates/error.go | 1 + .../algorithm/predicates/predicates.go | 2 +- .../plugin/pkg/scheduler/factory/factory.go | 13 +- .../pkg/scheduler/schedulercache/cache.go | 4 +- 96 files changed, 5283 insertions(+), 5489 deletions(-) delete mode 100644 vendor/github.com/spf13/pflag/string_array.go rename vendor/k8s.io/kubernetes/pkg/{controller/framework => client/cache}/controller.go (83%) rename vendor/k8s.io/kubernetes/pkg/{controller/framework => client/cache}/shared_informer.go (90%) delete mode 100644 vendor/k8s.io/kubernetes/pkg/controller/framework/doc.go delete mode 100644 vendor/k8s.io/kubernetes/pkg/controller/framework/fake_controller_source.go rename vendor/k8s.io/kubernetes/pkg/controller/{framework => }/informers/core.go (90%) rename vendor/k8s.io/kubernetes/pkg/controller/{framework => }/informers/factory.go (89%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 0e527bb686..62982a0aac 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1866,11 +1866,11 @@ }, { "ImportPath": "github.com/spf13/cobra", - "Rev": "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744" + "Rev": "f62e98d28ab7ad31d707ba837a966378465c7b57" }, { "ImportPath": "github.com/spf13/cobra/doc", - "Rev": "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744" + "Rev": "f62e98d28ab7ad31d707ba837a966378465c7b57" }, { "ImportPath": "github.com/spf13/jwalterweatherman", @@ -1878,7 +1878,7 @@ }, { "ImportPath": "github.com/spf13/pflag", - "Rev": "c7e63cf4530bcd3ba943729cee0efeff2ebea63f" + "Rev": "1560c1005499d61b80f865c04d39ca7505bf7f0b" }, { "ImportPath": "github.com/spf13/viper", @@ -2531,2578 +2531,2573 @@ }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/admission", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/annotations", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/endpoints", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors/storage", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/meta", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/meta/metatypes", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/pod", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/resource", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/rest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/service", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/v1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery/registered", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/latest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v0", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v1beta1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication/v1beta1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/v1beta1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/v1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v2alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/v1beta1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/v1beta1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/audit", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/authenticator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/abac", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/union", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/handlers", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/user", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/capabilities", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/cache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/chaosclient", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/leaderelection", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/record", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/restclient", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/testing/core", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/transport", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery/fake", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/dynamic", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/auth", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/aws", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/azure", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/certificates", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/daemon", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/deployment", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/deployment/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/disruption", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/endpoint", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" - }, - { - "ImportPath": "k8s.io/kubernetes/pkg/controller/framework", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" - }, - { - "ImportPath": "k8s.io/kubernetes/pkg/controller/framework/informers", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/garbagecollector", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" + }, + { + "ImportPath": "k8s.io/kubernetes/pkg/controller/informers", + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/job", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/namespace", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/node", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/petset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podgc", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replicaset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replication", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/resourcequota", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/route", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/scheduledjob", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/service", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/serviceaccount", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/persistentvolume", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion/queryparams", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/aws", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/gcp", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/fieldpath", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/fields", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/authorizer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/openapi", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/healthz", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/httplog", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cadvisor", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/client", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cm", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/config", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/container", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/custommetrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockertools", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/envvars", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/events", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/eviction", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/images", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/kuberuntime", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/leaky", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/lifecycle", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/cni", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/exec", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/hairpin", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/hostport", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/kubenet", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pleg", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pod", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober/results", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/remote", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/rkt", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/portforward", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/remotecommand", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/stats", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/status", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/sysctl", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/types", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/cache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/format", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/ioutils", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/queue", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/sliceutils", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/populator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/labels", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/master", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/master/ports", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/exec", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/http", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/tcp", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/config", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/healthcheck", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/iptables", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/userspace", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/evaluator/core", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/generic", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/install", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/cachesize", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/certificates", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/certificates/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrole", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrole/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrole/policybased", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrolebinding", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrolebinding/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/clusterrolebinding/policybased", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/componentstatus", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/configmap", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/configmap/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/controller", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/controller/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/daemonset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/daemonset/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/deployment", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/deployment/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/endpoint", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/endpoint/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/event", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/event/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/registry", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/rest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/ingress", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/ingress/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/job", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/job/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/limitrange", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/limitrange/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/namespace", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/namespace/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/networkpolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/networkpolicy/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/node/rest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolume", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/petset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/petset/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/pod/rest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/poddisruptionbudget", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/poddisruptionbudget/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podsecuritypolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podsecuritypolicy/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podtemplate", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/podtemplate/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rangeallocation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/replicaset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/replicaset/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/resourcequota", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/resourcequota/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/role", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/role/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/role/policybased", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rolebinding", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rolebinding/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rolebinding/policybased", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/scheduledjob", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/scheduledjob/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/secret", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/secret/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/allocator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/allocator/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/ipallocator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/ipallocator/controller", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/portallocator", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/service/portallocator/controller", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/serviceaccount", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/storageclass", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/storageclass/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresource", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/tokenreview", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/json", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/protobuf", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/recognizer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/streaming", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/versioning", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/apparmor", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/apparmor", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/capabilities", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/group", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/selinux", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/user", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/securitycontext", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/selection", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/serviceaccount", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/ssh", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd3", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/storagebackend", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/storagebackend/factory", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/types", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/ui", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/ui/data/swagger", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/async", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/bandwidth", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/cache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/certificates", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chmod", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chown", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/clock", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/config", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/configz", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/crypto", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/dbus", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/diff", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/ebtables", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/env", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/errors", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/exec", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flock", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flowcontrol", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flushwriter", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/framer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/goroutinemap", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/hash", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/homedir", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream/spdy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/integer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/interrupt", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/intstr", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/io", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/iptables", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/json", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/keymutex", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/labels", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/limitwriter", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/maps", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/mount", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net/sets", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/node", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/oom", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/parsers", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/pod", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/procfs", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/proxy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/rand", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/replicaset", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/resourcecontainer", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/rlimit", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/runtime", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/selinux", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sets", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/slice", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strategicpatch", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strings", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sysctl", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/system", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/term", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/uuid", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation/field", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wait", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/workqueue", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wsstream", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/yaml", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/version", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/aws_ebs", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/azure_dd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/azure_file", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cephfs", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cinder", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/configmap", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/downwardapi", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/empty_dir", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/fc", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flexvolume", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flocker", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/gce_pd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/git_repo", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/glusterfs", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/host_path", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/iscsi", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/nfs", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/quobyte", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/rbd", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/secret", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/operationexecutor", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/types", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/volumehelper", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/vsphere_volume", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch/versioned", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/admit", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/antiaffinity", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/deny", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/exec", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/imagepolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/initialresources", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/limitranger", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/resourcequota", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/storageclass/default", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth/gcp", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth/oidc", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/factory", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/metrics", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/webhook", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/expansion", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/json", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/netutil", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/reflect", - "Comment": "v1.4.0", - "Rev": "a16c0a7f71a6f93c7e0f222d961f4675cd97a46b" + "Comment": "v1.4.1", + "Rev": "33cf7b9acbb2cb7c9c72a10d6636321fb180b159" } ] } diff --git a/pkg/localkube/kube2sky/kube2sky.go b/pkg/localkube/kube2sky/kube2sky.go index 15716d7e08..7435e982ff 100644 --- a/pkg/localkube/kube2sky/kube2sky.go +++ b/pkg/localkube/kube2sky/kube2sky.go @@ -45,7 +45,6 @@ import ( "k8s.io/kubernetes/pkg/client/restclient" kclient "k8s.io/kubernetes/pkg/client/unversioned" kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" - kframework "k8s.io/kubernetes/pkg/controller/framework" kselector "k8s.io/kubernetes/pkg/fields" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" "k8s.io/kubernetes/pkg/util/validation" @@ -556,11 +555,11 @@ func newKubeClient() (*kclient.Client, error) { } func watchForServices(kubeClient *kclient.Client, ks *kube2sky) kcache.Store { - serviceStore, serviceController := kframework.NewInformer( + serviceStore, serviceController := kcache.NewInformer( createServiceLW(kubeClient), &kapi.Service{}, resyncPeriod, - kframework.ResourceEventHandlerFuncs{ + kcache.ResourceEventHandlerFuncs{ AddFunc: ks.newService, DeleteFunc: ks.removeService, UpdateFunc: ks.updateService, @@ -571,11 +570,11 @@ func watchForServices(kubeClient *kclient.Client, ks *kube2sky) kcache.Store { } func watchEndpoints(kubeClient *kclient.Client, ks *kube2sky) kcache.Store { - eStore, eController := kframework.NewInformer( + eStore, eController := kcache.NewInformer( createEndpointsLW(kubeClient), &kapi.Endpoints{}, resyncPeriod, - kframework.ResourceEventHandlerFuncs{ + kcache.ResourceEventHandlerFuncs{ AddFunc: ks.handleEndpointAdd, UpdateFunc: func(oldObj, newObj interface{}) { // TODO: Avoid unwanted updates. @@ -589,11 +588,11 @@ func watchEndpoints(kubeClient *kclient.Client, ks *kube2sky) kcache.Store { } func watchPods(kubeClient *kclient.Client, ks *kube2sky) kcache.Store { - eStore, eController := kframework.NewInformer( + eStore, eController := kcache.NewInformer( createEndpointsPodLW(kubeClient), &kapi.Pod{}, resyncPeriod, - kframework.ResourceEventHandlerFuncs{ + kcache.ResourceEventHandlerFuncs{ AddFunc: ks.handlePodCreate, UpdateFunc: func(oldObj, newObj interface{}) { ks.handlePodUpdate(oldObj, newObj) diff --git a/vendor/github.com/spf13/cobra/.travis.yml b/vendor/github.com/spf13/cobra/.travis.yml index bd72adf685..6e84be54d1 100644 --- a/vendor/github.com/spf13/cobra/.travis.yml +++ b/vendor/github.com/spf13/cobra/.travis.yml @@ -1,13 +1,11 @@ language: go +go: + - 1.4.3 + - 1.5.4 + - 1.6.3 + - tip matrix: - include: - - go: 1.4.3 - env: NOVET=true # No bundled vet. - - go: 1.5.4 - - go: 1.6.3 - - go: 1.7 - - go: tip allow_failures: - go: tip @@ -18,7 +16,3 @@ before_install: script: - PATH=$PATH:$PWD/bin go test -v ./... - go build - - diff -u <(echo -n) <(gofmt -d -s .) - - if [ -z $NOVET ]; then - diff -u <(echo -n) <(go tool vet . 2>&1 | grep -vE 'ExampleCommand|bash_completions.*Fprint'); - fi diff --git a/vendor/github.com/spf13/cobra/README.md b/vendor/github.com/spf13/cobra/README.md index 5d2504b1cf..b338a0e442 100644 --- a/vendor/github.com/spf13/cobra/README.md +++ b/vendor/github.com/spf13/cobra/README.md @@ -663,7 +663,7 @@ command.SetUsageTemplate(s string) ## PreRun or PostRun Hooks -It is possible to run functions before or after the main `Run` function of your command. The `PersistentPreRun` and `PreRun` functions will be executed before `Run`. `PersistentPostRun` and `PostRun` will be executed after `Run`. The `Persistent*Run` functions will be inherited by children if they do not declare their own. These functions are run in the following order: +It is possible to run functions before or after the main `Run` function of your command. The `PersistentPreRun` and `PreRun` functions will be executed before `Run`. `PersistentPostRun` and `PostRun` will be executed after `Run`. The `Persistent*Run` functions will be inherrited by children if they do not declare their own. These function are run in the following order: - `PersistentPreRun` - `PreRun` diff --git a/vendor/github.com/spf13/cobra/bash_completions.go b/vendor/github.com/spf13/cobra/bash_completions.go index 7a5bd4d7dd..236dee67f2 100644 --- a/vendor/github.com/spf13/cobra/bash_completions.go +++ b/vendor/github.com/spf13/cobra/bash_completions.go @@ -11,7 +11,7 @@ import ( ) const ( - BashCompFilenameExt = "cobra_annotation_bash_completion_filename_extensions" + BashCompFilenameExt = "cobra_annotation_bash_completion_filename_extentions" BashCompCustom = "cobra_annotation_bash_completion_custom" BashCompOneRequiredFlag = "cobra_annotation_bash_completion_one_required_flag" BashCompSubdirsInDir = "cobra_annotation_bash_completion_subdirs_in_dir" @@ -401,8 +401,10 @@ func writeLocalNonPersistentFlag(flag *pflag.Flag, w io.Writer) error { format += "=" } format += "\")\n" - _, err := fmt.Fprintf(w, format, name) - return err + if _, err := fmt.Fprintf(w, format, name); err != nil { + return err + } + return nil } func writeFlags(cmd *Command, w io.Writer) error { @@ -419,9 +421,6 @@ func writeFlags(cmd *Command, w io.Writer) error { localNonPersistentFlags := cmd.LocalNonPersistentFlags() var visitErr error cmd.NonInheritedFlags().VisitAll(func(flag *pflag.Flag) { - if nonCompletableFlag(flag) { - return - } if err := writeFlag(flag, w); err != nil { visitErr = err return @@ -443,9 +442,6 @@ func writeFlags(cmd *Command, w io.Writer) error { return visitErr } cmd.InheritedFlags().VisitAll(func(flag *pflag.Flag) { - if nonCompletableFlag(flag) { - return - } if err := writeFlag(flag, w); err != nil { visitErr = err return @@ -472,9 +468,6 @@ func writeRequiredFlag(cmd *Command, w io.Writer) error { flags := cmd.NonInheritedFlags() var visitErr error flags.VisitAll(func(flag *pflag.Flag) { - if nonCompletableFlag(flag) { - return - } for key := range flag.Annotations { switch key { case BashCompOneRequiredFlag: @@ -581,10 +574,6 @@ func (cmd *Command) GenBashCompletion(w io.Writer) error { return postscript(w, cmd.Name()) } -func nonCompletableFlag(flag *pflag.Flag) bool { - return flag.Hidden || len(flag.Deprecated) > 0 -} - func (cmd *Command) GenBashCompletionFile(filename string) error { outFile, err := os.Create(filename) if err != nil { diff --git a/vendor/github.com/spf13/cobra/cobra.go b/vendor/github.com/spf13/cobra/cobra.go index b39c715a51..93a2c0f3a7 100644 --- a/vendor/github.com/spf13/cobra/cobra.go +++ b/vendor/github.com/spf13/cobra/cobra.go @@ -37,36 +37,38 @@ var templateFuncs = template.FuncMap{ var initializers []func() -// Automatic prefix matching can be a dangerous thing to automatically enable in CLI tools. -// Set this to true to enable it. +// automatic prefix matching can be a dangerous thing to automatically enable in CLI tools. +// Set this to true to enable it var EnablePrefixMatching = false -// EnableCommandSorting controls sorting of the slice of commands, which is turned on by default. -// To disable sorting, set it to false. +//EnableCommandSorting controls sorting of the slice of commands, which is turned on by default. +//To disable sorting, set it to false. var EnableCommandSorting = true -// AddTemplateFunc adds a template function that's available to Usage and Help -// template generation. +//AddTemplateFunc adds a template function that's available to Usage and Help +//template generation. func AddTemplateFunc(name string, tmplFunc interface{}) { templateFuncs[name] = tmplFunc } -// AddTemplateFuncs adds multiple template functions availalble to Usage and -// Help template generation. +//AddTemplateFuncs adds multiple template functions availalble to Usage and +//Help template generation. func AddTemplateFuncs(tmplFuncs template.FuncMap) { for k, v := range tmplFuncs { templateFuncs[k] = v } } -// OnInitialize takes a series of func() arguments and appends them to a slice of func(). +//OnInitialize takes a series of func() arguments and appends them to a slice of func(). func OnInitialize(y ...func()) { - initializers = append(initializers, y...) + for _, x := range y { + initializers = append(initializers, x) + } } -// Gt takes two types and checks whether the first type is greater than the second. In case of types Arrays, Chans, -// Maps and Slices, Gt will compare their lengths. Ints are compared directly while strings are first parsed as -// ints and then compared. +//Gt takes two types and checks whether the first type is greater than the second. In case of types Arrays, Chans, +//Maps and Slices, Gt will compare their lengths. Ints are compared directly while strings are first parsed as +//ints and then compared. func Gt(a interface{}, b interface{}) bool { var left, right int64 av := reflect.ValueOf(a) @@ -94,7 +96,7 @@ func Gt(a interface{}, b interface{}) bool { return left > right } -// Eq takes two types and checks whether they are equal. Supported types are int and string. Unsupported types will panic. +//Eq takes two types and checks whether they are equal. Supported types are int and string. Unsupported types will panic. func Eq(a interface{}, b interface{}) bool { av := reflect.ValueOf(a) bv := reflect.ValueOf(b) @@ -114,7 +116,7 @@ func trimRightSpace(s string) string { return strings.TrimRightFunc(s, unicode.IsSpace) } -// appendIfNotPresent will append stringToAppend to the end of s, but only if it's not yet present in s. +// appendIfNotPresent will append stringToAppend to the end of s, but only if it's not yet present in s func appendIfNotPresent(s, stringToAppend string) string { if strings.Contains(s, stringToAppend) { return s @@ -122,7 +124,7 @@ func appendIfNotPresent(s, stringToAppend string) string { return s + " " + stringToAppend } -// rpad adds padding to the right of a string. +//rpad adds padding to the right of a string func rpad(s string, padding int) string { template := fmt.Sprintf("%%-%ds", padding) return fmt.Sprintf(template, s) @@ -136,7 +138,7 @@ func tmpl(w io.Writer, text string, data interface{}) error { return t.Execute(w, data) } -// ld compares two strings and returns the levenshtein distance between them. +// ld compares two strings and returns the levenshtein distance between them func ld(s, t string, ignoreCase bool) int { if ignoreCase { s = strings.ToLower(s) diff --git a/vendor/github.com/spf13/cobra/command.go b/vendor/github.com/spf13/cobra/command.go index 9ae98369f6..083e4ea7f4 100644 --- a/vendor/github.com/spf13/cobra/command.go +++ b/vendor/github.com/spf13/cobra/command.go @@ -140,17 +140,17 @@ func (c *Command) SetOutput(output io.Writer) { c.output = &output } -// Usage can be defined by application. +// Usage can be defined by application func (c *Command) SetUsageFunc(f func(*Command) error) { c.usageFunc = f } -// Can be defined by Application. +// Can be defined by Application func (c *Command) SetUsageTemplate(s string) { c.usageTemplate = s } -// Can be defined by Application. +// Can be defined by Application func (c *Command) SetHelpFunc(f func(*Command, []string)) { c.helpFunc = f } @@ -159,7 +159,7 @@ func (c *Command) SetHelpCommand(cmd *Command) { c.helpCommand = cmd } -// Can be defined by Application. +// Can be defined by Application func (c *Command) SetHelpTemplate(s string) { c.helpTemplate = s } @@ -195,7 +195,7 @@ func (c *Command) getOut(def io.Writer) io.Writer { } // UsageFunc returns either the function set by SetUsageFunc for this command -// or a parent, or it returns a default usage function. +// or a parent, or it returns a default usage function func (c *Command) UsageFunc() (f func(*Command) error) { if c.usageFunc != nil { return c.usageFunc @@ -214,15 +214,15 @@ func (c *Command) UsageFunc() (f func(*Command) error) { } } -// Usage puts out the usage for the command. -// Used when a user provides invalid input. -// Can be defined by user by overriding UsageFunc. +// Output the usage for the command +// Used when a user provides invalid input +// Can be defined by user by overriding UsageFunc func (c *Command) Usage() error { return c.UsageFunc()(c) } // HelpFunc returns either the function set by SetHelpFunc for this command -// or a parent, or it returns a function with default help behavior. +// or a parent, or it returns a function with default help behavior func (c *Command) HelpFunc() func(*Command, []string) { cmd := c for cmd != nil { @@ -240,9 +240,9 @@ func (c *Command) HelpFunc() func(*Command, []string) { } } -// Help puts out the help for the command. -// Used when a user calls help [command]. -// Can be defined by user by overriding HelpFunc. +// Output the help for the command +// Used when a user calls help [command] +// Can be defined by user by overriding HelpFunc func (c *Command) Help() error { c.HelpFunc()(c, []string{}) return nil @@ -333,7 +333,7 @@ func (c *Command) HelpTemplate() string { {{end}}{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}` } -// Really only used when casting a command to a commander. +// Really only used when casting a command to a commander func (c *Command) resetChildrensParents() { for _, x := range c.commands { x.parent = c @@ -745,13 +745,13 @@ func (c *Command) initHelpCmd() { c.AddCommand(c.helpCommand) } -// Used for testing. +// Used for testing func (c *Command) ResetCommands() { c.commands = nil c.helpCommand = nil } -// Sorts commands by their names. +// Sorts commands by their names type commandSorterByName []*Command func (c commandSorterByName) Len() int { return len(c) } @@ -831,18 +831,18 @@ main: } } -// Print is a convenience method to Print to the defined output, fallback to Stderr if not set. +// Print is a convenience method to Print to the defined output, fallback to Stderr if not set func (c *Command) Print(i ...interface{}) { fmt.Fprint(c.OutOrStderr(), i...) } -// Println is a convenience method to Println to the defined output, fallback to Stderr if not set. +// Println is a convenience method to Println to the defined output, fallback to Stderr if not set func (c *Command) Println(i ...interface{}) { str := fmt.Sprintln(i...) c.Print(str) } -// Printf is a convenience method to Printf to the defined output, fallback to Stderr if not set. +// Printf is a convenience method to Printf to the defined output, fallback to Stderr if not set func (c *Command) Printf(format string, i ...interface{}) { str := fmt.Sprintf(format, i...) c.Print(str) @@ -859,7 +859,7 @@ func (c *Command) CommandPath() string { return str } -// UseLine puts out the full usage for a given command (including parents). +//The full usage for a given command (including parents) func (c *Command) UseLine() string { str := "" if c.HasParent() { @@ -869,7 +869,7 @@ func (c *Command) UseLine() string { } // For use in determining which flags have been assigned to which commands -// and which persist. +// and which persist func (c *Command) DebugFlags() { c.Println("DebugFlags called on", c.Name()) var debugflags func(*Command) @@ -944,18 +944,18 @@ func (c *Command) HasExample() bool { return len(c.Example) > 0 } -// Runnable determines if the command is itself runnable. +// Runnable determines if the command is itself runnable func (c *Command) Runnable() bool { return c.Run != nil || c.RunE != nil } -// HasSubCommands determines if the command has children commands. +// HasSubCommands determines if the command has children commands func (c *Command) HasSubCommands() bool { return len(c.commands) > 0 } // IsAvailableCommand determines if a command is available as a non-help command -// (this includes all non deprecated/hidden commands). +// (this includes all non deprecated/hidden commands) func (c *Command) IsAvailableCommand() bool { if len(c.Deprecated) != 0 || c.Hidden { return false @@ -974,7 +974,7 @@ func (c *Command) IsAvailableCommand() bool { // IsHelpCommand determines if a command is a 'help' command; a help command is // determined by the fact that it is NOT runnable/hidden/deprecated, and has no -// sub commands that are runnable/hidden/deprecated. +// sub commands that are runnable/hidden/deprecated func (c *Command) IsHelpCommand() bool { // if a command is runnable, deprecated, or hidden it is not a 'help' command @@ -993,9 +993,9 @@ func (c *Command) IsHelpCommand() bool { return true } -// HasHelpSubCommands determines if a command has any available 'help' sub commands +// HasHelpSubCommands determines if a command has any avilable 'help' sub commands // that need to be shown in the usage/help default template under 'additional help -// topics'. +// topics' func (c *Command) HasHelpSubCommands() bool { // return true on the first found available 'help' sub command @@ -1010,7 +1010,7 @@ func (c *Command) HasHelpSubCommands() bool { } // HasAvailableSubCommands determines if a command has available sub commands that -// need to be shown in the usage/help default template under 'available commands'. +// need to be shown in the usage/help default template under 'available commands' func (c *Command) HasAvailableSubCommands() bool { // return true on the first found available (non deprecated/help/hidden) @@ -1026,18 +1026,17 @@ func (c *Command) HasAvailableSubCommands() bool { return false } -// HasParent determines if the command is a child command. +// Determine if the command is a child command func (c *Command) HasParent() bool { return c.parent != nil } -// GlobalNormalizationFunc returns the global normalization function or nil if doesn't exists. +// GlobalNormalizationFunc returns the global normalization function or nil if doesn't exists func (c *Command) GlobalNormalizationFunc() func(f *flag.FlagSet, name string) flag.NormalizedName { return c.globNormFunc } -// Flage returns the complete FlagSet that applies -// to this command (local and persistent declared here and by all parents). +// Get the complete FlagSet that applies to this command (local and persistent declared here and by all parents) func (c *Command) Flags() *flag.FlagSet { if c.flags == nil { c.flags = flag.NewFlagSet(c.Name(), flag.ContinueOnError) @@ -1049,7 +1048,7 @@ func (c *Command) Flags() *flag.FlagSet { return c.flags } -// LocalNonPersistentFlags are flags specific to this command which will NOT persist to subcommands. +// LocalNonPersistentFlags are flags specific to this command which will NOT persist to subcommands func (c *Command) LocalNonPersistentFlags() *flag.FlagSet { persistentFlags := c.PersistentFlags() @@ -1062,7 +1061,7 @@ func (c *Command) LocalNonPersistentFlags() *flag.FlagSet { return out } -// LocalFlags returns the local FlagSet specifically set in the current command. +// Get the local FlagSet specifically set in the current command func (c *Command) LocalFlags() *flag.FlagSet { c.mergePersistentFlags() @@ -1080,7 +1079,7 @@ func (c *Command) LocalFlags() *flag.FlagSet { return local } -// InheritedFlags returns all flags which were inherited from parents commands. +// All Flags which were inherited from parents commands func (c *Command) InheritedFlags() *flag.FlagSet { c.mergePersistentFlags() @@ -1109,12 +1108,12 @@ func (c *Command) InheritedFlags() *flag.FlagSet { return inherited } -// NonInheritedFlags returns all flags which were not inherited from parent commands. +// All Flags which were not inherited from parent commands func (c *Command) NonInheritedFlags() *flag.FlagSet { return c.LocalFlags() } -// PersistentFlags returns the persistent FlagSet specifically set in the current command. +// Get the Persistent FlagSet specifically set in the current command func (c *Command) PersistentFlags() *flag.FlagSet { if c.pflags == nil { c.pflags = flag.NewFlagSet(c.Name(), flag.ContinueOnError) @@ -1126,7 +1125,7 @@ func (c *Command) PersistentFlags() *flag.FlagSet { return c.pflags } -// ResetFlags is used in testing. +// For use in testing func (c *Command) ResetFlags() { c.flagErrorBuf = new(bytes.Buffer) c.flagErrorBuf.Reset() @@ -1136,50 +1135,50 @@ func (c *Command) ResetFlags() { c.pflags.SetOutput(c.flagErrorBuf) } -// Does the command contain any flags (local plus persistent from the entire structure). +// Does the command contain any flags (local plus persistent from the entire structure) func (c *Command) HasFlags() bool { return c.Flags().HasFlags() } -// Does the command contain persistent flags. +// Does the command contain persistent flags func (c *Command) HasPersistentFlags() bool { return c.PersistentFlags().HasFlags() } -// Does the command has flags specifically declared locally. +// Does the command has flags specifically declared locally func (c *Command) HasLocalFlags() bool { return c.LocalFlags().HasFlags() } -// Does the command have flags inherited from its parent command. +// Does the command have flags inherited from its parent command func (c *Command) HasInheritedFlags() bool { return c.InheritedFlags().HasFlags() } // Does the command contain any flags (local plus persistent from the entire -// structure) which are not hidden or deprecated. +// structure) which are not hidden or deprecated func (c *Command) HasAvailableFlags() bool { return c.Flags().HasAvailableFlags() } -// Does the command contain persistent flags which are not hidden or deprecated. +// Does the command contain persistent flags which are not hidden or deprecated func (c *Command) HasAvailablePersistentFlags() bool { return c.PersistentFlags().HasAvailableFlags() } // Does the command has flags specifically declared locally which are not hidden -// or deprecated. +// or deprecated func (c *Command) HasAvailableLocalFlags() bool { return c.LocalFlags().HasAvailableFlags() } // Does the command have flags inherited from its parent command which are -// not hidden or deprecated. +// not hidden or deprecated func (c *Command) HasAvailableInheritedFlags() bool { return c.InheritedFlags().HasAvailableFlags() } -// Flag climbs up the command tree looking for matching flag. +// Flag climbs up the command tree looking for matching flag func (c *Command) Flag(name string) (flag *flag.Flag) { flag = c.Flags().Lookup(name) @@ -1190,7 +1189,7 @@ func (c *Command) Flag(name string) (flag *flag.Flag) { return } -// Recursively find matching persistent flag. +// recursively find matching persistent flag func (c *Command) persistentFlag(name string) (flag *flag.Flag) { if c.HasPersistentFlags() { flag = c.PersistentFlags().Lookup(name) @@ -1202,7 +1201,7 @@ func (c *Command) persistentFlag(name string) (flag *flag.Flag) { return } -// ParseFlags parses persistent flag tree and local flags. +// ParseFlags parses persistent flag tree & local flags func (c *Command) ParseFlags(args []string) (err error) { if c.DisableFlagParsing { return nil @@ -1212,7 +1211,7 @@ func (c *Command) ParseFlags(args []string) (err error) { return } -// Parent returns a commands parent command. +// Parent returns a commands parent command func (c *Command) Parent() *Command { return c.parent } diff --git a/vendor/github.com/spf13/cobra/doc/man_docs.go b/vendor/github.com/spf13/cobra/doc/man_docs.go index 5798d0fbf4..b202029d1e 100644 --- a/vendor/github.com/spf13/cobra/doc/man_docs.go +++ b/vendor/github.com/spf13/cobra/doc/man_docs.go @@ -66,7 +66,7 @@ func GenManTreeFromOpts(cmd *cobra.Command, opts GenManTreeOptions) error { separator = opts.CommandSeparator } basename := strings.Replace(cmd.CommandPath(), " ", separator, -1) - filename := filepath.Join(opts.Path, basename+"."+section) + filename := filepath.Join(opts.Path, basename + "." + section) f, err := os.Create(filename) if err != nil { return err diff --git a/vendor/github.com/spf13/pflag/.travis.yml b/vendor/github.com/spf13/pflag/.travis.yml index 0a7c136222..580ad22f59 100644 --- a/vendor/github.com/spf13/pflag/.travis.yml +++ b/vendor/github.com/spf13/pflag/.travis.yml @@ -5,12 +5,8 @@ language: go go: - 1.5.4 - 1.6.3 - - 1.7 - tip -matrix: - allow_failures: - - go: tip install: - go get github.com/golang/lint/golint - export PATH=$GOPATH/bin:$PATH diff --git a/vendor/github.com/spf13/pflag/bool.go b/vendor/github.com/spf13/pflag/bool.go index c4c5c0bfda..d272e40bdd 100644 --- a/vendor/github.com/spf13/pflag/bool.go +++ b/vendor/github.com/spf13/pflag/bool.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // optional interface to indicate boolean flags that can be // supplied without "=value" text @@ -27,7 +30,7 @@ func (b *boolValue) Type() string { return "bool" } -func (b *boolValue) String() string { return strconv.FormatBool(bool(*b)) } +func (b *boolValue) String() string { return fmt.Sprintf("%v", *b) } func (b *boolValue) IsBoolFlag() bool { return true } diff --git a/vendor/github.com/spf13/pflag/count.go b/vendor/github.com/spf13/pflag/count.go index d22be41f29..7b1f142e78 100644 --- a/vendor/github.com/spf13/pflag/count.go +++ b/vendor/github.com/spf13/pflag/count.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- count Value type countValue int @@ -25,7 +28,7 @@ func (i *countValue) Type() string { return "count" } -func (i *countValue) String() string { return strconv.Itoa(int(*i)) } +func (i *countValue) String() string { return fmt.Sprintf("%v", *i) } func countConv(sval string) (interface{}, error) { i, err := strconv.Atoi(sval) diff --git a/vendor/github.com/spf13/pflag/flag.go b/vendor/github.com/spf13/pflag/flag.go index b0b0d46f7f..965df13797 100644 --- a/vendor/github.com/spf13/pflag/flag.go +++ b/vendor/github.com/spf13/pflag/flag.go @@ -419,36 +419,20 @@ func (f *FlagSet) PrintDefaults() { fmt.Fprintf(f.out(), "%s", usages) } -// defaultIsZeroValue returns true if the default value for this flag represents -// a zero value. -func (f *Flag) defaultIsZeroValue() bool { - switch f.Value.(type) { - case boolFlag: - return f.DefValue == "false" - case *durationValue: - // Beginning in Go 1.7, duration zero values are "0s" - return f.DefValue == "0" || f.DefValue == "0s" - case *intValue, *int8Value, *int32Value, *int64Value, *uintValue, *uint8Value, *uint16Value, *uint32Value, *uint64Value, *countValue, *float32Value, *float64Value: - return f.DefValue == "0" - case *stringValue: - return f.DefValue == "" - case *ipValue, *ipMaskValue, *ipNetValue: - return f.DefValue == "" - case *intSliceValue, *stringSliceValue, *stringArrayValue: - return f.DefValue == "[]" - default: - switch f.Value.String() { - case "false": - return true - case "": - return true - case "": - return true - case "0": - return true - } - return false +// isZeroValue guesses whether the string represents the zero +// value for a flag. It is not accurate but in practice works OK. +func isZeroValue(value string) bool { + switch value { + case "false": + return true + case "": + return true + case "": + return true + case "0": + return true } + return false } // UnquoteUsage extracts a back-quoted name from the usage @@ -471,19 +455,22 @@ func UnquoteUsage(flag *Flag) (name string, usage string) { break // Only one back quote; use type name. } } - - name = flag.Value.Type() - switch name { - case "bool": + // No explicit name, so use type if we can find one. + name = "value" + switch flag.Value.(type) { + case boolFlag: name = "" - case "float64": + case *durationValue: + name = "duration" + case *float64Value: name = "float" - case "int64": + case *intValue, *int64Value: name = "int" - case "uint64": + case *stringValue: + name = "string" + case *uintValue, *uint64Value: name = "uint" } - return } @@ -532,7 +519,7 @@ func (f *FlagSet) FlagUsages() string { } line += usage - if !flag.defaultIsZeroValue() { + if !isZeroValue(flag.DefValue) { if flag.Value.Type() == "string" { line += fmt.Sprintf(" (default %q)", flag.DefValue) } else { diff --git a/vendor/github.com/spf13/pflag/float32.go b/vendor/github.com/spf13/pflag/float32.go index a243f81f7f..7683fae1b1 100644 --- a/vendor/github.com/spf13/pflag/float32.go +++ b/vendor/github.com/spf13/pflag/float32.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- float32 Value type float32Value float32 @@ -20,7 +23,7 @@ func (f *float32Value) Type() string { return "float32" } -func (f *float32Value) String() string { return strconv.FormatFloat(float64(*f), 'g', -1, 32) } +func (f *float32Value) String() string { return fmt.Sprintf("%v", *f) } func float32Conv(sval string) (interface{}, error) { v, err := strconv.ParseFloat(sval, 32) diff --git a/vendor/github.com/spf13/pflag/float64.go b/vendor/github.com/spf13/pflag/float64.go index 04b5492a7d..50fbf8cc1a 100644 --- a/vendor/github.com/spf13/pflag/float64.go +++ b/vendor/github.com/spf13/pflag/float64.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- float64 Value type float64Value float64 @@ -20,7 +23,7 @@ func (f *float64Value) Type() string { return "float64" } -func (f *float64Value) String() string { return strconv.FormatFloat(float64(*f), 'g', -1, 64) } +func (f *float64Value) String() string { return fmt.Sprintf("%v", *f) } func float64Conv(sval string) (interface{}, error) { return strconv.ParseFloat(sval, 64) diff --git a/vendor/github.com/spf13/pflag/int.go b/vendor/github.com/spf13/pflag/int.go index 1474b89df6..b6560368a9 100644 --- a/vendor/github.com/spf13/pflag/int.go +++ b/vendor/github.com/spf13/pflag/int.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- int Value type intValue int @@ -20,7 +23,7 @@ func (i *intValue) Type() string { return "int" } -func (i *intValue) String() string { return strconv.Itoa(int(*i)) } +func (i *intValue) String() string { return fmt.Sprintf("%v", *i) } func intConv(sval string) (interface{}, error) { return strconv.Atoi(sval) diff --git a/vendor/github.com/spf13/pflag/int32.go b/vendor/github.com/spf13/pflag/int32.go index 9b95944f0f..41659a9aff 100644 --- a/vendor/github.com/spf13/pflag/int32.go +++ b/vendor/github.com/spf13/pflag/int32.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- int32 Value type int32Value int32 @@ -20,7 +23,7 @@ func (i *int32Value) Type() string { return "int32" } -func (i *int32Value) String() string { return strconv.FormatInt(int64(*i), 10) } +func (i *int32Value) String() string { return fmt.Sprintf("%v", *i) } func int32Conv(sval string) (interface{}, error) { v, err := strconv.ParseInt(sval, 0, 32) diff --git a/vendor/github.com/spf13/pflag/int64.go b/vendor/github.com/spf13/pflag/int64.go index 0026d781d9..6e67e380f4 100644 --- a/vendor/github.com/spf13/pflag/int64.go +++ b/vendor/github.com/spf13/pflag/int64.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- int64 Value type int64Value int64 @@ -20,7 +23,7 @@ func (i *int64Value) Type() string { return "int64" } -func (i *int64Value) String() string { return strconv.FormatInt(int64(*i), 10) } +func (i *int64Value) String() string { return fmt.Sprintf("%v", *i) } func int64Conv(sval string) (interface{}, error) { return strconv.ParseInt(sval, 0, 64) diff --git a/vendor/github.com/spf13/pflag/int8.go b/vendor/github.com/spf13/pflag/int8.go index 4da92228e6..400db21f5e 100644 --- a/vendor/github.com/spf13/pflag/int8.go +++ b/vendor/github.com/spf13/pflag/int8.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- int8 Value type int8Value int8 @@ -20,7 +23,7 @@ func (i *int8Value) Type() string { return "int8" } -func (i *int8Value) String() string { return strconv.FormatInt(int64(*i), 10) } +func (i *int8Value) String() string { return fmt.Sprintf("%v", *i) } func int8Conv(sval string) (interface{}, error) { v, err := strconv.ParseInt(sval, 0, 8) diff --git a/vendor/github.com/spf13/pflag/string.go b/vendor/github.com/spf13/pflag/string.go index 04e0a26ff7..e296136e5b 100644 --- a/vendor/github.com/spf13/pflag/string.go +++ b/vendor/github.com/spf13/pflag/string.go @@ -1,5 +1,7 @@ package pflag +import "fmt" + // -- string Value type stringValue string @@ -16,7 +18,7 @@ func (s *stringValue) Type() string { return "string" } -func (s *stringValue) String() string { return string(*s) } +func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) } func stringConv(sval string) (interface{}, error) { return sval, nil diff --git a/vendor/github.com/spf13/pflag/string_array.go b/vendor/github.com/spf13/pflag/string_array.go deleted file mode 100644 index f320f2ece3..0000000000 --- a/vendor/github.com/spf13/pflag/string_array.go +++ /dev/null @@ -1,110 +0,0 @@ -package pflag - -import ( - "fmt" - "strings" -) - -var _ = fmt.Fprint - -// -- stringArray Value -type stringArrayValue struct { - value *[]string - changed bool -} - -func newStringArrayValue(val []string, p *[]string) *stringArrayValue { - ssv := new(stringArrayValue) - ssv.value = p - *ssv.value = val - return ssv -} - -func (s *stringArrayValue) Set(val string) error { - if !s.changed { - *s.value = []string{val} - s.changed = true - } else { - *s.value = append(*s.value, val) - } - return nil -} - -func (s *stringArrayValue) Type() string { - return "stringArray" -} - -func (s *stringArrayValue) String() string { - str, _ := writeAsCSV(*s.value) - return "[" + str + "]" -} - -func stringArrayConv(sval string) (interface{}, error) { - sval = strings.Trim(sval, "[]") - // An empty string would cause a array with one (empty) string - if len(sval) == 0 { - return []string{}, nil - } - return readAsCSV(sval) -} - -// GetStringArray return the []string value of a flag with the given name -func (f *FlagSet) GetStringArray(name string) ([]string, error) { - val, err := f.getFlagType(name, "stringArray", stringArrayConv) - if err != nil { - return []string{}, err - } - return val.([]string), nil -} - -// StringArrayVar defines a string flag with specified name, default value, and usage string. -// The argument p points to a []string variable in which to store the values of the multiple flags. -// The value of each argument will not try to be separated by comma -func (f *FlagSet) StringArrayVar(p *[]string, name string, value []string, usage string) { - f.VarP(newStringArrayValue(value, p), name, "", usage) -} - -// StringArrayVarP is like StringArrayVar, but accepts a shorthand letter that can be used after a single dash. -func (f *FlagSet) StringArrayVarP(p *[]string, name, shorthand string, value []string, usage string) { - f.VarP(newStringArrayValue(value, p), name, shorthand, usage) -} - -// StringArrayVar defines a string flag with specified name, default value, and usage string. -// The argument p points to a []string variable in which to store the value of the flag. -// The value of each argument will not try to be separated by comma -func StringArrayVar(p *[]string, name string, value []string, usage string) { - CommandLine.VarP(newStringArrayValue(value, p), name, "", usage) -} - -// StringArrayVarP is like StringArrayVar, but accepts a shorthand letter that can be used after a single dash. -func StringArrayVarP(p *[]string, name, shorthand string, value []string, usage string) { - CommandLine.VarP(newStringArrayValue(value, p), name, shorthand, usage) -} - -// StringArray defines a string flag with specified name, default value, and usage string. -// The return value is the address of a []string variable that stores the value of the flag. -// The value of each argument will not try to be separated by comma -func (f *FlagSet) StringArray(name string, value []string, usage string) *[]string { - p := []string{} - f.StringArrayVarP(&p, name, "", value, usage) - return &p -} - -// StringArrayP is like StringArray, but accepts a shorthand letter that can be used after a single dash. -func (f *FlagSet) StringArrayP(name, shorthand string, value []string, usage string) *[]string { - p := []string{} - f.StringArrayVarP(&p, name, shorthand, value, usage) - return &p -} - -// StringArray defines a string flag with specified name, default value, and usage string. -// The return value is the address of a []string variable that stores the value of the flag. -// The value of each argument will not try to be separated by comma -func StringArray(name string, value []string, usage string) *[]string { - return CommandLine.StringArrayP(name, "", value, usage) -} - -// StringArrayP is like StringArray, but accepts a shorthand letter that can be used after a single dash. -func StringArrayP(name, shorthand string, value []string, usage string) *[]string { - return CommandLine.StringArrayP(name, shorthand, value, usage) -} diff --git a/vendor/github.com/spf13/pflag/string_slice.go b/vendor/github.com/spf13/pflag/string_slice.go index 51e3c5d223..b53648b2e5 100644 --- a/vendor/github.com/spf13/pflag/string_slice.go +++ b/vendor/github.com/spf13/pflag/string_slice.go @@ -1,7 +1,6 @@ package pflag import ( - "bytes" "encoding/csv" "fmt" "strings" @@ -22,28 +21,10 @@ func newStringSliceValue(val []string, p *[]string) *stringSliceValue { return ssv } -func readAsCSV(val string) ([]string, error) { - if val == "" { - return []string{}, nil - } +func (s *stringSliceValue) Set(val string) error { stringReader := strings.NewReader(val) csvReader := csv.NewReader(stringReader) - return csvReader.Read() -} - -func writeAsCSV(vals []string) (string, error) { - b := &bytes.Buffer{} - w := csv.NewWriter(b) - err := w.Write(vals) - if err != nil { - return "", err - } - w.Flush() - return strings.TrimSuffix(b.String(), fmt.Sprintln()), nil -} - -func (s *stringSliceValue) Set(val string) error { - v, err := readAsCSV(val) + v, err := csvReader.Read() if err != nil { return err } @@ -60,10 +41,7 @@ func (s *stringSliceValue) Type() string { return "stringSlice" } -func (s *stringSliceValue) String() string { - str, _ := writeAsCSV(*s.value) - return "[" + str + "]" -} +func (s *stringSliceValue) String() string { return "[" + strings.Join(*s.value, ",") + "]" } func stringSliceConv(sval string) (interface{}, error) { sval = strings.Trim(sval, "[]") @@ -71,7 +49,8 @@ func stringSliceConv(sval string) (interface{}, error) { if len(sval) == 0 { return []string{}, nil } - return readAsCSV(sval) + v := strings.Split(sval, ",") + return v, nil } // GetStringSlice return the []string value of a flag with the given name diff --git a/vendor/github.com/spf13/pflag/uint.go b/vendor/github.com/spf13/pflag/uint.go index dcbc2b758c..e142b49964 100644 --- a/vendor/github.com/spf13/pflag/uint.go +++ b/vendor/github.com/spf13/pflag/uint.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- uint Value type uintValue uint @@ -20,7 +23,7 @@ func (i *uintValue) Type() string { return "uint" } -func (i *uintValue) String() string { return strconv.FormatUint(uint64(*i), 10) } +func (i *uintValue) String() string { return fmt.Sprintf("%v", *i) } func uintConv(sval string) (interface{}, error) { v, err := strconv.ParseUint(sval, 0, 0) diff --git a/vendor/github.com/spf13/pflag/uint16.go b/vendor/github.com/spf13/pflag/uint16.go index 7e9914eddd..5c96c19dcf 100644 --- a/vendor/github.com/spf13/pflag/uint16.go +++ b/vendor/github.com/spf13/pflag/uint16.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- uint16 value type uint16Value uint16 @@ -9,7 +12,7 @@ func newUint16Value(val uint16, p *uint16) *uint16Value { *p = val return (*uint16Value)(p) } - +func (i *uint16Value) String() string { return fmt.Sprintf("%d", *i) } func (i *uint16Value) Set(s string) error { v, err := strconv.ParseUint(s, 0, 16) *i = uint16Value(v) @@ -20,8 +23,6 @@ func (i *uint16Value) Type() string { return "uint16" } -func (i *uint16Value) String() string { return strconv.FormatUint(uint64(*i), 10) } - func uint16Conv(sval string) (interface{}, error) { v, err := strconv.ParseUint(sval, 0, 16) if err != nil { diff --git a/vendor/github.com/spf13/pflag/uint32.go b/vendor/github.com/spf13/pflag/uint32.go index d8024539bf..294fcaa32d 100644 --- a/vendor/github.com/spf13/pflag/uint32.go +++ b/vendor/github.com/spf13/pflag/uint32.go @@ -1,15 +1,18 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) -// -- uint32 value +// -- uint16 value type uint32Value uint32 func newUint32Value(val uint32, p *uint32) *uint32Value { *p = val return (*uint32Value)(p) } - +func (i *uint32Value) String() string { return fmt.Sprintf("%d", *i) } func (i *uint32Value) Set(s string) error { v, err := strconv.ParseUint(s, 0, 32) *i = uint32Value(v) @@ -20,8 +23,6 @@ func (i *uint32Value) Type() string { return "uint32" } -func (i *uint32Value) String() string { return strconv.FormatUint(uint64(*i), 10) } - func uint32Conv(sval string) (interface{}, error) { v, err := strconv.ParseUint(sval, 0, 32) if err != nil { diff --git a/vendor/github.com/spf13/pflag/uint64.go b/vendor/github.com/spf13/pflag/uint64.go index f62240f2ce..c68188505a 100644 --- a/vendor/github.com/spf13/pflag/uint64.go +++ b/vendor/github.com/spf13/pflag/uint64.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- uint64 Value type uint64Value uint64 @@ -20,7 +23,7 @@ func (i *uint64Value) Type() string { return "uint64" } -func (i *uint64Value) String() string { return strconv.FormatUint(uint64(*i), 10) } +func (i *uint64Value) String() string { return fmt.Sprintf("%v", *i) } func uint64Conv(sval string) (interface{}, error) { v, err := strconv.ParseUint(sval, 0, 64) diff --git a/vendor/github.com/spf13/pflag/uint8.go b/vendor/github.com/spf13/pflag/uint8.go index bb0e83c1f6..26db418adf 100644 --- a/vendor/github.com/spf13/pflag/uint8.go +++ b/vendor/github.com/spf13/pflag/uint8.go @@ -1,6 +1,9 @@ package pflag -import "strconv" +import ( + "fmt" + "strconv" +) // -- uint8 Value type uint8Value uint8 @@ -20,7 +23,7 @@ func (i *uint8Value) Type() string { return "uint8" } -func (i *uint8Value) String() string { return strconv.FormatUint(uint64(*i), 10) } +func (i *uint8Value) String() string { return fmt.Sprintf("%v", *i) } func uint8Conv(sval string) (interface{}, error) { v, err := strconv.ParseUint(sval, 0, 8) diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go index 53bde52b39..26dba03c88 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/apiserver/authenticator" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/genericapiserver/authorizer" @@ -140,6 +140,28 @@ func Run(s *options.APIServer) error { glog.Fatalf("Failed to start kubelet client: %v", err) } + if s.StorageConfig.DeserializationCacheSize == 0 { + // When size of cache is not explicitly set, estimate its size based on + // target memory usage. + glog.V(2).Infof("Initalizing deserialization cache size based on %dMB limit", s.TargetRAMMB) + + // This is the heuristics that from memory capacity is trying to infer + // the maximum number of nodes in the cluster and set cache sizes based + // on that value. + // From our documentation, we officially recomment 120GB machines for + // 2000 nodes, and we scale from that point. Thus we assume ~60MB of + // capacity per node. + // TODO: We may consider deciding that some percentage of memory will + // be used for the deserialization cache and divide it by the max object + // size to compute its size. We may even go further and measure + // collective sizes of the objects in the cache. + clusterSize := s.TargetRAMMB / 60 + s.StorageConfig.DeserializationCacheSize = 25 * clusterSize + if s.StorageConfig.DeserializationCacheSize < 1000 { + s.StorageConfig.DeserializationCacheSize = 1000 + } + } + storageGroupsToEncodingVersion, err := s.StorageGroupsToEncodingVersion() if err != nil { glog.Fatalf("error generating storage version map: %s", err) diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go index 17491b6a52..e7323eb1f7 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go @@ -51,9 +51,9 @@ import ( "k8s.io/kubernetes/pkg/controller/deployment" "k8s.io/kubernetes/pkg/controller/disruption" endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint" - "k8s.io/kubernetes/pkg/controller/framework/informers" "k8s.io/kubernetes/pkg/controller/garbagecollector" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/controller/job" namespacecontroller "k8s.io/kubernetes/pkg/controller/namespace" nodecontroller "k8s.io/kubernetes/pkg/controller/node" diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/options/options.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/options/options.go index 848b1a9bab..40d89e3ea9 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/options/options.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/options/options.go @@ -85,9 +85,12 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { fs.Int32Var(&s.KubeAPIBurst, "kube-api-burst", s.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver") fs.DurationVar(&s.UDPIdleTimeout.Duration, "udp-timeout", s.UDPIdleTimeout.Duration, "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") fs.Int32Var(&s.ConntrackMax, "conntrack-max", s.ConntrackMax, - "Maximum number of NAT connections to track (0 to leave as-is).") + "Maximum number of NAT connections to track (0 to leave as-is). This overrides conntrack-max-per-core and conntrack-min.") + fs.MarkDeprecated("conntrack-max", "This feature will be removed in a later release.") fs.Int32Var(&s.ConntrackMaxPerCore, "conntrack-max-per-core", s.ConntrackMaxPerCore, - "Maximum number of NAT connections to track per CPU core (0 to leave as-is). This is only considered if conntrack-max is 0.") + "Maximum number of NAT connections to track per CPU core (0 to leave the limit as-is and ignore conntrack-min).") + fs.Int32Var(&s.ConntrackMin, "conntrack-min", s.ConntrackMin, + "Minimum number of conntrack entries to allocate, regardless of conntrack-max-per-core (set conntrack-max-per-core=0 to leave the limit as-is).") fs.DurationVar(&s.ConntrackTCPEstablishedTimeout.Duration, "conntrack-tcp-timeout-established", s.ConntrackTCPEstablishedTimeout.Duration, "Idle timeout for established TCP connections (0 to leave as-is)") config.DefaultFeatureGate.AddFlag(fs) } diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go index 8a6f9f92f0..1e40b13732 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server.go @@ -335,13 +335,22 @@ func (s *ProxyServer) Run() error { } func getConntrackMax(config *options.ProxyServerConfig) (int, error) { - if config.ConntrackMax > 0 && config.ConntrackMaxPerCore > 0 { - return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive") - } if config.ConntrackMax > 0 { + if config.ConntrackMaxPerCore > 0 { + return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive") + } + glog.V(3).Infof("getConntrackMax: using absolute conntrax-max (deprecated)") return int(config.ConntrackMax), nil - } else if config.ConntrackMaxPerCore > 0 { - return (int(config.ConntrackMaxPerCore) * runtime.NumCPU()), nil + } + if config.ConntrackMaxPerCore > 0 { + floor := int(config.ConntrackMin) + scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU() + if scaled > floor { + glog.V(3).Infof("getConntrackMax: using scaled conntrax-max-per-core") + return scaled, nil + } + glog.V(3).Infof("getConntrackMax: using conntrax-min") + return floor, nil } return 0, nil } diff --git a/vendor/k8s.io/kubernetes/pkg/admission/init.go b/vendor/k8s.io/kubernetes/pkg/admission/init.go index c4433ffce5..9fc40c13aa 100644 --- a/vendor/k8s.io/kubernetes/pkg/admission/init.go +++ b/vendor/k8s.io/kubernetes/pkg/admission/init.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" ) // PluginInitializer is used for initialization of shareable resources between admission plugins. diff --git a/vendor/k8s.io/kubernetes/pkg/admission/types.go b/vendor/k8s.io/kubernetes/pkg/admission/types.go index 76b802124c..69609b7e1e 100644 --- a/vendor/k8s.io/kubernetes/pkg/admission/types.go +++ b/vendor/k8s.io/kubernetes/pkg/admission/types.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" ) // Validator holds Validate functions, which are responsible for validation of initialized shared resources diff --git a/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go index e0d777c6b3..8d95be1b52 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go @@ -2568,6 +2568,9 @@ func ValidateServiceUpdate(service, oldService *api.Service) field.ErrorList { allErrs = append(allErrs, ValidateImmutableField(service.Spec.ClusterIP, oldService.Spec.ClusterIP, field.NewPath("spec", "clusterIP"))...) } + // TODO(freehan): allow user to update loadbalancerSourceRanges + allErrs = append(allErrs, ValidateImmutableField(service.Spec.LoadBalancerSourceRanges, oldService.Spec.LoadBalancerSourceRanges, field.NewPath("spec", "loadBalancerSourceRanges"))...) + allErrs = append(allErrs, ValidateService(service)...) return allErrs } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go index 16a30a69b8..dc2a692d2d 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go @@ -83,16 +83,16 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep2 := !z.EncBinary() yy2arr2 := z.EncBasicHandle().StructToArray - var yyq2 [20]bool + var yyq2 [21]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false yyq2[0] = x.Kind != "" yyq2[1] = x.APIVersion != "" var yynn2 int if yyr2 || yy2arr2 { - r.EncodeArrayStart(20) + r.EncodeArrayStart(21) } else { - yynn2 = 18 + yynn2 = 19 for _, b := range yyq2 { if b { yynn2++ @@ -502,29 +502,48 @@ func (x *KubeProxyConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy67 := &x.ConntrackTCPEstablishedTimeout + yym67 := z.EncBinary() + _ = yym67 + if false { + } else { + r.EncodeInt(int64(x.ConntrackMin)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("conntrackMin")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) yym68 := z.EncBinary() _ = yym68 if false { - } else if z.HasExtensions() && z.EncExt(yy67) { - } else if !yym68 && z.IsJSONHandle() { - z.EncJSONMarshal(yy67) } else { - z.EncFallback(yy67) + r.EncodeInt(int64(x.ConntrackMin)) + } + } + if yyr2 || yy2arr2 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy70 := &x.ConntrackTCPEstablishedTimeout + yym71 := z.EncBinary() + _ = yym71 + if false { + } else if z.HasExtensions() && z.EncExt(yy70) { + } else if !yym71 && z.IsJSONHandle() { + z.EncJSONMarshal(yy70) + } else { + z.EncFallback(yy70) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conntrackTCPEstablishedTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy69 := &x.ConntrackTCPEstablishedTimeout - yym70 := z.EncBinary() - _ = yym70 + yy72 := &x.ConntrackTCPEstablishedTimeout + yym73 := z.EncBinary() + _ = yym73 if false { - } else if z.HasExtensions() && z.EncExt(yy69) { - } else if !yym70 && z.IsJSONHandle() { - z.EncJSONMarshal(yy69) + } else if z.HasExtensions() && z.EncExt(yy72) { + } else if !yym73 && z.IsJSONHandle() { + z.EncJSONMarshal(yy72) } else { - z.EncFallback(yy69) + z.EncFallback(yy72) } } if yyr2 || yy2arr2 { @@ -540,25 +559,25 @@ func (x *KubeProxyConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym71 := z.DecBinary() - _ = yym71 + yym74 := z.DecBinary() + _ = yym74 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct72 := r.ContainerType() - if yyct72 == codecSelferValueTypeMap1234 { - yyl72 := r.ReadMapStart() - if yyl72 == 0 { + yyct75 := r.ContainerType() + if yyct75 == codecSelferValueTypeMap1234 { + yyl75 := r.ReadMapStart() + if yyl75 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl72, d) + x.codecDecodeSelfFromMap(yyl75, d) } - } else if yyct72 == codecSelferValueTypeArray1234 { - yyl72 := r.ReadArrayStart() - if yyl72 == 0 { + } else if yyct75 == codecSelferValueTypeArray1234 { + yyl75 := r.ReadArrayStart() + if yyl75 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl72, d) + x.codecDecodeSelfFromArray(yyl75, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -570,12 +589,12 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys73Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys73Slc - var yyhl73 bool = l >= 0 - for yyj73 := 0; ; yyj73++ { - if yyhl73 { - if yyj73 >= l { + var yys76Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys76Slc + var yyhl76 bool = l >= 0 + for yyj76 := 0; ; yyj76++ { + if yyhl76 { + if yyj76 >= l { break } } else { @@ -584,10 +603,10 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys73Slc = r.DecodeBytes(yys73Slc, true, true) - yys73 := string(yys73Slc) + yys76Slc = r.DecodeBytes(yys76Slc, true, true) + yys76 := string(yys76Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys73 { + switch yys76 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -639,8 +658,8 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if x.IPTablesMasqueradeBit == nil { x.IPTablesMasqueradeBit = new(int32) } - yym82 := z.DecBinary() - _ = yym82 + yym85 := z.DecBinary() + _ = yym85 if false { } else { *((*int32)(x.IPTablesMasqueradeBit)) = int32(r.DecodeInt(32)) @@ -650,15 +669,15 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv83 := &x.IPTablesSyncPeriod - yym84 := z.DecBinary() - _ = yym84 + yyv86 := &x.IPTablesSyncPeriod + yym87 := z.DecBinary() + _ = yym87 if false { - } else if z.HasExtensions() && z.DecExt(yyv83) { - } else if !yym84 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv83) + } else if z.HasExtensions() && z.DecExt(yyv86) { + } else if !yym87 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv86) } else { - z.DecFallback(yyv83, false) + z.DecFallback(yyv86, false) } } case "kubeconfigPath": @@ -688,8 +707,8 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int32) } - yym89 := z.DecBinary() - _ = yym89 + yym92 := z.DecBinary() + _ = yym92 if false { } else { *((*int32)(x.OOMScoreAdj)) = int32(r.DecodeInt(32)) @@ -717,15 +736,15 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv93 := &x.UDPIdleTimeout - yym94 := z.DecBinary() - _ = yym94 + yyv96 := &x.UDPIdleTimeout + yym97 := z.DecBinary() + _ = yym97 if false { - } else if z.HasExtensions() && z.DecExt(yyv93) { - } else if !yym94 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv93) + } else if z.HasExtensions() && z.DecExt(yyv96) { + } else if !yym97 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv96) } else { - z.DecFallback(yyv93, false) + z.DecFallback(yyv96, false) } } case "conntrackMax": @@ -740,25 +759,31 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } else { x.ConntrackMaxPerCore = int32(r.DecodeInt(32)) } + case "conntrackMin": + if r.TryDecodeAsNil() { + x.ConntrackMin = 0 + } else { + x.ConntrackMin = int32(r.DecodeInt(32)) + } case "conntrackTCPEstablishedTimeout": if r.TryDecodeAsNil() { x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} } else { - yyv97 := &x.ConntrackTCPEstablishedTimeout - yym98 := z.DecBinary() - _ = yym98 + yyv101 := &x.ConntrackTCPEstablishedTimeout + yym102 := z.DecBinary() + _ = yym102 if false { - } else if z.HasExtensions() && z.DecExt(yyv97) { - } else if !yym98 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv97) + } else if z.HasExtensions() && z.DecExt(yyv101) { + } else if !yym102 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv101) } else { - z.DecFallback(yyv97, false) + z.DecFallback(yyv101, false) } } default: - z.DecStructFieldNotFound(-1, yys73) - } // end switch yys73 - } // end for yyj73 + z.DecStructFieldNotFound(-1, yys76) + } // end switch yys76 + } // end for yyj76 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -766,16 +791,16 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj99 int - var yyb99 bool - var yyhl99 bool = l >= 0 - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + var yyj103 int + var yyb103 bool + var yyhl103 bool = l >= 0 + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -785,13 +810,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Kind = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -801,13 +826,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.APIVersion = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -817,13 +842,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.BindAddress = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -833,13 +858,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ClusterCIDR = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -849,13 +874,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -865,13 +890,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -881,13 +906,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.HostnameOverride = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -900,20 +925,20 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if x.IPTablesMasqueradeBit == nil { x.IPTablesMasqueradeBit = new(int32) } - yym108 := z.DecBinary() - _ = yym108 + yym112 := z.DecBinary() + _ = yym112 if false { } else { *((*int32)(x.IPTablesMasqueradeBit)) = int32(r.DecodeInt(32)) } } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -921,24 +946,24 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv109 := &x.IPTablesSyncPeriod - yym110 := z.DecBinary() - _ = yym110 + yyv113 := &x.IPTablesSyncPeriod + yym114 := z.DecBinary() + _ = yym114 if false { - } else if z.HasExtensions() && z.DecExt(yyv109) { - } else if !yym110 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv109) + } else if z.HasExtensions() && z.DecExt(yyv113) { + } else if !yym114 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv113) } else { - z.DecFallback(yyv109, false) + z.DecFallback(yyv113, false) } } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -948,13 +973,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.KubeconfigPath = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -964,13 +989,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.MasqueradeAll = bool(r.DecodeBool()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -980,13 +1005,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Master = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -999,20 +1024,20 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if x.OOMScoreAdj == nil { x.OOMScoreAdj = new(int32) } - yym115 := z.DecBinary() - _ = yym115 + yym119 := z.DecBinary() + _ = yym119 if false { } else { *((*int32)(x.OOMScoreAdj)) = int32(r.DecodeInt(32)) } } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1022,13 +1047,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Mode = ProxyMode(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1038,13 +1063,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.PortRange = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1054,13 +1079,13 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.ResourceContainer = string(r.DecodeString()) } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l } else { - yyb99 = r.CheckBreak() + yyb103 = r.CheckBreak() } - if yyb99 { + if yyb103 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -1068,64 +1093,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.UDPIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv119 := &x.UDPIdleTimeout - yym120 := z.DecBinary() - _ = yym120 - if false { - } else if z.HasExtensions() && z.DecExt(yyv119) { - } else if !yym120 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv119) - } else { - z.DecFallback(yyv119, false) - } - } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l - } else { - yyb99 = r.CheckBreak() - } - if yyb99 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ConntrackMax = 0 - } else { - x.ConntrackMax = int32(r.DecodeInt(32)) - } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l - } else { - yyb99 = r.CheckBreak() - } - if yyb99 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ConntrackMaxPerCore = 0 - } else { - x.ConntrackMaxPerCore = int32(r.DecodeInt(32)) - } - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l - } else { - yyb99 = r.CheckBreak() - } - if yyb99 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} - } else { - yyv123 := &x.ConntrackTCPEstablishedTimeout + yyv123 := &x.UDPIdleTimeout yym124 := z.DecBinary() _ = yym124 if false { @@ -1136,18 +1104,91 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De z.DecFallback(yyv123, false) } } - for { - yyj99++ - if yyhl99 { - yyb99 = yyj99 > l + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ConntrackMax = 0 + } else { + x.ConntrackMax = int32(r.DecodeInt(32)) + } + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ConntrackMaxPerCore = 0 + } else { + x.ConntrackMaxPerCore = int32(r.DecodeInt(32)) + } + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ConntrackMin = 0 + } else { + x.ConntrackMin = int32(r.DecodeInt(32)) + } + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + } else { + yyv128 := &x.ConntrackTCPEstablishedTimeout + yym129 := z.DecBinary() + _ = yym129 + if false { + } else if z.HasExtensions() && z.DecExt(yyv128) { + } else if !yym129 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv128) } else { - yyb99 = r.CheckBreak() + z.DecFallback(yyv128, false) } - if yyb99 { + } + for { + yyj103++ + if yyhl103 { + yyb103 = yyj103 > l + } else { + yyb103 = r.CheckBreak() + } + if yyb103 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj99-1, "") + z.DecStructFieldNotFound(yyj103-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -1156,8 +1197,8 @@ func (x ProxyMode) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym125 := z.EncBinary() - _ = yym125 + yym130 := z.EncBinary() + _ = yym130 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -1169,8 +1210,8 @@ func (x *ProxyMode) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym126 := z.DecBinary() - _ = yym126 + yym131 := z.DecBinary() + _ = yym131 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -1182,8 +1223,8 @@ func (x HairpinMode) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym127 := z.EncBinary() - _ = yym127 + yym132 := z.EncBinary() + _ = yym132 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -1195,8 +1236,8 @@ func (x *HairpinMode) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym128 := z.DecBinary() - _ = yym128 + yym133 := z.DecBinary() + _ = yym133 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -1211,56 +1252,56 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym129 := z.EncBinary() - _ = yym129 + yym134 := z.EncBinary() + _ = yym134 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep130 := !z.EncBinary() - yy2arr130 := z.EncBasicHandle().StructToArray - var yyq130 [107]bool - _, _, _ = yysep130, yyq130, yy2arr130 - const yyr130 bool = false - yyq130[0] = x.Kind != "" - yyq130[1] = x.APIVersion != "" - yyq130[53] = x.CloudProvider != "" - yyq130[54] = x.CloudConfigFile != "" - yyq130[55] = x.KubeletCgroups != "" - yyq130[56] = x.CgroupsPerQOS != false - yyq130[57] = x.RuntimeCgroups != "" - yyq130[58] = x.SystemCgroups != "" - yyq130[59] = x.CgroupRoot != "" - yyq130[63] = true - yyq130[64] = x.RktPath != "" - yyq130[65] = x.RktAPIEndpoint != "" - yyq130[66] = x.RktStage1Image != "" - yyq130[87] = true - yyq130[88] = x.NodeIP != "" - yyq130[92] = x.EvictionHard != "" - yyq130[93] = x.EvictionSoft != "" - yyq130[94] = x.EvictionSoftGracePeriod != "" - yyq130[95] = true - yyq130[96] = x.EvictionMaxPodGracePeriod != 0 - yyq130[97] = x.EvictionMinimumReclaim != "" - yyq130[106] = len(x.AllowedUnsafeSysctls) != 0 - var yynn130 int - if yyr130 || yy2arr130 { + yysep135 := !z.EncBinary() + yy2arr135 := z.EncBasicHandle().StructToArray + var yyq135 [107]bool + _, _, _ = yysep135, yyq135, yy2arr135 + const yyr135 bool = false + yyq135[0] = x.Kind != "" + yyq135[1] = x.APIVersion != "" + yyq135[53] = x.CloudProvider != "" + yyq135[54] = x.CloudConfigFile != "" + yyq135[55] = x.KubeletCgroups != "" + yyq135[56] = x.CgroupsPerQOS != false + yyq135[57] = x.RuntimeCgroups != "" + yyq135[58] = x.SystemCgroups != "" + yyq135[59] = x.CgroupRoot != "" + yyq135[63] = true + yyq135[64] = x.RktPath != "" + yyq135[65] = x.RktAPIEndpoint != "" + yyq135[66] = x.RktStage1Image != "" + yyq135[87] = true + yyq135[88] = x.NodeIP != "" + yyq135[92] = x.EvictionHard != "" + yyq135[93] = x.EvictionSoft != "" + yyq135[94] = x.EvictionSoftGracePeriod != "" + yyq135[95] = true + yyq135[96] = x.EvictionMaxPodGracePeriod != 0 + yyq135[97] = x.EvictionMinimumReclaim != "" + yyq135[106] = len(x.AllowedUnsafeSysctls) != 0 + var yynn135 int + if yyr135 || yy2arr135 { r.EncodeArrayStart(107) } else { - yynn130 = 85 - for _, b := range yyq130 { + yynn135 = 85 + for _, b := range yyq135 { if b { - yynn130++ + yynn135++ } } - r.EncodeMapStart(yynn130) - yynn130 = 0 + r.EncodeMapStart(yynn135) + yynn135 = 0 } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[0] { - yym132 := z.EncBinary() - _ = yym132 + if yyq135[0] { + yym137 := z.EncBinary() + _ = yym137 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -1269,23 +1310,23 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[0] { + if yyq135[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym133 := z.EncBinary() - _ = yym133 + yym138 := z.EncBinary() + _ = yym138 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[1] { - yym135 := z.EncBinary() - _ = yym135 + if yyq135[1] { + yym140 := z.EncBinary() + _ = yym140 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -1294,22 +1335,22 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[1] { + if yyq135[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym136 := z.EncBinary() - _ = yym136 + yym141 := z.EncBinary() + _ = yym141 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym138 := z.EncBinary() - _ = yym138 + yym143 := z.EncBinary() + _ = yym143 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodManifestPath)) @@ -1318,43 +1359,16 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podManifestPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym139 := z.EncBinary() - _ = yym139 + yym144 := z.EncBinary() + _ = yym144 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodManifestPath)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy141 := &x.SyncFrequency - yym142 := z.EncBinary() - _ = yym142 - if false { - } else if z.HasExtensions() && z.EncExt(yy141) { - } else if !yym142 && z.IsJSONHandle() { - z.EncJSONMarshal(yy141) - } else { - z.EncFallback(yy141) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("syncFrequency")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy143 := &x.SyncFrequency - yym144 := z.EncBinary() - _ = yym144 - if false { - } else if z.HasExtensions() && z.EncExt(yy143) { - } else if !yym144 && z.IsJSONHandle() { - z.EncJSONMarshal(yy143) - } else { - z.EncFallback(yy143) - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy146 := &x.FileCheckFrequency + yy146 := &x.SyncFrequency yym147 := z.EncBinary() _ = yym147 if false { @@ -1366,9 +1380,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("fileCheckFrequency")) + r.EncodeString(codecSelferC_UTF81234, string("syncFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy148 := &x.FileCheckFrequency + yy148 := &x.SyncFrequency yym149 := z.EncBinary() _ = yym149 if false { @@ -1379,9 +1393,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy148) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy151 := &x.HTTPCheckFrequency + yy151 := &x.FileCheckFrequency yym152 := z.EncBinary() _ = yym152 if false { @@ -1393,9 +1407,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("httpCheckFrequency")) + r.EncodeString(codecSelferC_UTF81234, string("fileCheckFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy153 := &x.HTTPCheckFrequency + yy153 := &x.FileCheckFrequency yym154 := z.EncBinary() _ = yym154 if false { @@ -1406,10 +1420,37 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy153) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym156 := z.EncBinary() - _ = yym156 + yy156 := &x.HTTPCheckFrequency + yym157 := z.EncBinary() + _ = yym157 + if false { + } else if z.HasExtensions() && z.EncExt(yy156) { + } else if !yym157 && z.IsJSONHandle() { + z.EncJSONMarshal(yy156) + } else { + z.EncFallback(yy156) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("httpCheckFrequency")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy158 := &x.HTTPCheckFrequency + yym159 := z.EncBinary() + _ = yym159 + if false { + } else if z.HasExtensions() && z.EncExt(yy158) { + } else if !yym159 && z.IsJSONHandle() { + z.EncJSONMarshal(yy158) + } else { + z.EncFallback(yy158) + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym161 := z.EncBinary() + _ = yym161 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURL)) @@ -1418,17 +1459,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("manifestURL")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym157 := z.EncBinary() - _ = yym157 + yym162 := z.EncBinary() + _ = yym162 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURL)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym159 := z.EncBinary() - _ = yym159 + yym164 := z.EncBinary() + _ = yym164 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURLHeader)) @@ -1437,17 +1478,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("manifestURLHeader")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym160 := z.EncBinary() - _ = yym160 + yym165 := z.EncBinary() + _ = yym165 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ManifestURLHeader)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym162 := z.EncBinary() - _ = yym162 + yym167 := z.EncBinary() + _ = yym167 if false { } else { r.EncodeBool(bool(x.EnableServer)) @@ -1456,17 +1497,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableServer")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym163 := z.EncBinary() - _ = yym163 + yym168 := z.EncBinary() + _ = yym168 if false { } else { r.EncodeBool(bool(x.EnableServer)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym165 := z.EncBinary() - _ = yym165 + yym170 := z.EncBinary() + _ = yym170 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -1475,17 +1516,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym166 := z.EncBinary() - _ = yym166 + yym171 := z.EncBinary() + _ = yym171 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym168 := z.EncBinary() - _ = yym168 + yym173 := z.EncBinary() + _ = yym173 if false { } else { r.EncodeInt(int64(x.Port)) @@ -1494,17 +1535,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym169 := z.EncBinary() - _ = yym169 + yym174 := z.EncBinary() + _ = yym174 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym171 := z.EncBinary() - _ = yym171 + yym176 := z.EncBinary() + _ = yym176 if false { } else { r.EncodeInt(int64(x.ReadOnlyPort)) @@ -1513,17 +1554,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readOnlyPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym172 := z.EncBinary() - _ = yym172 + yym177 := z.EncBinary() + _ = yym177 if false { } else { r.EncodeInt(int64(x.ReadOnlyPort)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym174 := z.EncBinary() - _ = yym174 + yym179 := z.EncBinary() + _ = yym179 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSCertFile)) @@ -1532,17 +1573,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tlsCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym175 := z.EncBinary() - _ = yym175 + yym180 := z.EncBinary() + _ = yym180 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSCertFile)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym177 := z.EncBinary() - _ = yym177 + yym182 := z.EncBinary() + _ = yym182 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSPrivateKeyFile)) @@ -1551,17 +1592,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tlsPrivateKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym178 := z.EncBinary() - _ = yym178 + yym183 := z.EncBinary() + _ = yym183 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.TLSPrivateKeyFile)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym180 := z.EncBinary() - _ = yym180 + yym185 := z.EncBinary() + _ = yym185 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CertDirectory)) @@ -1570,17 +1611,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("certDirectory")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym181 := z.EncBinary() - _ = yym181 + yym186 := z.EncBinary() + _ = yym186 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CertDirectory)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym183 := z.EncBinary() - _ = yym183 + yym188 := z.EncBinary() + _ = yym188 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostnameOverride)) @@ -1589,17 +1630,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostnameOverride")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym184 := z.EncBinary() - _ = yym184 + yym189 := z.EncBinary() + _ = yym189 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HostnameOverride)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym186 := z.EncBinary() - _ = yym186 + yym191 := z.EncBinary() + _ = yym191 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodInfraContainerImage)) @@ -1608,17 +1649,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podInfraContainerImage")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym187 := z.EncBinary() - _ = yym187 + yym192 := z.EncBinary() + _ = yym192 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodInfraContainerImage)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym189 := z.EncBinary() - _ = yym189 + yym194 := z.EncBinary() + _ = yym194 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerEndpoint)) @@ -1627,17 +1668,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("dockerEndpoint")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym190 := z.EncBinary() - _ = yym190 + yym195 := z.EncBinary() + _ = yym195 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerEndpoint)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym192 := z.EncBinary() - _ = yym192 + yym197 := z.EncBinary() + _ = yym197 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootDirectory)) @@ -1646,17 +1687,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootDirectory")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym193 := z.EncBinary() - _ = yym193 + yym198 := z.EncBinary() + _ = yym198 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootDirectory)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym195 := z.EncBinary() - _ = yym195 + yym200 := z.EncBinary() + _ = yym200 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SeccompProfileRoot)) @@ -1665,17 +1706,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seccompProfileRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym196 := z.EncBinary() - _ = yym196 + yym201 := z.EncBinary() + _ = yym201 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SeccompProfileRoot)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym198 := z.EncBinary() - _ = yym198 + yym203 := z.EncBinary() + _ = yym203 if false { } else { r.EncodeBool(bool(x.AllowPrivileged)) @@ -1684,20 +1725,20 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allowPrivileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym199 := z.EncBinary() - _ = yym199 + yym204 := z.EncBinary() + _ = yym204 if false { } else { r.EncodeBool(bool(x.AllowPrivileged)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.HostNetworkSources == nil { r.EncodeNil() } else { - yym201 := z.EncBinary() - _ = yym201 + yym206 := z.EncBinary() + _ = yym206 if false { } else { z.F.EncSliceStringV(x.HostNetworkSources, false, e) @@ -1710,21 +1751,21 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.HostNetworkSources == nil { r.EncodeNil() } else { - yym202 := z.EncBinary() - _ = yym202 + yym207 := z.EncBinary() + _ = yym207 if false { } else { z.F.EncSliceStringV(x.HostNetworkSources, false, e) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.HostPIDSources == nil { r.EncodeNil() } else { - yym204 := z.EncBinary() - _ = yym204 + yym209 := z.EncBinary() + _ = yym209 if false { } else { z.F.EncSliceStringV(x.HostPIDSources, false, e) @@ -1737,21 +1778,21 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.HostPIDSources == nil { r.EncodeNil() } else { - yym205 := z.EncBinary() - _ = yym205 + yym210 := z.EncBinary() + _ = yym210 if false { } else { z.F.EncSliceStringV(x.HostPIDSources, false, e) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.HostIPCSources == nil { r.EncodeNil() } else { - yym207 := z.EncBinary() - _ = yym207 + yym212 := z.EncBinary() + _ = yym212 if false { } else { z.F.EncSliceStringV(x.HostIPCSources, false, e) @@ -1764,18 +1805,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.HostIPCSources == nil { r.EncodeNil() } else { - yym208 := z.EncBinary() - _ = yym208 + yym213 := z.EncBinary() + _ = yym213 if false { } else { z.F.EncSliceStringV(x.HostIPCSources, false, e) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym210 := z.EncBinary() - _ = yym210 + yym215 := z.EncBinary() + _ = yym215 if false { } else { r.EncodeInt(int64(x.RegistryPullQPS)) @@ -1784,17 +1825,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registryPullQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym211 := z.EncBinary() - _ = yym211 + yym216 := z.EncBinary() + _ = yym216 if false { } else { r.EncodeInt(int64(x.RegistryPullQPS)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym213 := z.EncBinary() - _ = yym213 + yym218 := z.EncBinary() + _ = yym218 if false { } else { r.EncodeInt(int64(x.RegistryBurst)) @@ -1803,17 +1844,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registryBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym214 := z.EncBinary() - _ = yym214 + yym219 := z.EncBinary() + _ = yym219 if false { } else { r.EncodeInt(int64(x.RegistryBurst)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym216 := z.EncBinary() - _ = yym216 + yym221 := z.EncBinary() + _ = yym221 if false { } else { r.EncodeInt(int64(x.EventRecordQPS)) @@ -1822,17 +1863,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("eventRecordQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym217 := z.EncBinary() - _ = yym217 + yym222 := z.EncBinary() + _ = yym222 if false { } else { r.EncodeInt(int64(x.EventRecordQPS)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym219 := z.EncBinary() - _ = yym219 + yym224 := z.EncBinary() + _ = yym224 if false { } else { r.EncodeInt(int64(x.EventBurst)) @@ -1841,17 +1882,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("eventBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym220 := z.EncBinary() - _ = yym220 + yym225 := z.EncBinary() + _ = yym225 if false { } else { r.EncodeInt(int64(x.EventBurst)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym222 := z.EncBinary() - _ = yym222 + yym227 := z.EncBinary() + _ = yym227 if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) @@ -1860,44 +1901,44 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDebuggingHandlers")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym223 := z.EncBinary() - _ = yym223 + yym228 := z.EncBinary() + _ = yym228 if false { } else { r.EncodeBool(bool(x.EnableDebuggingHandlers)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy225 := &x.MinimumGCAge - yym226 := z.EncBinary() - _ = yym226 + yy230 := &x.MinimumGCAge + yym231 := z.EncBinary() + _ = yym231 if false { - } else if z.HasExtensions() && z.EncExt(yy225) { - } else if !yym226 && z.IsJSONHandle() { - z.EncJSONMarshal(yy225) + } else if z.HasExtensions() && z.EncExt(yy230) { + } else if !yym231 && z.IsJSONHandle() { + z.EncJSONMarshal(yy230) } else { - z.EncFallback(yy225) + z.EncFallback(yy230) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumGCAge")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy227 := &x.MinimumGCAge - yym228 := z.EncBinary() - _ = yym228 + yy232 := &x.MinimumGCAge + yym233 := z.EncBinary() + _ = yym233 if false { - } else if z.HasExtensions() && z.EncExt(yy227) { - } else if !yym228 && z.IsJSONHandle() { - z.EncJSONMarshal(yy227) + } else if z.HasExtensions() && z.EncExt(yy232) { + } else if !yym233 && z.IsJSONHandle() { + z.EncJSONMarshal(yy232) } else { - z.EncFallback(yy227) + z.EncFallback(yy232) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym230 := z.EncBinary() - _ = yym230 + yym235 := z.EncBinary() + _ = yym235 if false { } else { r.EncodeInt(int64(x.MaxPerPodContainerCount)) @@ -1906,17 +1947,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxPerPodContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym231 := z.EncBinary() - _ = yym231 + yym236 := z.EncBinary() + _ = yym236 if false { } else { r.EncodeInt(int64(x.MaxPerPodContainerCount)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym233 := z.EncBinary() - _ = yym233 + yym238 := z.EncBinary() + _ = yym238 if false { } else { r.EncodeInt(int64(x.MaxContainerCount)) @@ -1925,17 +1966,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxContainerCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym234 := z.EncBinary() - _ = yym234 + yym239 := z.EncBinary() + _ = yym239 if false { } else { r.EncodeInt(int64(x.MaxContainerCount)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym236 := z.EncBinary() - _ = yym236 + yym241 := z.EncBinary() + _ = yym241 if false { } else { r.EncodeInt(int64(x.CAdvisorPort)) @@ -1944,17 +1985,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cAdvisorPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym237 := z.EncBinary() - _ = yym237 + yym242 := z.EncBinary() + _ = yym242 if false { } else { r.EncodeInt(int64(x.CAdvisorPort)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym239 := z.EncBinary() - _ = yym239 + yym244 := z.EncBinary() + _ = yym244 if false { } else { r.EncodeInt(int64(x.HealthzPort)) @@ -1963,17 +2004,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("healthzPort")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym240 := z.EncBinary() - _ = yym240 + yym245 := z.EncBinary() + _ = yym245 if false { } else { r.EncodeInt(int64(x.HealthzPort)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym242 := z.EncBinary() - _ = yym242 + yym247 := z.EncBinary() + _ = yym247 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) @@ -1982,17 +2023,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("healthzBindAddress")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym243 := z.EncBinary() - _ = yym243 + yym248 := z.EncBinary() + _ = yym248 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HealthzBindAddress)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym245 := z.EncBinary() - _ = yym245 + yym250 := z.EncBinary() + _ = yym250 if false { } else { r.EncodeInt(int64(x.OOMScoreAdj)) @@ -2001,17 +2042,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("oomScoreAdj")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym246 := z.EncBinary() - _ = yym246 + yym251 := z.EncBinary() + _ = yym251 if false { } else { r.EncodeInt(int64(x.OOMScoreAdj)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym248 := z.EncBinary() - _ = yym248 + yym253 := z.EncBinary() + _ = yym253 if false { } else { r.EncodeBool(bool(x.RegisterNode)) @@ -2020,17 +2061,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerNode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym249 := z.EncBinary() - _ = yym249 + yym254 := z.EncBinary() + _ = yym254 if false { } else { r.EncodeBool(bool(x.RegisterNode)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym251 := z.EncBinary() - _ = yym251 + yym256 := z.EncBinary() + _ = yym256 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) @@ -2039,17 +2080,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterDomain")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym252 := z.EncBinary() - _ = yym252 + yym257 := z.EncBinary() + _ = yym257 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDomain)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym254 := z.EncBinary() - _ = yym254 + yym259 := z.EncBinary() + _ = yym259 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) @@ -2058,17 +2099,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("masterServiceNamespace")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym255 := z.EncBinary() - _ = yym255 + yym260 := z.EncBinary() + _ = yym260 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.MasterServiceNamespace)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym257 := z.EncBinary() - _ = yym257 + yym262 := z.EncBinary() + _ = yym262 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) @@ -2077,43 +2118,16 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterDNS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym258 := z.EncBinary() - _ = yym258 + yym263 := z.EncBinary() + _ = yym263 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterDNS)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy260 := &x.StreamingConnectionIdleTimeout - yym261 := z.EncBinary() - _ = yym261 - if false { - } else if z.HasExtensions() && z.EncExt(yy260) { - } else if !yym261 && z.IsJSONHandle() { - z.EncJSONMarshal(yy260) - } else { - z.EncFallback(yy260) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("streamingConnectionIdleTimeout")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy262 := &x.StreamingConnectionIdleTimeout - yym263 := z.EncBinary() - _ = yym263 - if false { - } else if z.HasExtensions() && z.EncExt(yy262) { - } else if !yym263 && z.IsJSONHandle() { - z.EncJSONMarshal(yy262) - } else { - z.EncFallback(yy262) - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy265 := &x.NodeStatusUpdateFrequency + yy265 := &x.StreamingConnectionIdleTimeout yym266 := z.EncBinary() _ = yym266 if false { @@ -2125,9 +2139,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeStatusUpdateFrequency")) + r.EncodeString(codecSelferC_UTF81234, string("streamingConnectionIdleTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy267 := &x.NodeStatusUpdateFrequency + yy267 := &x.StreamingConnectionIdleTimeout yym268 := z.EncBinary() _ = yym268 if false { @@ -2138,9 +2152,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy267) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy270 := &x.ImageMinimumGCAge + yy270 := &x.NodeStatusUpdateFrequency yym271 := z.EncBinary() _ = yym271 if false { @@ -2152,9 +2166,9 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("imageMinimumGCAge")) + r.EncodeString(codecSelferC_UTF81234, string("nodeStatusUpdateFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy272 := &x.ImageMinimumGCAge + yy272 := &x.NodeStatusUpdateFrequency yym273 := z.EncBinary() _ = yym273 if false { @@ -2165,10 +2179,37 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy272) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym275 := z.EncBinary() - _ = yym275 + yy275 := &x.ImageMinimumGCAge + yym276 := z.EncBinary() + _ = yym276 + if false { + } else if z.HasExtensions() && z.EncExt(yy275) { + } else if !yym276 && z.IsJSONHandle() { + z.EncJSONMarshal(yy275) + } else { + z.EncFallback(yy275) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("imageMinimumGCAge")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy277 := &x.ImageMinimumGCAge + yym278 := z.EncBinary() + _ = yym278 + if false { + } else if z.HasExtensions() && z.EncExt(yy277) { + } else if !yym278 && z.IsJSONHandle() { + z.EncJSONMarshal(yy277) + } else { + z.EncFallback(yy277) + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym280 := z.EncBinary() + _ = yym280 if false { } else { r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) @@ -2177,17 +2218,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCHighThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym276 := z.EncBinary() - _ = yym276 + yym281 := z.EncBinary() + _ = yym281 if false { } else { r.EncodeInt(int64(x.ImageGCHighThresholdPercent)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym278 := z.EncBinary() - _ = yym278 + yym283 := z.EncBinary() + _ = yym283 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) @@ -2196,17 +2237,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("imageGCLowThresholdPercent")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym279 := z.EncBinary() - _ = yym279 + yym284 := z.EncBinary() + _ = yym284 if false { } else { r.EncodeInt(int64(x.ImageGCLowThresholdPercent)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym281 := z.EncBinary() - _ = yym281 + yym286 := z.EncBinary() + _ = yym286 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) @@ -2215,44 +2256,44 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lowDiskSpaceThresholdMB")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym282 := z.EncBinary() - _ = yym282 + yym287 := z.EncBinary() + _ = yym287 if false { } else { r.EncodeInt(int64(x.LowDiskSpaceThresholdMB)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy284 := &x.VolumeStatsAggPeriod - yym285 := z.EncBinary() - _ = yym285 + yy289 := &x.VolumeStatsAggPeriod + yym290 := z.EncBinary() + _ = yym290 if false { - } else if z.HasExtensions() && z.EncExt(yy284) { - } else if !yym285 && z.IsJSONHandle() { - z.EncJSONMarshal(yy284) + } else if z.HasExtensions() && z.EncExt(yy289) { + } else if !yym290 && z.IsJSONHandle() { + z.EncJSONMarshal(yy289) } else { - z.EncFallback(yy284) + z.EncFallback(yy289) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeStatsAggPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy286 := &x.VolumeStatsAggPeriod - yym287 := z.EncBinary() - _ = yym287 + yy291 := &x.VolumeStatsAggPeriod + yym292 := z.EncBinary() + _ = yym292 if false { - } else if z.HasExtensions() && z.EncExt(yy286) { - } else if !yym287 && z.IsJSONHandle() { - z.EncJSONMarshal(yy286) + } else if z.HasExtensions() && z.EncExt(yy291) { + } else if !yym292 && z.IsJSONHandle() { + z.EncJSONMarshal(yy291) } else { - z.EncFallback(yy286) + z.EncFallback(yy291) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym289 := z.EncBinary() - _ = yym289 + yym294 := z.EncBinary() + _ = yym294 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) @@ -2261,17 +2302,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym290 := z.EncBinary() - _ = yym290 + yym295 := z.EncBinary() + _ = yym295 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginName)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym292 := z.EncBinary() - _ = yym292 + yym297 := z.EncBinary() + _ = yym297 if false { } else { r.EncodeInt(int64(x.NetworkPluginMTU)) @@ -2280,17 +2321,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginMTU")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym293 := z.EncBinary() - _ = yym293 + yym298 := z.EncBinary() + _ = yym298 if false { } else { r.EncodeInt(int64(x.NetworkPluginMTU)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym295 := z.EncBinary() - _ = yym295 + yym300 := z.EncBinary() + _ = yym300 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) @@ -2299,17 +2340,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("networkPluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym296 := z.EncBinary() - _ = yym296 + yym301 := z.EncBinary() + _ = yym301 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NetworkPluginDir)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym298 := z.EncBinary() - _ = yym298 + yym303 := z.EncBinary() + _ = yym303 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CNIConfDir)) @@ -2318,17 +2359,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cniConfDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym299 := z.EncBinary() - _ = yym299 + yym304 := z.EncBinary() + _ = yym304 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CNIConfDir)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym301 := z.EncBinary() - _ = yym301 + yym306 := z.EncBinary() + _ = yym306 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CNIBinDir)) @@ -2337,17 +2378,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cniBinDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym302 := z.EncBinary() - _ = yym302 + yym307 := z.EncBinary() + _ = yym307 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CNIBinDir)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym304 := z.EncBinary() - _ = yym304 + yym309 := z.EncBinary() + _ = yym309 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) @@ -2356,18 +2397,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym305 := z.EncBinary() - _ = yym305 + yym310 := z.EncBinary() + _ = yym310 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.VolumePluginDir)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[53] { - yym307 := z.EncBinary() - _ = yym307 + if yyq135[53] { + yym312 := z.EncBinary() + _ = yym312 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -2376,49 +2417,49 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[53] { + if yyq135[53] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym308 := z.EncBinary() - _ = yym308 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[54] { - yym310 := z.EncBinary() - _ = yym310 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq130[54] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym311 := z.EncBinary() - _ = yym311 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[55] { yym313 := z.EncBinary() _ = yym313 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[54] { + yym315 := z.EncBinary() + _ = yym315 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq135[54] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym316 := z.EncBinary() + _ = yym316 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[55] { + yym318 := z.EncBinary() + _ = yym318 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) } @@ -2426,23 +2467,23 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[55] { + if yyq135[55] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeletCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym314 := z.EncBinary() - _ = yym314 + yym319 := z.EncBinary() + _ = yym319 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.KubeletCgroups)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[56] { - yym316 := z.EncBinary() - _ = yym316 + if yyq135[56] { + yym321 := z.EncBinary() + _ = yym321 if false { } else { r.EncodeBool(bool(x.CgroupsPerQOS)) @@ -2451,23 +2492,23 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq130[56] { + if yyq135[56] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("CgroupsPerQOS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym317 := z.EncBinary() - _ = yym317 + yym322 := z.EncBinary() + _ = yym322 if false { } else { r.EncodeBool(bool(x.CgroupsPerQOS)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[57] { - yym319 := z.EncBinary() - _ = yym319 + if yyq135[57] { + yym324 := z.EncBinary() + _ = yym324 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) @@ -2476,49 +2517,49 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[57] { + if yyq135[57] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runtimeCgroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym320 := z.EncBinary() - _ = yym320 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[58] { - yym322 := z.EncBinary() - _ = yym322 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq130[58] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("systemCgroups")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym323 := z.EncBinary() - _ = yym323 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[59] { yym325 := z.EncBinary() _ = yym325 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RuntimeCgroups)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[58] { + yym327 := z.EncBinary() + _ = yym327 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq135[58] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("systemCgroups")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym328 := z.EncBinary() + _ = yym328 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.SystemCgroups)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[59] { + yym330 := z.EncBinary() + _ = yym330 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) } @@ -2526,22 +2567,22 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[59] { + if yyq135[59] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cgroupRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym326 := z.EncBinary() - _ = yym326 + yym331 := z.EncBinary() + _ = yym331 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CgroupRoot)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym328 := z.EncBinary() - _ = yym328 + yym333 := z.EncBinary() + _ = yym333 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) @@ -2550,17 +2591,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerRuntime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym329 := z.EncBinary() - _ = yym329 + yym334 := z.EncBinary() + _ = yym334 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContainerRuntime)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym331 := z.EncBinary() - _ = yym331 + yym336 := z.EncBinary() + _ = yym336 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RemoteRuntimeEndpoint)) @@ -2569,17 +2610,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("remoteRuntimeEndpoint")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym332 := z.EncBinary() - _ = yym332 + yym337 := z.EncBinary() + _ = yym337 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RemoteRuntimeEndpoint)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym334 := z.EncBinary() - _ = yym334 + yym339 := z.EncBinary() + _ = yym339 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RemoteImageEndpoint)) @@ -2588,102 +2629,102 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("remoteImageEndpoint")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym335 := z.EncBinary() - _ = yym335 + yym340 := z.EncBinary() + _ = yym340 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RemoteImageEndpoint)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[63] { - yy337 := &x.RuntimeRequestTimeout - yym338 := z.EncBinary() - _ = yym338 + if yyq135[63] { + yy342 := &x.RuntimeRequestTimeout + yym343 := z.EncBinary() + _ = yym343 if false { - } else if z.HasExtensions() && z.EncExt(yy337) { - } else if !yym338 && z.IsJSONHandle() { - z.EncJSONMarshal(yy337) + } else if z.HasExtensions() && z.EncExt(yy342) { + } else if !yym343 && z.IsJSONHandle() { + z.EncJSONMarshal(yy342) } else { - z.EncFallback(yy337) + z.EncFallback(yy342) } } else { r.EncodeNil() } } else { - if yyq130[63] { + if yyq135[63] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runtimeRequestTimeout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy339 := &x.RuntimeRequestTimeout - yym340 := z.EncBinary() - _ = yym340 - if false { - } else if z.HasExtensions() && z.EncExt(yy339) { - } else if !yym340 && z.IsJSONHandle() { - z.EncJSONMarshal(yy339) - } else { - z.EncFallback(yy339) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[64] { - yym342 := z.EncBinary() - _ = yym342 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq130[64] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("rktPath")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym343 := z.EncBinary() - _ = yym343 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[65] { + yy344 := &x.RuntimeRequestTimeout yym345 := z.EncBinary() _ = yym345 if false { + } else if z.HasExtensions() && z.EncExt(yy344) { + } else if !yym345 && z.IsJSONHandle() { + z.EncJSONMarshal(yy344) } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) + z.EncFallback(yy344) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[64] { + yym347 := z.EncBinary() + _ = yym347 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[65] { + if yyq135[64] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("rktAPIEndpoint")) + r.EncodeString(codecSelferC_UTF81234, string("rktPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym346 := z.EncBinary() - _ = yym346 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[66] { yym348 := z.EncBinary() _ = yym348 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktPath)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[65] { + yym350 := z.EncBinary() + _ = yym350 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq135[65] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("rktAPIEndpoint")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym351 := z.EncBinary() + _ = yym351 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.RktAPIEndpoint)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[66] { + yym353 := z.EncBinary() + _ = yym353 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) } @@ -2691,22 +2732,22 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[66] { + if yyq135[66] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rktStage1Image")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym349 := z.EncBinary() - _ = yym349 + yym354 := z.EncBinary() + _ = yym354 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RktStage1Image)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym351 := z.EncBinary() - _ = yym351 + yym356 := z.EncBinary() + _ = yym356 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) @@ -2715,17 +2756,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lockFilePath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym352 := z.EncBinary() - _ = yym352 + yym357 := z.EncBinary() + _ = yym357 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LockFilePath)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym354 := z.EncBinary() - _ = yym354 + yym359 := z.EncBinary() + _ = yym359 if false { } else { r.EncodeBool(bool(x.ExitOnLockContention)) @@ -2734,17 +2775,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("exitOnLockContention")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym355 := z.EncBinary() - _ = yym355 + yym360 := z.EncBinary() + _ = yym360 if false { } else { r.EncodeBool(bool(x.ExitOnLockContention)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym357 := z.EncBinary() - _ = yym357 + yym362 := z.EncBinary() + _ = yym362 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) @@ -2753,17 +2794,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCbr0")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym358 := z.EncBinary() - _ = yym358 + yym363 := z.EncBinary() + _ = yym363 if false { } else { r.EncodeBool(bool(x.ConfigureCBR0)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym360 := z.EncBinary() - _ = yym360 + yym365 := z.EncBinary() + _ = yym365 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) @@ -2772,17 +2813,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hairpinMode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym361 := z.EncBinary() - _ = yym361 + yym366 := z.EncBinary() + _ = yym366 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.HairpinMode)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym363 := z.EncBinary() - _ = yym363 + yym368 := z.EncBinary() + _ = yym368 if false { } else { r.EncodeBool(bool(x.BabysitDaemons)) @@ -2791,17 +2832,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("babysitDaemons")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym364 := z.EncBinary() - _ = yym364 + yym369 := z.EncBinary() + _ = yym369 if false { } else { r.EncodeBool(bool(x.BabysitDaemons)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym366 := z.EncBinary() - _ = yym366 + yym371 := z.EncBinary() + _ = yym371 if false { } else { r.EncodeInt(int64(x.MaxPods)) @@ -2810,17 +2851,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxPods")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym367 := z.EncBinary() - _ = yym367 + yym372 := z.EncBinary() + _ = yym372 if false { } else { r.EncodeInt(int64(x.MaxPods)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym369 := z.EncBinary() - _ = yym369 + yym374 := z.EncBinary() + _ = yym374 if false { } else { r.EncodeInt(int64(x.NvidiaGPUs)) @@ -2829,17 +2870,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nvidiaGPUs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym370 := z.EncBinary() - _ = yym370 + yym375 := z.EncBinary() + _ = yym375 if false { } else { r.EncodeInt(int64(x.NvidiaGPUs)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym372 := z.EncBinary() - _ = yym372 + yym377 := z.EncBinary() + _ = yym377 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) @@ -2848,17 +2889,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("dockerExecHandlerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym373 := z.EncBinary() - _ = yym373 + yym378 := z.EncBinary() + _ = yym378 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.DockerExecHandlerName)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym375 := z.EncBinary() - _ = yym375 + yym380 := z.EncBinary() + _ = yym380 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) @@ -2867,17 +2908,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym376 := z.EncBinary() - _ = yym376 + yym381 := z.EncBinary() + _ = yym381 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodCIDR)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym378 := z.EncBinary() - _ = yym378 + yym383 := z.EncBinary() + _ = yym383 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) @@ -2886,17 +2927,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resolvConf")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym379 := z.EncBinary() - _ = yym379 + yym384 := z.EncBinary() + _ = yym384 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResolverConfig)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym381 := z.EncBinary() - _ = yym381 + yym386 := z.EncBinary() + _ = yym386 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) @@ -2905,17 +2946,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cpuCFSQuota")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym382 := z.EncBinary() - _ = yym382 + yym387 := z.EncBinary() + _ = yym387 if false { } else { r.EncodeBool(bool(x.CPUCFSQuota)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym384 := z.EncBinary() - _ = yym384 + yym389 := z.EncBinary() + _ = yym389 if false { } else { r.EncodeBool(bool(x.Containerized)) @@ -2924,17 +2965,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("containerized")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym385 := z.EncBinary() - _ = yym385 + yym390 := z.EncBinary() + _ = yym390 if false { } else { r.EncodeBool(bool(x.Containerized)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym387 := z.EncBinary() - _ = yym387 + yym392 := z.EncBinary() + _ = yym392 if false { } else { r.EncodeInt(int64(x.MaxOpenFiles)) @@ -2943,17 +2984,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maxOpenFiles")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym388 := z.EncBinary() - _ = yym388 + yym393 := z.EncBinary() + _ = yym393 if false { } else { r.EncodeInt(int64(x.MaxOpenFiles)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym390 := z.EncBinary() - _ = yym390 + yym395 := z.EncBinary() + _ = yym395 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) @@ -2962,17 +3003,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reconcileCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym391 := z.EncBinary() - _ = yym391 + yym396 := z.EncBinary() + _ = yym396 if false { } else { r.EncodeBool(bool(x.ReconcileCIDR)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym393 := z.EncBinary() - _ = yym393 + yym398 := z.EncBinary() + _ = yym398 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) @@ -2981,17 +3022,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerSchedulable")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym394 := z.EncBinary() - _ = yym394 + yym399 := z.EncBinary() + _ = yym399 if false { } else { r.EncodeBool(bool(x.RegisterSchedulable)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym396 := z.EncBinary() - _ = yym396 + yym401 := z.EncBinary() + _ = yym401 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -3000,17 +3041,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym397 := z.EncBinary() - _ = yym397 + yym402 := z.EncBinary() + _ = yym402 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym399 := z.EncBinary() - _ = yym399 + yym404 := z.EncBinary() + _ = yym404 if false { } else { r.EncodeInt(int64(x.KubeAPIQPS)) @@ -3019,17 +3060,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym400 := z.EncBinary() - _ = yym400 + yym405 := z.EncBinary() + _ = yym405 if false { } else { r.EncodeInt(int64(x.KubeAPIQPS)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym402 := z.EncBinary() - _ = yym402 + yym407 := z.EncBinary() + _ = yym407 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -3038,17 +3079,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym403 := z.EncBinary() - _ = yym403 + yym408 := z.EncBinary() + _ = yym408 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym405 := z.EncBinary() - _ = yym405 + yym410 := z.EncBinary() + _ = yym410 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) @@ -3057,17 +3098,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serializeImagePulls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym406 := z.EncBinary() - _ = yym406 + yym411 := z.EncBinary() + _ = yym411 if false { } else { r.EncodeBool(bool(x.SerializeImagePulls)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym408 := z.EncBinary() - _ = yym408 + yym413 := z.EncBinary() + _ = yym413 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) @@ -3076,51 +3117,51 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalFlannelOverlay")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym409 := z.EncBinary() - _ = yym409 + yym414 := z.EncBinary() + _ = yym414 if false { } else { r.EncodeBool(bool(x.ExperimentalFlannelOverlay)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[87] { - yy411 := &x.OutOfDiskTransitionFrequency - yym412 := z.EncBinary() - _ = yym412 + if yyq135[87] { + yy416 := &x.OutOfDiskTransitionFrequency + yym417 := z.EncBinary() + _ = yym417 if false { - } else if z.HasExtensions() && z.EncExt(yy411) { - } else if !yym412 && z.IsJSONHandle() { - z.EncJSONMarshal(yy411) + } else if z.HasExtensions() && z.EncExt(yy416) { + } else if !yym417 && z.IsJSONHandle() { + z.EncJSONMarshal(yy416) } else { - z.EncFallback(yy411) + z.EncFallback(yy416) } } else { r.EncodeNil() } } else { - if yyq130[87] { + if yyq135[87] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("outOfDiskTransitionFrequency")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy413 := &x.OutOfDiskTransitionFrequency - yym414 := z.EncBinary() - _ = yym414 + yy418 := &x.OutOfDiskTransitionFrequency + yym419 := z.EncBinary() + _ = yym419 if false { - } else if z.HasExtensions() && z.EncExt(yy413) { - } else if !yym414 && z.IsJSONHandle() { - z.EncJSONMarshal(yy413) + } else if z.HasExtensions() && z.EncExt(yy418) { + } else if !yym419 && z.IsJSONHandle() { + z.EncJSONMarshal(yy418) } else { - z.EncFallback(yy413) + z.EncFallback(yy418) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[88] { - yym416 := z.EncBinary() - _ = yym416 + if yyq135[88] { + yym421 := z.EncBinary() + _ = yym421 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) @@ -3129,25 +3170,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[88] { + if yyq135[88] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeIP")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym417 := z.EncBinary() - _ = yym417 + yym422 := z.EncBinary() + _ = yym422 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NodeIP)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.NodeLabels == nil { r.EncodeNil() } else { - yym419 := z.EncBinary() - _ = yym419 + yym424 := z.EncBinary() + _ = yym424 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) @@ -3160,18 +3201,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.NodeLabels == nil { r.EncodeNil() } else { - yym420 := z.EncBinary() - _ = yym420 + yym425 := z.EncBinary() + _ = yym425 if false { } else { z.F.EncMapStringStringV(x.NodeLabels, false, e) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym422 := z.EncBinary() - _ = yym422 + yym427 := z.EncBinary() + _ = yym427 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) @@ -3180,17 +3221,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nonMasqueradeCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym423 := z.EncBinary() - _ = yym423 + yym428 := z.EncBinary() + _ = yym428 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.NonMasqueradeCIDR)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym425 := z.EncBinary() - _ = yym425 + yym430 := z.EncBinary() + _ = yym430 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) @@ -3199,18 +3240,18 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableCustomMetrics")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym426 := z.EncBinary() - _ = yym426 + yym431 := z.EncBinary() + _ = yym431 if false { } else { r.EncodeBool(bool(x.EnableCustomMetrics)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[92] { - yym428 := z.EncBinary() - _ = yym428 + if yyq135[92] { + yym433 := z.EncBinary() + _ = yym433 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) @@ -3219,49 +3260,49 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[92] { + if yyq135[92] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionHard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym429 := z.EncBinary() - _ = yym429 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[93] { - yym431 := z.EncBinary() - _ = yym431 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq130[93] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym432 := z.EncBinary() - _ = yym432 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) - } - } - } - if yyr130 || yy2arr130 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[94] { yym434 := z.EncBinary() _ = yym434 if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionHard)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[93] { + yym436 := z.EncBinary() + _ = yym436 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq135[93] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("evictionSoft")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym437 := z.EncBinary() + _ = yym437 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoft)) + } + } + } + if yyr135 || yy2arr135 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq135[94] { + yym439 := z.EncBinary() + _ = yym439 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) } @@ -3269,56 +3310,56 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[94] { + if yyq135[94] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionSoftGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym435 := z.EncBinary() - _ = yym435 + yym440 := z.EncBinary() + _ = yym440 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionSoftGracePeriod)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[95] { - yy437 := &x.EvictionPressureTransitionPeriod - yym438 := z.EncBinary() - _ = yym438 + if yyq135[95] { + yy442 := &x.EvictionPressureTransitionPeriod + yym443 := z.EncBinary() + _ = yym443 if false { - } else if z.HasExtensions() && z.EncExt(yy437) { - } else if !yym438 && z.IsJSONHandle() { - z.EncJSONMarshal(yy437) + } else if z.HasExtensions() && z.EncExt(yy442) { + } else if !yym443 && z.IsJSONHandle() { + z.EncJSONMarshal(yy442) } else { - z.EncFallback(yy437) + z.EncFallback(yy442) } } else { r.EncodeNil() } } else { - if yyq130[95] { + if yyq135[95] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionPressureTransitionPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy439 := &x.EvictionPressureTransitionPeriod - yym440 := z.EncBinary() - _ = yym440 + yy444 := &x.EvictionPressureTransitionPeriod + yym445 := z.EncBinary() + _ = yym445 if false { - } else if z.HasExtensions() && z.EncExt(yy439) { - } else if !yym440 && z.IsJSONHandle() { - z.EncJSONMarshal(yy439) + } else if z.HasExtensions() && z.EncExt(yy444) { + } else if !yym445 && z.IsJSONHandle() { + z.EncJSONMarshal(yy444) } else { - z.EncFallback(yy439) + z.EncFallback(yy444) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[96] { - yym442 := z.EncBinary() - _ = yym442 + if yyq135[96] { + yym447 := z.EncBinary() + _ = yym447 if false { } else { r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) @@ -3327,23 +3368,23 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq130[96] { + if yyq135[96] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionMaxPodGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym443 := z.EncBinary() - _ = yym443 + yym448 := z.EncBinary() + _ = yym448 if false { } else { r.EncodeInt(int64(x.EvictionMaxPodGracePeriod)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[97] { - yym445 := z.EncBinary() - _ = yym445 + if yyq135[97] { + yym450 := z.EncBinary() + _ = yym450 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionMinimumReclaim)) @@ -3352,22 +3393,22 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq130[97] { + if yyq135[97] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("evictionMinimumReclaim")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym446 := z.EncBinary() - _ = yym446 + yym451 := z.EncBinary() + _ = yym451 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.EvictionMinimumReclaim)) } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym448 := z.EncBinary() - _ = yym448 + yym453 := z.EncBinary() + _ = yym453 if false { } else { r.EncodeInt(int64(x.PodsPerCore)) @@ -3376,17 +3417,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podsPerCore")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym449 := z.EncBinary() - _ = yym449 + yym454 := z.EncBinary() + _ = yym454 if false { } else { r.EncodeInt(int64(x.PodsPerCore)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym451 := z.EncBinary() - _ = yym451 + yym456 := z.EncBinary() + _ = yym456 if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) @@ -3395,20 +3436,20 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableControllerAttachDetach")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym452 := z.EncBinary() - _ = yym452 + yym457 := z.EncBinary() + _ = yym457 if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.SystemReserved == nil { r.EncodeNil() } else { - yym454 := z.EncBinary() - _ = yym454 + yym459 := z.EncBinary() + _ = yym459 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3422,8 +3463,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.SystemReserved == nil { r.EncodeNil() } else { - yym455 := z.EncBinary() - _ = yym455 + yym460 := z.EncBinary() + _ = yym460 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3431,13 +3472,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.KubeReserved == nil { r.EncodeNil() } else { - yym457 := z.EncBinary() - _ = yym457 + yym462 := z.EncBinary() + _ = yym462 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3451,8 +3492,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.KubeReserved == nil { r.EncodeNil() } else { - yym458 := z.EncBinary() - _ = yym458 + yym463 := z.EncBinary() + _ = yym463 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3460,10 +3501,10 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym460 := z.EncBinary() - _ = yym460 + yym465 := z.EncBinary() + _ = yym465 if false { } else { r.EncodeBool(bool(x.ProtectKernelDefaults)) @@ -3472,17 +3513,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("protectKernelDefaults")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym461 := z.EncBinary() - _ = yym461 + yym466 := z.EncBinary() + _ = yym466 if false { } else { r.EncodeBool(bool(x.ProtectKernelDefaults)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym463 := z.EncBinary() - _ = yym463 + yym468 := z.EncBinary() + _ = yym468 if false { } else { r.EncodeBool(bool(x.MakeIPTablesUtilChains)) @@ -3491,17 +3532,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("makeIPTablesUtilChains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym464 := z.EncBinary() - _ = yym464 + yym469 := z.EncBinary() + _ = yym469 if false { } else { r.EncodeBool(bool(x.MakeIPTablesUtilChains)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym466 := z.EncBinary() - _ = yym466 + yym471 := z.EncBinary() + _ = yym471 if false { } else { r.EncodeInt(int64(x.IPTablesMasqueradeBit)) @@ -3510,17 +3551,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym467 := z.EncBinary() - _ = yym467 + yym472 := z.EncBinary() + _ = yym472 if false { } else { r.EncodeInt(int64(x.IPTablesMasqueradeBit)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym469 := z.EncBinary() - _ = yym469 + yym474 := z.EncBinary() + _ = yym474 if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) @@ -3529,21 +3570,21 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesDropBit")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym470 := z.EncBinary() - _ = yym470 + yym475 := z.EncBinary() + _ = yym475 if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq130[106] { + if yyq135[106] { if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym472 := z.EncBinary() - _ = yym472 + yym477 := z.EncBinary() + _ = yym477 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3553,15 +3594,15 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq130[106] { + if yyq135[106] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalAllowedUnsafeSysctls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym473 := z.EncBinary() - _ = yym473 + yym478 := z.EncBinary() + _ = yym478 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3569,7 +3610,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr130 || yy2arr130 { + if yyr135 || yy2arr135 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -3582,25 +3623,25 @@ func (x *KubeletConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym474 := z.DecBinary() - _ = yym474 + yym479 := z.DecBinary() + _ = yym479 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct475 := r.ContainerType() - if yyct475 == codecSelferValueTypeMap1234 { - yyl475 := r.ReadMapStart() - if yyl475 == 0 { + yyct480 := r.ContainerType() + if yyct480 == codecSelferValueTypeMap1234 { + yyl480 := r.ReadMapStart() + if yyl480 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl475, d) + x.codecDecodeSelfFromMap(yyl480, d) } - } else if yyct475 == codecSelferValueTypeArray1234 { - yyl475 := r.ReadArrayStart() - if yyl475 == 0 { + } else if yyct480 == codecSelferValueTypeArray1234 { + yyl480 := r.ReadArrayStart() + if yyl480 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl475, d) + x.codecDecodeSelfFromArray(yyl480, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -3612,12 +3653,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys476Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys476Slc - var yyhl476 bool = l >= 0 - for yyj476 := 0; ; yyj476++ { - if yyhl476 { - if yyj476 >= l { + var yys481Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys481Slc + var yyhl481 bool = l >= 0 + for yyj481 := 0; ; yyj481++ { + if yyhl481 { + if yyj481 >= l { break } } else { @@ -3626,10 +3667,10 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys476Slc = r.DecodeBytes(yys476Slc, true, true) - yys476 := string(yys476Slc) + yys481Slc = r.DecodeBytes(yys481Slc, true, true) + yys481 := string(yys481Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys476 { + switch yys481 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -3652,45 +3693,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv480 := &x.SyncFrequency - yym481 := z.DecBinary() - _ = yym481 + yyv485 := &x.SyncFrequency + yym486 := z.DecBinary() + _ = yym486 if false { - } else if z.HasExtensions() && z.DecExt(yyv480) { - } else if !yym481 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv480) + } else if z.HasExtensions() && z.DecExt(yyv485) { + } else if !yym486 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv485) } else { - z.DecFallback(yyv480, false) + z.DecFallback(yyv485, false) } } case "fileCheckFrequency": if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv482 := &x.FileCheckFrequency - yym483 := z.DecBinary() - _ = yym483 + yyv487 := &x.FileCheckFrequency + yym488 := z.DecBinary() + _ = yym488 if false { - } else if z.HasExtensions() && z.DecExt(yyv482) { - } else if !yym483 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv482) + } else if z.HasExtensions() && z.DecExt(yyv487) { + } else if !yym488 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv487) } else { - z.DecFallback(yyv482, false) + z.DecFallback(yyv487, false) } } case "httpCheckFrequency": if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv484 := &x.HTTPCheckFrequency - yym485 := z.DecBinary() - _ = yym485 + yyv489 := &x.HTTPCheckFrequency + yym490 := z.DecBinary() + _ = yym490 if false { - } else if z.HasExtensions() && z.DecExt(yyv484) { - } else if !yym485 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv484) + } else if z.HasExtensions() && z.DecExt(yyv489) { + } else if !yym490 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv489) } else { - z.DecFallback(yyv484, false) + z.DecFallback(yyv489, false) } } case "manifestURL": @@ -3787,36 +3828,36 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv501 := &x.HostNetworkSources - yym502 := z.DecBinary() - _ = yym502 + yyv506 := &x.HostNetworkSources + yym507 := z.DecBinary() + _ = yym507 if false { } else { - z.F.DecSliceStringX(yyv501, false, d) + z.F.DecSliceStringX(yyv506, false, d) } } case "hostPIDSources": if r.TryDecodeAsNil() { x.HostPIDSources = nil } else { - yyv503 := &x.HostPIDSources - yym504 := z.DecBinary() - _ = yym504 + yyv508 := &x.HostPIDSources + yym509 := z.DecBinary() + _ = yym509 if false { } else { - z.F.DecSliceStringX(yyv503, false, d) + z.F.DecSliceStringX(yyv508, false, d) } } case "hostIPCSources": if r.TryDecodeAsNil() { x.HostIPCSources = nil } else { - yyv505 := &x.HostIPCSources - yym506 := z.DecBinary() - _ = yym506 + yyv510 := &x.HostIPCSources + yym511 := z.DecBinary() + _ = yym511 if false { } else { - z.F.DecSliceStringX(yyv505, false, d) + z.F.DecSliceStringX(yyv510, false, d) } } case "registryPullQPS": @@ -3853,15 +3894,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv512 := &x.MinimumGCAge - yym513 := z.DecBinary() - _ = yym513 + yyv517 := &x.MinimumGCAge + yym518 := z.DecBinary() + _ = yym518 if false { - } else if z.HasExtensions() && z.DecExt(yyv512) { - } else if !yym513 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv512) + } else if z.HasExtensions() && z.DecExt(yyv517) { + } else if !yym518 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv517) } else { - z.DecFallback(yyv512, false) + z.DecFallback(yyv517, false) } } case "maxPerPodContainerCount": @@ -3928,45 +3969,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv524 := &x.StreamingConnectionIdleTimeout - yym525 := z.DecBinary() - _ = yym525 + yyv529 := &x.StreamingConnectionIdleTimeout + yym530 := z.DecBinary() + _ = yym530 if false { - } else if z.HasExtensions() && z.DecExt(yyv524) { - } else if !yym525 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv524) + } else if z.HasExtensions() && z.DecExt(yyv529) { + } else if !yym530 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv529) } else { - z.DecFallback(yyv524, false) + z.DecFallback(yyv529, false) } } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv526 := &x.NodeStatusUpdateFrequency - yym527 := z.DecBinary() - _ = yym527 + yyv531 := &x.NodeStatusUpdateFrequency + yym532 := z.DecBinary() + _ = yym532 if false { - } else if z.HasExtensions() && z.DecExt(yyv526) { - } else if !yym527 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv526) + } else if z.HasExtensions() && z.DecExt(yyv531) { + } else if !yym532 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv531) } else { - z.DecFallback(yyv526, false) + z.DecFallback(yyv531, false) } } case "imageMinimumGCAge": if r.TryDecodeAsNil() { x.ImageMinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv528 := &x.ImageMinimumGCAge - yym529 := z.DecBinary() - _ = yym529 + yyv533 := &x.ImageMinimumGCAge + yym534 := z.DecBinary() + _ = yym534 if false { - } else if z.HasExtensions() && z.DecExt(yyv528) { - } else if !yym529 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv528) + } else if z.HasExtensions() && z.DecExt(yyv533) { + } else if !yym534 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv533) } else { - z.DecFallback(yyv528, false) + z.DecFallback(yyv533, false) } } case "imageGCHighThresholdPercent": @@ -3991,15 +4032,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv533 := &x.VolumeStatsAggPeriod - yym534 := z.DecBinary() - _ = yym534 + yyv538 := &x.VolumeStatsAggPeriod + yym539 := z.DecBinary() + _ = yym539 if false { - } else if z.HasExtensions() && z.DecExt(yyv533) { - } else if !yym534 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv533) + } else if z.HasExtensions() && z.DecExt(yyv538) { + } else if !yym539 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv538) } else { - z.DecFallback(yyv533, false) + z.DecFallback(yyv538, false) } } case "networkPluginName": @@ -4102,15 +4143,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv551 := &x.RuntimeRequestTimeout - yym552 := z.DecBinary() - _ = yym552 + yyv556 := &x.RuntimeRequestTimeout + yym557 := z.DecBinary() + _ = yym557 if false { - } else if z.HasExtensions() && z.DecExt(yyv551) { - } else if !yym552 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv551) + } else if z.HasExtensions() && z.DecExt(yyv556) { + } else if !yym557 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv556) } else { - z.DecFallback(yyv551, false) + z.DecFallback(yyv556, false) } } case "rktPath": @@ -4255,15 +4296,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv576 := &x.OutOfDiskTransitionFrequency - yym577 := z.DecBinary() - _ = yym577 + yyv581 := &x.OutOfDiskTransitionFrequency + yym582 := z.DecBinary() + _ = yym582 if false { - } else if z.HasExtensions() && z.DecExt(yyv576) { - } else if !yym577 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv576) + } else if z.HasExtensions() && z.DecExt(yyv581) { + } else if !yym582 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv581) } else { - z.DecFallback(yyv576, false) + z.DecFallback(yyv581, false) } } case "nodeIP": @@ -4276,12 +4317,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv579 := &x.NodeLabels - yym580 := z.DecBinary() - _ = yym580 + yyv584 := &x.NodeLabels + yym585 := z.DecBinary() + _ = yym585 if false { } else { - z.F.DecMapStringStringX(yyv579, false, d) + z.F.DecMapStringStringX(yyv584, false, d) } } case "nonMasqueradeCIDR": @@ -4318,15 +4359,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv586 := &x.EvictionPressureTransitionPeriod - yym587 := z.DecBinary() - _ = yym587 + yyv591 := &x.EvictionPressureTransitionPeriod + yym592 := z.DecBinary() + _ = yym592 if false { - } else if z.HasExtensions() && z.DecExt(yyv586) { - } else if !yym587 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv586) + } else if z.HasExtensions() && z.DecExt(yyv591) { + } else if !yym592 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv591) } else { - z.DecFallback(yyv586, false) + z.DecFallback(yyv591, false) } } case "evictionMaxPodGracePeriod": @@ -4357,26 +4398,26 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv592 := &x.SystemReserved - yym593 := z.DecBinary() - _ = yym593 + yyv597 := &x.SystemReserved + yym598 := z.DecBinary() + _ = yym598 if false { - } else if z.HasExtensions() && z.DecExt(yyv592) { + } else if z.HasExtensions() && z.DecExt(yyv597) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv592), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv597), d) } } case "kubeReserved": if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv594 := &x.KubeReserved - yym595 := z.DecBinary() - _ = yym595 + yyv599 := &x.KubeReserved + yym600 := z.DecBinary() + _ = yym600 if false { - } else if z.HasExtensions() && z.DecExt(yyv594) { + } else if z.HasExtensions() && z.DecExt(yyv599) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv594), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv599), d) } } case "protectKernelDefaults": @@ -4407,18 +4448,18 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv600 := &x.AllowedUnsafeSysctls - yym601 := z.DecBinary() - _ = yym601 + yyv605 := &x.AllowedUnsafeSysctls + yym606 := z.DecBinary() + _ = yym606 if false { } else { - z.F.DecSliceStringX(yyv600, false, d) + z.F.DecSliceStringX(yyv605, false, d) } } default: - z.DecStructFieldNotFound(-1, yys476) - } // end switch yys476 - } // end for yyj476 + z.DecStructFieldNotFound(-1, yys481) + } // end switch yys481 + } // end for yyj481 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -4426,16 +4467,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj602 int - var yyb602 bool - var yyhl602 bool = l >= 0 - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + var yyj607 int + var yyb607 bool + var yyhl607 bool = l >= 0 + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4445,13 +4486,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Kind = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4461,13 +4502,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.APIVersion = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4477,13 +4518,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodManifestPath = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4491,24 +4532,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv606 := &x.SyncFrequency - yym607 := z.DecBinary() - _ = yym607 + yyv611 := &x.SyncFrequency + yym612 := z.DecBinary() + _ = yym612 if false { - } else if z.HasExtensions() && z.DecExt(yyv606) { - } else if !yym607 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv606) + } else if z.HasExtensions() && z.DecExt(yyv611) { + } else if !yym612 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv611) } else { - z.DecFallback(yyv606, false) + z.DecFallback(yyv611, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4516,24 +4557,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv608 := &x.FileCheckFrequency - yym609 := z.DecBinary() - _ = yym609 + yyv613 := &x.FileCheckFrequency + yym614 := z.DecBinary() + _ = yym614 if false { - } else if z.HasExtensions() && z.DecExt(yyv608) { - } else if !yym609 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv608) + } else if z.HasExtensions() && z.DecExt(yyv613) { + } else if !yym614 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv613) } else { - z.DecFallback(yyv608, false) + z.DecFallback(yyv613, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4541,24 +4582,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv610 := &x.HTTPCheckFrequency - yym611 := z.DecBinary() - _ = yym611 + yyv615 := &x.HTTPCheckFrequency + yym616 := z.DecBinary() + _ = yym616 if false { - } else if z.HasExtensions() && z.DecExt(yyv610) { - } else if !yym611 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv610) + } else if z.HasExtensions() && z.DecExt(yyv615) { + } else if !yym616 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv615) } else { - z.DecFallback(yyv610, false) + z.DecFallback(yyv615, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4568,13 +4609,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4584,13 +4625,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4600,13 +4641,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4616,13 +4657,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4632,13 +4673,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4648,13 +4689,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4664,13 +4705,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4680,13 +4721,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4696,13 +4737,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4712,13 +4753,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4728,13 +4769,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4744,13 +4785,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4760,13 +4801,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4776,13 +4817,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SeccompProfileRoot = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4792,13 +4833,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4806,21 +4847,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv627 := &x.HostNetworkSources - yym628 := z.DecBinary() - _ = yym628 + yyv632 := &x.HostNetworkSources + yym633 := z.DecBinary() + _ = yym633 if false { } else { - z.F.DecSliceStringX(yyv627, false, d) + z.F.DecSliceStringX(yyv632, false, d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4828,21 +4869,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostPIDSources = nil } else { - yyv629 := &x.HostPIDSources - yym630 := z.DecBinary() - _ = yym630 + yyv634 := &x.HostPIDSources + yym635 := z.DecBinary() + _ = yym635 if false { } else { - z.F.DecSliceStringX(yyv629, false, d) + z.F.DecSliceStringX(yyv634, false, d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4850,21 +4891,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostIPCSources = nil } else { - yyv631 := &x.HostIPCSources - yym632 := z.DecBinary() - _ = yym632 + yyv636 := &x.HostIPCSources + yym637 := z.DecBinary() + _ = yym637 if false { } else { - z.F.DecSliceStringX(yyv631, false, d) + z.F.DecSliceStringX(yyv636, false, d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4874,13 +4915,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4890,13 +4931,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4906,13 +4947,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4922,13 +4963,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4938,13 +4979,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4952,24 +4993,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv638 := &x.MinimumGCAge - yym639 := z.DecBinary() - _ = yym639 + yyv643 := &x.MinimumGCAge + yym644 := z.DecBinary() + _ = yym644 if false { - } else if z.HasExtensions() && z.DecExt(yyv638) { - } else if !yym639 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv638) + } else if z.HasExtensions() && z.DecExt(yyv643) { + } else if !yym644 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv643) } else { - z.DecFallback(yyv638, false) + z.DecFallback(yyv643, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4979,13 +5020,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4995,13 +5036,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5011,13 +5052,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5027,13 +5068,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5043,13 +5084,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5059,13 +5100,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5075,13 +5116,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5091,13 +5132,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5107,13 +5148,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5123,13 +5164,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5137,24 +5178,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv650 := &x.StreamingConnectionIdleTimeout - yym651 := z.DecBinary() - _ = yym651 + yyv655 := &x.StreamingConnectionIdleTimeout + yym656 := z.DecBinary() + _ = yym656 if false { - } else if z.HasExtensions() && z.DecExt(yyv650) { - } else if !yym651 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv650) + } else if z.HasExtensions() && z.DecExt(yyv655) { + } else if !yym656 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv655) } else { - z.DecFallback(yyv650, false) + z.DecFallback(yyv655, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5162,24 +5203,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv652 := &x.NodeStatusUpdateFrequency - yym653 := z.DecBinary() - _ = yym653 + yyv657 := &x.NodeStatusUpdateFrequency + yym658 := z.DecBinary() + _ = yym658 if false { - } else if z.HasExtensions() && z.DecExt(yyv652) { - } else if !yym653 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv652) + } else if z.HasExtensions() && z.DecExt(yyv657) { + } else if !yym658 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv657) } else { - z.DecFallback(yyv652, false) + z.DecFallback(yyv657, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5187,80 +5228,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.ImageMinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv654 := &x.ImageMinimumGCAge - yym655 := z.DecBinary() - _ = yym655 - if false { - } else if z.HasExtensions() && z.DecExt(yyv654) { - } else if !yym655 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv654) - } else { - z.DecFallback(yyv654, false) - } - } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l - } else { - yyb602 = r.CheckBreak() - } - if yyb602 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ImageGCHighThresholdPercent = 0 - } else { - x.ImageGCHighThresholdPercent = int32(r.DecodeInt(32)) - } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l - } else { - yyb602 = r.CheckBreak() - } - if yyb602 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ImageGCLowThresholdPercent = 0 - } else { - x.ImageGCLowThresholdPercent = int32(r.DecodeInt(32)) - } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l - } else { - yyb602 = r.CheckBreak() - } - if yyb602 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.LowDiskSpaceThresholdMB = 0 - } else { - x.LowDiskSpaceThresholdMB = int32(r.DecodeInt(32)) - } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l - } else { - yyb602 = r.CheckBreak() - } - if yyb602 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} - } else { - yyv659 := &x.VolumeStatsAggPeriod + yyv659 := &x.ImageMinimumGCAge yym660 := z.DecBinary() _ = yym660 if false { @@ -5271,13 +5239,86 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv659, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageGCHighThresholdPercent = 0 + } else { + x.ImageGCHighThresholdPercent = int32(r.DecodeInt(32)) + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageGCLowThresholdPercent = 0 + } else { + x.ImageGCLowThresholdPercent = int32(r.DecodeInt(32)) + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.LowDiskSpaceThresholdMB = 0 + } else { + x.LowDiskSpaceThresholdMB = int32(r.DecodeInt(32)) + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + } else { + yyv664 := &x.VolumeStatsAggPeriod + yym665 := z.DecBinary() + _ = yym665 + if false { + } else if z.HasExtensions() && z.DecExt(yyv664) { + } else if !yym665 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv664) + } else { + z.DecFallback(yyv664, false) + } + } + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l + } else { + yyb607 = r.CheckBreak() + } + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5287,13 +5328,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5303,13 +5344,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginMTU = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5319,13 +5360,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5335,13 +5376,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIConfDir = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5351,13 +5392,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIBinDir = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5367,13 +5408,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5383,13 +5424,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5399,13 +5440,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5415,13 +5456,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeletCgroups = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5431,13 +5472,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupsPerQOS = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5447,13 +5488,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RuntimeCgroups = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5463,13 +5504,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemCgroups = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5479,13 +5520,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5495,13 +5536,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5511,13 +5552,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteRuntimeEndpoint = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5527,13 +5568,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteImageEndpoint = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5541,24 +5582,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv677 := &x.RuntimeRequestTimeout - yym678 := z.DecBinary() - _ = yym678 + yyv682 := &x.RuntimeRequestTimeout + yym683 := z.DecBinary() + _ = yym683 if false { - } else if z.HasExtensions() && z.DecExt(yyv677) { - } else if !yym678 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv677) + } else if z.HasExtensions() && z.DecExt(yyv682) { + } else if !yym683 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv682) } else { - z.DecFallback(yyv677, false) + z.DecFallback(yyv682, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5568,13 +5609,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5584,13 +5625,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktAPIEndpoint = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5600,13 +5641,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5616,13 +5657,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LockFilePath = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5632,13 +5673,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExitOnLockContention = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5648,13 +5689,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ConfigureCBR0 = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5664,13 +5705,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HairpinMode = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5680,13 +5721,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.BabysitDaemons = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5696,13 +5737,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5712,13 +5753,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NvidiaGPUs = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5728,13 +5769,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5744,13 +5785,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5760,13 +5801,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5776,13 +5817,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5792,13 +5833,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5808,13 +5849,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = int64(r.DecodeInt(64)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5824,13 +5865,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5840,13 +5881,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5856,13 +5897,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContentType = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5872,13 +5913,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5888,13 +5929,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5904,13 +5945,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5920,13 +5961,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalFlannelOverlay = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5934,24 +5975,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv702 := &x.OutOfDiskTransitionFrequency - yym703 := z.DecBinary() - _ = yym703 + yyv707 := &x.OutOfDiskTransitionFrequency + yym708 := z.DecBinary() + _ = yym708 if false { - } else if z.HasExtensions() && z.DecExt(yyv702) { - } else if !yym703 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv702) + } else if z.HasExtensions() && z.DecExt(yyv707) { + } else if !yym708 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv707) } else { - z.DecFallback(yyv702, false) + z.DecFallback(yyv707, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5961,13 +6002,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5975,21 +6016,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv705 := &x.NodeLabels - yym706 := z.DecBinary() - _ = yym706 + yyv710 := &x.NodeLabels + yym711 := z.DecBinary() + _ = yym711 if false { } else { - z.F.DecMapStringStringX(yyv705, false, d) + z.F.DecMapStringStringX(yyv710, false, d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5999,13 +6040,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6015,13 +6056,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableCustomMetrics = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6031,13 +6072,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionHard = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6047,13 +6088,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoft = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6063,13 +6104,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoftGracePeriod = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6077,24 +6118,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv712 := &x.EvictionPressureTransitionPeriod - yym713 := z.DecBinary() - _ = yym713 + yyv717 := &x.EvictionPressureTransitionPeriod + yym718 := z.DecBinary() + _ = yym718 if false { - } else if z.HasExtensions() && z.DecExt(yyv712) { - } else if !yym713 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv712) + } else if z.HasExtensions() && z.DecExt(yyv717) { + } else if !yym718 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv717) } else { - z.DecFallback(yyv712, false) + z.DecFallback(yyv717, false) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6104,13 +6145,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMaxPodGracePeriod = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6120,13 +6161,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMinimumReclaim = string(r.DecodeString()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6136,13 +6177,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodsPerCore = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6152,13 +6193,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableControllerAttachDetach = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6166,22 +6207,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv718 := &x.SystemReserved - yym719 := z.DecBinary() - _ = yym719 + yyv723 := &x.SystemReserved + yym724 := z.DecBinary() + _ = yym724 if false { - } else if z.HasExtensions() && z.DecExt(yyv718) { + } else if z.HasExtensions() && z.DecExt(yyv723) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv718), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv723), d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6189,22 +6230,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv720 := &x.KubeReserved - yym721 := z.DecBinary() - _ = yym721 + yyv725 := &x.KubeReserved + yym726 := z.DecBinary() + _ = yym726 if false { - } else if z.HasExtensions() && z.DecExt(yyv720) { + } else if z.HasExtensions() && z.DecExt(yyv725) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv720), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv725), d) } } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6214,13 +6255,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ProtectKernelDefaults = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6230,13 +6271,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MakeIPTablesUtilChains = bool(r.DecodeBool()) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6246,13 +6287,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesMasqueradeBit = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6262,13 +6303,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesDropBit = int32(r.DecodeInt(32)) } - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6276,26 +6317,26 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv726 := &x.AllowedUnsafeSysctls - yym727 := z.DecBinary() - _ = yym727 + yyv731 := &x.AllowedUnsafeSysctls + yym732 := z.DecBinary() + _ = yym732 if false { } else { - z.F.DecSliceStringX(yyv726, false, d) + z.F.DecSliceStringX(yyv731, false, d) } } for { - yyj602++ - if yyhl602 { - yyb602 = yyj602 > l + yyj607++ + if yyhl607 { + yyb607 = yyj607 > l } else { - yyb602 = r.CheckBreak() + yyb607 = r.CheckBreak() } - if yyb602 { + if yyb607 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj602-1, "") + z.DecStructFieldNotFound(yyj607-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -6307,36 +6348,36 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym728 := z.EncBinary() - _ = yym728 + yym733 := z.EncBinary() + _ = yym733 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep729 := !z.EncBinary() - yy2arr729 := z.EncBasicHandle().StructToArray - var yyq729 [14]bool - _, _, _ = yysep729, yyq729, yy2arr729 - const yyr729 bool = false - yyq729[0] = x.Kind != "" - yyq729[1] = x.APIVersion != "" - var yynn729 int - if yyr729 || yy2arr729 { + yysep734 := !z.EncBinary() + yy2arr734 := z.EncBasicHandle().StructToArray + var yyq734 [14]bool + _, _, _ = yysep734, yyq734, yy2arr734 + const yyr734 bool = false + yyq734[0] = x.Kind != "" + yyq734[1] = x.APIVersion != "" + var yynn734 int + if yyr734 || yy2arr734 { r.EncodeArrayStart(14) } else { - yynn729 = 12 - for _, b := range yyq729 { + yynn734 = 12 + for _, b := range yyq734 { if b { - yynn729++ + yynn734++ } } - r.EncodeMapStart(yynn729) - yynn729 = 0 + r.EncodeMapStart(yynn734) + yynn734 = 0 } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq729[0] { - yym731 := z.EncBinary() - _ = yym731 + if yyq734[0] { + yym736 := z.EncBinary() + _ = yym736 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -6345,23 +6386,23 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq729[0] { + if yyq734[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym732 := z.EncBinary() - _ = yym732 + yym737 := z.EncBinary() + _ = yym737 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq729[1] { - yym734 := z.EncBinary() - _ = yym734 + if yyq734[1] { + yym739 := z.EncBinary() + _ = yym739 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -6370,22 +6411,22 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq729[1] { + if yyq734[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym735 := z.EncBinary() - _ = yym735 + yym740 := z.EncBinary() + _ = yym740 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym737 := z.EncBinary() - _ = yym737 + yym742 := z.EncBinary() + _ = yym742 if false { } else { r.EncodeInt(int64(x.Port)) @@ -6394,17 +6435,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym738 := z.EncBinary() - _ = yym738 + yym743 := z.EncBinary() + _ = yym743 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym740 := z.EncBinary() - _ = yym740 + yym745 := z.EncBinary() + _ = yym745 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -6413,17 +6454,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym741 := z.EncBinary() - _ = yym741 + yym746 := z.EncBinary() + _ = yym746 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym743 := z.EncBinary() - _ = yym743 + yym748 := z.EncBinary() + _ = yym748 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) @@ -6432,17 +6473,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("algorithmProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym744 := z.EncBinary() - _ = yym744 + yym749 := z.EncBinary() + _ = yym749 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym746 := z.EncBinary() - _ = yym746 + yym751 := z.EncBinary() + _ = yym751 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) @@ -6451,17 +6492,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("policyConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym747 := z.EncBinary() - _ = yym747 + yym752 := z.EncBinary() + _ = yym752 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym749 := z.EncBinary() - _ = yym749 + yym754 := z.EncBinary() + _ = yym754 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -6470,17 +6511,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym750 := z.EncBinary() - _ = yym750 + yym755 := z.EncBinary() + _ = yym755 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym752 := z.EncBinary() - _ = yym752 + yym757 := z.EncBinary() + _ = yym757 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -6489,17 +6530,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym753 := z.EncBinary() - _ = yym753 + yym758 := z.EncBinary() + _ = yym758 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym755 := z.EncBinary() - _ = yym755 + yym760 := z.EncBinary() + _ = yym760 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -6508,17 +6549,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym756 := z.EncBinary() - _ = yym756 + yym761 := z.EncBinary() + _ = yym761 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym758 := z.EncBinary() - _ = yym758 + yym763 := z.EncBinary() + _ = yym763 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -6527,17 +6568,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym759 := z.EncBinary() - _ = yym759 + yym764 := z.EncBinary() + _ = yym764 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym761 := z.EncBinary() - _ = yym761 + yym766 := z.EncBinary() + _ = yym766 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) @@ -6546,17 +6587,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym762 := z.EncBinary() - _ = yym762 + yym767 := z.EncBinary() + _ = yym767 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym764 := z.EncBinary() - _ = yym764 + yym769 := z.EncBinary() + _ = yym769 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) @@ -6565,17 +6606,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hardPodAffinitySymmetricWeight")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym765 := z.EncBinary() - _ = yym765 + yym770 := z.EncBinary() + _ = yym770 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym767 := z.EncBinary() - _ = yym767 + yym772 := z.EncBinary() + _ = yym772 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) @@ -6584,25 +6625,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("failureDomains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym768 := z.EncBinary() - _ = yym768 + yym773 := z.EncBinary() + _ = yym773 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) } } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy770 := &x.LeaderElection - yy770.CodecEncodeSelf(e) + yy775 := &x.LeaderElection + yy775.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy771 := &x.LeaderElection - yy771.CodecEncodeSelf(e) + yy776 := &x.LeaderElection + yy776.CodecEncodeSelf(e) } - if yyr729 || yy2arr729 { + if yyr734 || yy2arr734 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -6615,25 +6656,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym772 := z.DecBinary() - _ = yym772 + yym777 := z.DecBinary() + _ = yym777 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct773 := r.ContainerType() - if yyct773 == codecSelferValueTypeMap1234 { - yyl773 := r.ReadMapStart() - if yyl773 == 0 { + yyct778 := r.ContainerType() + if yyct778 == codecSelferValueTypeMap1234 { + yyl778 := r.ReadMapStart() + if yyl778 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl773, d) + x.codecDecodeSelfFromMap(yyl778, d) } - } else if yyct773 == codecSelferValueTypeArray1234 { - yyl773 := r.ReadArrayStart() - if yyl773 == 0 { + } else if yyct778 == codecSelferValueTypeArray1234 { + yyl778 := r.ReadArrayStart() + if yyl778 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl773, d) + x.codecDecodeSelfFromArray(yyl778, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -6645,12 +6686,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys774Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys774Slc - var yyhl774 bool = l >= 0 - for yyj774 := 0; ; yyj774++ { - if yyhl774 { - if yyj774 >= l { + var yys779Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys779Slc + var yyhl779 bool = l >= 0 + for yyj779 := 0; ; yyj779++ { + if yyhl779 { + if yyj779 >= l { break } } else { @@ -6659,10 +6700,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys774Slc = r.DecodeBytes(yys774Slc, true, true) - yys774 := string(yys774Slc) + yys779Slc = r.DecodeBytes(yys779Slc, true, true) + yys779 := string(yys779Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys774 { + switch yys779 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -6745,13 +6786,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv788 := &x.LeaderElection - yyv788.CodecDecodeSelf(d) + yyv793 := &x.LeaderElection + yyv793.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys774) - } // end switch yys774 - } // end for yyj774 + z.DecStructFieldNotFound(-1, yys779) + } // end switch yys779 + } // end for yyj779 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -6759,16 +6800,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj789 int - var yyb789 bool - var yyhl789 bool = l >= 0 - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + var yyj794 int + var yyb794 bool + var yyhl794 bool = l >= 0 + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6778,13 +6819,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6794,13 +6835,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6810,13 +6851,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int32(r.DecodeInt(32)) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6826,13 +6867,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6842,13 +6883,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6858,13 +6899,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6874,13 +6915,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6890,13 +6931,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.ContentType = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6906,13 +6947,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6922,13 +6963,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6938,13 +6979,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6954,13 +6995,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.HardPodAffinitySymmetricWeight = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6970,13 +7011,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.FailureDomains = string(r.DecodeString()) } - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6984,21 +7025,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv803 := &x.LeaderElection - yyv803.CodecDecodeSelf(d) + yyv808 := &x.LeaderElection + yyv808.CodecDecodeSelf(d) } for { - yyj789++ - if yyhl789 { - yyb789 = yyj789 > l + yyj794++ + if yyhl794 { + yyb794 = yyj794 > l } else { - yyb789 = r.CheckBreak() + yyb794 = r.CheckBreak() } - if yyb789 { + if yyb794 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj789-1, "") + z.DecStructFieldNotFound(yyj794-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7010,33 +7051,33 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym804 := z.EncBinary() - _ = yym804 + yym809 := z.EncBinary() + _ = yym809 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep805 := !z.EncBinary() - yy2arr805 := z.EncBasicHandle().StructToArray - var yyq805 [4]bool - _, _, _ = yysep805, yyq805, yy2arr805 - const yyr805 bool = false - var yynn805 int - if yyr805 || yy2arr805 { + yysep810 := !z.EncBinary() + yy2arr810 := z.EncBasicHandle().StructToArray + var yyq810 [4]bool + _, _, _ = yysep810, yyq810, yy2arr810 + const yyr810 bool = false + var yynn810 int + if yyr810 || yy2arr810 { r.EncodeArrayStart(4) } else { - yynn805 = 4 - for _, b := range yyq805 { + yynn810 = 4 + for _, b := range yyq810 { if b { - yynn805++ + yynn810++ } } - r.EncodeMapStart(yynn805) - yynn805 = 0 + r.EncodeMapStart(yynn810) + yynn810 = 0 } - if yyr805 || yy2arr805 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym807 := z.EncBinary() - _ = yym807 + yym812 := z.EncBinary() + _ = yym812 if false { } else { r.EncodeBool(bool(x.LeaderElect)) @@ -7045,43 +7086,16 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElect")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym808 := z.EncBinary() - _ = yym808 + yym813 := z.EncBinary() + _ = yym813 if false { } else { r.EncodeBool(bool(x.LeaderElect)) } } - if yyr805 || yy2arr805 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy810 := &x.LeaseDuration - yym811 := z.EncBinary() - _ = yym811 - if false { - } else if z.HasExtensions() && z.EncExt(yy810) { - } else if !yym811 && z.IsJSONHandle() { - z.EncJSONMarshal(yy810) - } else { - z.EncFallback(yy810) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy812 := &x.LeaseDuration - yym813 := z.EncBinary() - _ = yym813 - if false { - } else if z.HasExtensions() && z.EncExt(yy812) { - } else if !yym813 && z.IsJSONHandle() { - z.EncJSONMarshal(yy812) - } else { - z.EncFallback(yy812) - } - } - if yyr805 || yy2arr805 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy815 := &x.RenewDeadline + yy815 := &x.LeaseDuration yym816 := z.EncBinary() _ = yym816 if false { @@ -7093,9 +7107,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) + r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy817 := &x.RenewDeadline + yy817 := &x.LeaseDuration yym818 := z.EncBinary() _ = yym818 if false { @@ -7106,9 +7120,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy817) } } - if yyr805 || yy2arr805 { + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy820 := &x.RetryPeriod + yy820 := &x.RenewDeadline yym821 := z.EncBinary() _ = yym821 if false { @@ -7120,9 +7134,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy822 := &x.RetryPeriod + yy822 := &x.RenewDeadline yym823 := z.EncBinary() _ = yym823 if false { @@ -7133,7 +7147,34 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy822) } } - if yyr805 || yy2arr805 { + if yyr810 || yy2arr810 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy825 := &x.RetryPeriod + yym826 := z.EncBinary() + _ = yym826 + if false { + } else if z.HasExtensions() && z.EncExt(yy825) { + } else if !yym826 && z.IsJSONHandle() { + z.EncJSONMarshal(yy825) + } else { + z.EncFallback(yy825) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy827 := &x.RetryPeriod + yym828 := z.EncBinary() + _ = yym828 + if false { + } else if z.HasExtensions() && z.EncExt(yy827) { + } else if !yym828 && z.IsJSONHandle() { + z.EncJSONMarshal(yy827) + } else { + z.EncFallback(yy827) + } + } + if yyr810 || yy2arr810 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7146,25 +7187,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym824 := z.DecBinary() - _ = yym824 + yym829 := z.DecBinary() + _ = yym829 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct825 := r.ContainerType() - if yyct825 == codecSelferValueTypeMap1234 { - yyl825 := r.ReadMapStart() - if yyl825 == 0 { + yyct830 := r.ContainerType() + if yyct830 == codecSelferValueTypeMap1234 { + yyl830 := r.ReadMapStart() + if yyl830 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl825, d) + x.codecDecodeSelfFromMap(yyl830, d) } - } else if yyct825 == codecSelferValueTypeArray1234 { - yyl825 := r.ReadArrayStart() - if yyl825 == 0 { + } else if yyct830 == codecSelferValueTypeArray1234 { + yyl830 := r.ReadArrayStart() + if yyl830 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl825, d) + x.codecDecodeSelfFromArray(yyl830, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7176,12 +7217,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys826Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys826Slc - var yyhl826 bool = l >= 0 - for yyj826 := 0; ; yyj826++ { - if yyhl826 { - if yyj826 >= l { + var yys831Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys831Slc + var yyhl831 bool = l >= 0 + for yyj831 := 0; ; yyj831++ { + if yyhl831 { + if yyj831 >= l { break } } else { @@ -7190,10 +7231,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys826Slc = r.DecodeBytes(yys826Slc, true, true) - yys826 := string(yys826Slc) + yys831Slc = r.DecodeBytes(yys831Slc, true, true) + yys831 := string(yys831Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys826 { + switch yys831 { case "leaderElect": if r.TryDecodeAsNil() { x.LeaderElect = false @@ -7204,51 +7245,51 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv828 := &x.LeaseDuration - yym829 := z.DecBinary() - _ = yym829 + yyv833 := &x.LeaseDuration + yym834 := z.DecBinary() + _ = yym834 if false { - } else if z.HasExtensions() && z.DecExt(yyv828) { - } else if !yym829 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv828) + } else if z.HasExtensions() && z.DecExt(yyv833) { + } else if !yym834 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv833) } else { - z.DecFallback(yyv828, false) + z.DecFallback(yyv833, false) } } case "renewDeadline": if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv830 := &x.RenewDeadline - yym831 := z.DecBinary() - _ = yym831 + yyv835 := &x.RenewDeadline + yym836 := z.DecBinary() + _ = yym836 if false { - } else if z.HasExtensions() && z.DecExt(yyv830) { - } else if !yym831 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv830) + } else if z.HasExtensions() && z.DecExt(yyv835) { + } else if !yym836 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv835) } else { - z.DecFallback(yyv830, false) + z.DecFallback(yyv835, false) } } case "retryPeriod": if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv832 := &x.RetryPeriod - yym833 := z.DecBinary() - _ = yym833 + yyv837 := &x.RetryPeriod + yym838 := z.DecBinary() + _ = yym838 if false { - } else if z.HasExtensions() && z.DecExt(yyv832) { - } else if !yym833 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv832) + } else if z.HasExtensions() && z.DecExt(yyv837) { + } else if !yym838 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv837) } else { - z.DecFallback(yyv832, false) + z.DecFallback(yyv837, false) } } default: - z.DecStructFieldNotFound(-1, yys826) - } // end switch yys826 - } // end for yyj826 + z.DecStructFieldNotFound(-1, yys831) + } // end switch yys831 + } // end for yyj831 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7256,16 +7297,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj834 int - var yyb834 bool - var yyhl834 bool = l >= 0 - yyj834++ - if yyhl834 { - yyb834 = yyj834 > l + var yyj839 int + var yyb839 bool + var yyhl839 bool = l >= 0 + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb834 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb834 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7275,13 +7316,13 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } else { x.LeaderElect = bool(r.DecodeBool()) } - yyj834++ - if yyhl834 { - yyb834 = yyj834 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb834 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb834 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7289,24 +7330,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv836 := &x.LeaseDuration - yym837 := z.DecBinary() - _ = yym837 + yyv841 := &x.LeaseDuration + yym842 := z.DecBinary() + _ = yym842 if false { - } else if z.HasExtensions() && z.DecExt(yyv836) { - } else if !yym837 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv836) + } else if z.HasExtensions() && z.DecExt(yyv841) { + } else if !yym842 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv841) } else { - z.DecFallback(yyv836, false) + z.DecFallback(yyv841, false) } } - yyj834++ - if yyhl834 { - yyb834 = yyj834 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb834 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb834 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7314,24 +7355,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv838 := &x.RenewDeadline - yym839 := z.DecBinary() - _ = yym839 + yyv843 := &x.RenewDeadline + yym844 := z.DecBinary() + _ = yym844 if false { - } else if z.HasExtensions() && z.DecExt(yyv838) { - } else if !yym839 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv838) + } else if z.HasExtensions() && z.DecExt(yyv843) { + } else if !yym844 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv843) } else { - z.DecFallback(yyv838, false) + z.DecFallback(yyv843, false) } } - yyj834++ - if yyhl834 { - yyb834 = yyj834 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb834 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb834 { + if yyb839 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7339,29 +7380,29 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv840 := &x.RetryPeriod - yym841 := z.DecBinary() - _ = yym841 + yyv845 := &x.RetryPeriod + yym846 := z.DecBinary() + _ = yym846 if false { - } else if z.HasExtensions() && z.DecExt(yyv840) { - } else if !yym841 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv840) + } else if z.HasExtensions() && z.DecExt(yyv845) { + } else if !yym846 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv845) } else { - z.DecFallback(yyv840, false) + z.DecFallback(yyv845, false) } } for { - yyj834++ - if yyhl834 { - yyb834 = yyj834 > l + yyj839++ + if yyhl839 { + yyb839 = yyj839 > l } else { - yyb834 = r.CheckBreak() + yyb839 = r.CheckBreak() } - if yyb834 { + if yyb839 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj834-1, "") + z.DecStructFieldNotFound(yyj839-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7373,36 +7414,36 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode if x == nil { r.EncodeNil() } else { - yym842 := z.EncBinary() - _ = yym842 + yym847 := z.EncBinary() + _ = yym847 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep843 := !z.EncBinary() - yy2arr843 := z.EncBasicHandle().StructToArray - var yyq843 [59]bool - _, _, _ = yysep843, yyq843, yy2arr843 - const yyr843 bool = false - yyq843[0] = x.Kind != "" - yyq843[1] = x.APIVersion != "" - var yynn843 int - if yyr843 || yy2arr843 { + yysep848 := !z.EncBinary() + yy2arr848 := z.EncBasicHandle().StructToArray + var yyq848 [59]bool + _, _, _ = yysep848, yyq848, yy2arr848 + const yyr848 bool = false + yyq848[0] = x.Kind != "" + yyq848[1] = x.APIVersion != "" + var yynn848 int + if yyr848 || yy2arr848 { r.EncodeArrayStart(59) } else { - yynn843 = 57 - for _, b := range yyq843 { + yynn848 = 57 + for _, b := range yyq848 { if b { - yynn843++ + yynn848++ } } - r.EncodeMapStart(yynn843) - yynn843 = 0 + r.EncodeMapStart(yynn848) + yynn848 = 0 } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq843[0] { - yym845 := z.EncBinary() - _ = yym845 + if yyq848[0] { + yym850 := z.EncBinary() + _ = yym850 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -7411,23 +7452,23 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq843[0] { + if yyq848[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym846 := z.EncBinary() - _ = yym846 + yym851 := z.EncBinary() + _ = yym851 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq843[1] { - yym848 := z.EncBinary() - _ = yym848 + if yyq848[1] { + yym853 := z.EncBinary() + _ = yym853 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -7436,22 +7477,22 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq843[1] { + if yyq848[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym849 := z.EncBinary() - _ = yym849 + yym854 := z.EncBinary() + _ = yym854 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym851 := z.EncBinary() - _ = yym851 + yym856 := z.EncBinary() + _ = yym856 if false { } else { r.EncodeInt(int64(x.Port)) @@ -7460,17 +7501,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym852 := z.EncBinary() - _ = yym852 + yym857 := z.EncBinary() + _ = yym857 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym854 := z.EncBinary() - _ = yym854 + yym859 := z.EncBinary() + _ = yym859 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -7479,17 +7520,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym855 := z.EncBinary() - _ = yym855 + yym860 := z.EncBinary() + _ = yym860 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym857 := z.EncBinary() - _ = yym857 + yym862 := z.EncBinary() + _ = yym862 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -7498,17 +7539,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym858 := z.EncBinary() - _ = yym858 + yym863 := z.EncBinary() + _ = yym863 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym860 := z.EncBinary() - _ = yym860 + yym865 := z.EncBinary() + _ = yym865 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) @@ -7517,17 +7558,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym861 := z.EncBinary() - _ = yym861 + yym866 := z.EncBinary() + _ = yym866 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym863 := z.EncBinary() - _ = yym863 + yym868 := z.EncBinary() + _ = yym868 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) @@ -7536,17 +7577,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentEndpointSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym864 := z.EncBinary() - _ = yym864 + yym869 := z.EncBinary() + _ = yym869 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym866 := z.EncBinary() - _ = yym866 + yym871 := z.EncBinary() + _ = yym871 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) @@ -7555,17 +7596,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRSSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym867 := z.EncBinary() - _ = yym867 + yym872 := z.EncBinary() + _ = yym872 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym869 := z.EncBinary() - _ = yym869 + yym874 := z.EncBinary() + _ = yym874 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) @@ -7574,17 +7615,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym870 := z.EncBinary() - _ = yym870 + yym875 := z.EncBinary() + _ = yym875 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym872 := z.EncBinary() - _ = yym872 + yym877 := z.EncBinary() + _ = yym877 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) @@ -7593,17 +7634,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentServiceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym873 := z.EncBinary() - _ = yym873 + yym878 := z.EncBinary() + _ = yym878 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym875 := z.EncBinary() - _ = yym875 + yym880 := z.EncBinary() + _ = yym880 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) @@ -7612,17 +7653,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentResourceQuotaSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym876 := z.EncBinary() - _ = yym876 + yym881 := z.EncBinary() + _ = yym881 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym878 := z.EncBinary() - _ = yym878 + yym883 := z.EncBinary() + _ = yym883 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) @@ -7631,17 +7672,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDeploymentSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym879 := z.EncBinary() - _ = yym879 + yym884 := z.EncBinary() + _ = yym884 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym881 := z.EncBinary() - _ = yym881 + yym886 := z.EncBinary() + _ = yym886 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) @@ -7650,17 +7691,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDaemonSetSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym882 := z.EncBinary() - _ = yym882 + yym887 := z.EncBinary() + _ = yym887 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym884 := z.EncBinary() - _ = yym884 + yym889 := z.EncBinary() + _ = yym889 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) @@ -7669,17 +7710,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentJobSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym885 := z.EncBinary() - _ = yym885 + yym890 := z.EncBinary() + _ = yym890 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym887 := z.EncBinary() - _ = yym887 + yym892 := z.EncBinary() + _ = yym892 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) @@ -7688,17 +7729,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentNamespaceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym888 := z.EncBinary() - _ = yym888 + yym893 := z.EncBinary() + _ = yym893 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym890 := z.EncBinary() - _ = yym890 + yym895 := z.EncBinary() + _ = yym895 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) @@ -7707,17 +7748,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentSATokenSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym891 := z.EncBinary() - _ = yym891 + yym896 := z.EncBinary() + _ = yym896 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym893 := z.EncBinary() - _ = yym893 + yym898 := z.EncBinary() + _ = yym898 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) @@ -7726,17 +7767,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRC")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym894 := z.EncBinary() - _ = yym894 + yym899 := z.EncBinary() + _ = yym899 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym896 := z.EncBinary() - _ = yym896 + yym901 := z.EncBinary() + _ = yym901 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) @@ -7745,17 +7786,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym897 := z.EncBinary() - _ = yym897 + yym902 := z.EncBinary() + _ = yym902 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym899 := z.EncBinary() - _ = yym899 + yym904 := z.EncBinary() + _ = yym904 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) @@ -7764,43 +7805,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForDaemonSet")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym900 := z.EncBinary() - _ = yym900 + yym905 := z.EncBinary() + _ = yym905 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy902 := &x.ServiceSyncPeriod - yym903 := z.EncBinary() - _ = yym903 - if false { - } else if z.HasExtensions() && z.EncExt(yy902) { - } else if !yym903 && z.IsJSONHandle() { - z.EncJSONMarshal(yy902) - } else { - z.EncFallback(yy902) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy904 := &x.ServiceSyncPeriod - yym905 := z.EncBinary() - _ = yym905 - if false { - } else if z.HasExtensions() && z.EncExt(yy904) { - } else if !yym905 && z.IsJSONHandle() { - z.EncJSONMarshal(yy904) - } else { - z.EncFallback(yy904) - } - } - if yyr843 || yy2arr843 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy907 := &x.NodeSyncPeriod + yy907 := &x.ServiceSyncPeriod yym908 := z.EncBinary() _ = yym908 if false { @@ -7812,9 +7826,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy909 := &x.NodeSyncPeriod + yy909 := &x.ServiceSyncPeriod yym910 := z.EncBinary() _ = yym910 if false { @@ -7825,9 +7839,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy909) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy912 := &x.ResourceQuotaSyncPeriod + yy912 := &x.NodeSyncPeriod yym913 := z.EncBinary() _ = yym913 if false { @@ -7839,9 +7853,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy914 := &x.ResourceQuotaSyncPeriod + yy914 := &x.NodeSyncPeriod yym915 := z.EncBinary() _ = yym915 if false { @@ -7852,9 +7866,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy914) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy917 := &x.NamespaceSyncPeriod + yy917 := &x.ResourceQuotaSyncPeriod yym918 := z.EncBinary() _ = yym918 if false { @@ -7866,9 +7880,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy919 := &x.NamespaceSyncPeriod + yy919 := &x.ResourceQuotaSyncPeriod yym920 := z.EncBinary() _ = yym920 if false { @@ -7879,9 +7893,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy919) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy922 := &x.PVClaimBinderSyncPeriod + yy922 := &x.NamespaceSyncPeriod yym923 := z.EncBinary() _ = yym923 if false { @@ -7893,9 +7907,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy924 := &x.PVClaimBinderSyncPeriod + yy924 := &x.NamespaceSyncPeriod yym925 := z.EncBinary() _ = yym925 if false { @@ -7906,9 +7920,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy924) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy927 := &x.MinResyncPeriod + yy927 := &x.PVClaimBinderSyncPeriod yym928 := z.EncBinary() _ = yym928 if false { @@ -7920,9 +7934,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy929 := &x.MinResyncPeriod + yy929 := &x.PVClaimBinderSyncPeriod yym930 := z.EncBinary() _ = yym930 if false { @@ -7933,10 +7947,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy929) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym932 := z.EncBinary() - _ = yym932 + yy932 := &x.MinResyncPeriod + yym933 := z.EncBinary() + _ = yym933 + if false { + } else if z.HasExtensions() && z.EncExt(yy932) { + } else if !yym933 && z.IsJSONHandle() { + z.EncJSONMarshal(yy932) + } else { + z.EncFallback(yy932) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy934 := &x.MinResyncPeriod + yym935 := z.EncBinary() + _ = yym935 + if false { + } else if z.HasExtensions() && z.EncExt(yy934) { + } else if !yym935 && z.IsJSONHandle() { + z.EncJSONMarshal(yy934) + } else { + z.EncFallback(yy934) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym937 := z.EncBinary() + _ = yym937 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) @@ -7945,43 +7986,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("terminatedPodGCThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym933 := z.EncBinary() - _ = yym933 + yym938 := z.EncBinary() + _ = yym938 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy935 := &x.HorizontalPodAutoscalerSyncPeriod - yym936 := z.EncBinary() - _ = yym936 - if false { - } else if z.HasExtensions() && z.EncExt(yy935) { - } else if !yym936 && z.IsJSONHandle() { - z.EncJSONMarshal(yy935) - } else { - z.EncFallback(yy935) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy937 := &x.HorizontalPodAutoscalerSyncPeriod - yym938 := z.EncBinary() - _ = yym938 - if false { - } else if z.HasExtensions() && z.EncExt(yy937) { - } else if !yym938 && z.IsJSONHandle() { - z.EncJSONMarshal(yy937) - } else { - z.EncFallback(yy937) - } - } - if yyr843 || yy2arr843 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy940 := &x.DeploymentControllerSyncPeriod + yy940 := &x.HorizontalPodAutoscalerSyncPeriod yym941 := z.EncBinary() _ = yym941 if false { @@ -7993,9 +8007,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy942 := &x.DeploymentControllerSyncPeriod + yy942 := &x.HorizontalPodAutoscalerSyncPeriod yym943 := z.EncBinary() _ = yym943 if false { @@ -8006,9 +8020,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy942) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy945 := &x.PodEvictionTimeout + yy945 := &x.DeploymentControllerSyncPeriod yym946 := z.EncBinary() _ = yym946 if false { @@ -8020,9 +8034,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) + r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy947 := &x.PodEvictionTimeout + yy947 := &x.DeploymentControllerSyncPeriod yym948 := z.EncBinary() _ = yym948 if false { @@ -8033,10 +8047,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy947) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym950 := z.EncBinary() - _ = yym950 + yy950 := &x.PodEvictionTimeout + yym951 := z.EncBinary() + _ = yym951 + if false { + } else if z.HasExtensions() && z.EncExt(yy950) { + } else if !yym951 && z.IsJSONHandle() { + z.EncJSONMarshal(yy950) + } else { + z.EncFallback(yy950) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy952 := &x.PodEvictionTimeout + yym953 := z.EncBinary() + _ = yym953 + if false { + } else if z.HasExtensions() && z.EncExt(yy952) { + } else if !yym953 && z.IsJSONHandle() { + z.EncJSONMarshal(yy952) + } else { + z.EncFallback(yy952) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym955 := z.EncBinary() + _ = yym955 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) @@ -8045,17 +8086,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsQps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym951 := z.EncBinary() - _ = yym951 + yym956 := z.EncBinary() + _ = yym956 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym953 := z.EncBinary() - _ = yym953 + yym958 := z.EncBinary() + _ = yym958 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) @@ -8064,44 +8105,44 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym954 := z.EncBinary() - _ = yym954 + yym959 := z.EncBinary() + _ = yym959 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy956 := &x.NodeMonitorGracePeriod - yym957 := z.EncBinary() - _ = yym957 + yy961 := &x.NodeMonitorGracePeriod + yym962 := z.EncBinary() + _ = yym962 if false { - } else if z.HasExtensions() && z.EncExt(yy956) { - } else if !yym957 && z.IsJSONHandle() { - z.EncJSONMarshal(yy956) + } else if z.HasExtensions() && z.EncExt(yy961) { + } else if !yym962 && z.IsJSONHandle() { + z.EncJSONMarshal(yy961) } else { - z.EncFallback(yy956) + z.EncFallback(yy961) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy958 := &x.NodeMonitorGracePeriod - yym959 := z.EncBinary() - _ = yym959 + yy963 := &x.NodeMonitorGracePeriod + yym964 := z.EncBinary() + _ = yym964 if false { - } else if z.HasExtensions() && z.EncExt(yy958) { - } else if !yym959 && z.IsJSONHandle() { - z.EncJSONMarshal(yy958) + } else if z.HasExtensions() && z.EncExt(yy963) { + } else if !yym964 && z.IsJSONHandle() { + z.EncJSONMarshal(yy963) } else { - z.EncFallback(yy958) + z.EncFallback(yy963) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym961 := z.EncBinary() - _ = yym961 + yym966 := z.EncBinary() + _ = yym966 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) @@ -8110,43 +8151,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerRetryCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym962 := z.EncBinary() - _ = yym962 + yym967 := z.EncBinary() + _ = yym967 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy964 := &x.NodeStartupGracePeriod - yym965 := z.EncBinary() - _ = yym965 - if false { - } else if z.HasExtensions() && z.EncExt(yy964) { - } else if !yym965 && z.IsJSONHandle() { - z.EncJSONMarshal(yy964) - } else { - z.EncFallback(yy964) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy966 := &x.NodeStartupGracePeriod - yym967 := z.EncBinary() - _ = yym967 - if false { - } else if z.HasExtensions() && z.EncExt(yy966) { - } else if !yym967 && z.IsJSONHandle() { - z.EncJSONMarshal(yy966) - } else { - z.EncFallback(yy966) - } - } - if yyr843 || yy2arr843 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy969 := &x.NodeMonitorPeriod + yy969 := &x.NodeStartupGracePeriod yym970 := z.EncBinary() _ = yym970 if false { @@ -8158,9 +8172,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy971 := &x.NodeMonitorPeriod + yy971 := &x.NodeStartupGracePeriod yym972 := z.EncBinary() _ = yym972 if false { @@ -8171,10 +8185,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy971) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym974 := z.EncBinary() - _ = yym974 + yy974 := &x.NodeMonitorPeriod + yym975 := z.EncBinary() + _ = yym975 + if false { + } else if z.HasExtensions() && z.EncExt(yy974) { + } else if !yym975 && z.IsJSONHandle() { + z.EncJSONMarshal(yy974) + } else { + z.EncFallback(yy974) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy976 := &x.NodeMonitorPeriod + yym977 := z.EncBinary() + _ = yym977 + if false { + } else if z.HasExtensions() && z.EncExt(yy976) { + } else if !yym977 && z.IsJSONHandle() { + z.EncJSONMarshal(yy976) + } else { + z.EncFallback(yy976) + } + } + if yyr848 || yy2arr848 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym979 := z.EncBinary() + _ = yym979 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) @@ -8183,17 +8224,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceAccountKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym975 := z.EncBinary() - _ = yym975 + yym980 := z.EncBinary() + _ = yym980 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym977 := z.EncBinary() - _ = yym977 + yym982 := z.EncBinary() + _ = yym982 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) @@ -8202,17 +8243,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym978 := z.EncBinary() - _ = yym978 + yym983 := z.EncBinary() + _ = yym983 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym980 := z.EncBinary() - _ = yym980 + yym985 := z.EncBinary() + _ = yym985 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) @@ -8221,17 +8262,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym981 := z.EncBinary() - _ = yym981 + yym986 := z.EncBinary() + _ = yym986 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym983 := z.EncBinary() - _ = yym983 + yym988 := z.EncBinary() + _ = yym988 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) @@ -8240,17 +8281,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("approveAllKubeletCSRsForGroup")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym984 := z.EncBinary() - _ = yym984 + yym989 := z.EncBinary() + _ = yym989 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym986 := z.EncBinary() - _ = yym986 + yym991 := z.EncBinary() + _ = yym991 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -8259,17 +8300,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym987 := z.EncBinary() - _ = yym987 + yym992 := z.EncBinary() + _ = yym992 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym989 := z.EncBinary() - _ = yym989 + yym994 := z.EncBinary() + _ = yym994 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) @@ -8278,17 +8319,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym990 := z.EncBinary() - _ = yym990 + yym995 := z.EncBinary() + _ = yym995 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym992 := z.EncBinary() - _ = yym992 + yym997 := z.EncBinary() + _ = yym997 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) @@ -8297,17 +8338,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym993 := z.EncBinary() - _ = yym993 + yym998 := z.EncBinary() + _ = yym998 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym995 := z.EncBinary() - _ = yym995 + yym1000 := z.EncBinary() + _ = yym1000 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) @@ -8316,17 +8357,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym996 := z.EncBinary() - _ = yym996 + yym1001 := z.EncBinary() + _ = yym1001 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym998 := z.EncBinary() - _ = yym998 + yym1003 := z.EncBinary() + _ = yym1003 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) @@ -8335,17 +8376,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeCIDRMaskSize")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym999 := z.EncBinary() - _ = yym999 + yym1004 := z.EncBinary() + _ = yym1004 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1001 := z.EncBinary() - _ = yym1001 + yym1006 := z.EncBinary() + _ = yym1006 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) @@ -8354,17 +8395,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allocateNodeCIDRs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1002 := z.EncBinary() - _ = yym1002 + yym1007 := z.EncBinary() + _ = yym1007 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1004 := z.EncBinary() - _ = yym1004 + yym1009 := z.EncBinary() + _ = yym1009 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) @@ -8373,17 +8414,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCloudRoutes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1005 := z.EncBinary() - _ = yym1005 + yym1010 := z.EncBinary() + _ = yym1010 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1007 := z.EncBinary() - _ = yym1007 + yym1012 := z.EncBinary() + _ = yym1012 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) @@ -8392,17 +8433,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootCAFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1008 := z.EncBinary() - _ = yym1008 + yym1013 := z.EncBinary() + _ = yym1013 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1010 := z.EncBinary() - _ = yym1010 + yym1015 := z.EncBinary() + _ = yym1015 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -8411,17 +8452,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1011 := z.EncBinary() - _ = yym1011 + yym1016 := z.EncBinary() + _ = yym1016 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1013 := z.EncBinary() - _ = yym1013 + yym1018 := z.EncBinary() + _ = yym1018 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -8430,17 +8471,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1014 := z.EncBinary() - _ = yym1014 + yym1019 := z.EncBinary() + _ = yym1019 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1016 := z.EncBinary() - _ = yym1016 + yym1021 := z.EncBinary() + _ = yym1021 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -8449,66 +8490,66 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1017 := z.EncBinary() - _ = yym1017 + yym1022 := z.EncBinary() + _ = yym1022 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1019 := &x.LeaderElection - yy1019.CodecEncodeSelf(e) + yy1024 := &x.LeaderElection + yy1024.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1020 := &x.LeaderElection - yy1020.CodecEncodeSelf(e) + yy1025 := &x.LeaderElection + yy1025.CodecEncodeSelf(e) } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1022 := &x.VolumeConfiguration - yy1022.CodecEncodeSelf(e) + yy1027 := &x.VolumeConfiguration + yy1027.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1023 := &x.VolumeConfiguration - yy1023.CodecEncodeSelf(e) + yy1028 := &x.VolumeConfiguration + yy1028.CodecEncodeSelf(e) } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1025 := &x.ControllerStartInterval - yym1026 := z.EncBinary() - _ = yym1026 + yy1030 := &x.ControllerStartInterval + yym1031 := z.EncBinary() + _ = yym1031 if false { - } else if z.HasExtensions() && z.EncExt(yy1025) { - } else if !yym1026 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1025) + } else if z.HasExtensions() && z.EncExt(yy1030) { + } else if !yym1031 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1030) } else { - z.EncFallback(yy1025) + z.EncFallback(yy1030) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controllerStartInterval")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1027 := &x.ControllerStartInterval - yym1028 := z.EncBinary() - _ = yym1028 + yy1032 := &x.ControllerStartInterval + yym1033 := z.EncBinary() + _ = yym1033 if false { - } else if z.HasExtensions() && z.EncExt(yy1027) { - } else if !yym1028 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1027) + } else if z.HasExtensions() && z.EncExt(yy1032) { + } else if !yym1033 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1032) } else { - z.EncFallback(yy1027) + z.EncFallback(yy1032) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1030 := z.EncBinary() - _ = yym1030 + yym1035 := z.EncBinary() + _ = yym1035 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) @@ -8517,17 +8558,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableGarbageCollector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1031 := z.EncBinary() - _ = yym1031 + yym1036 := z.EncBinary() + _ = yym1036 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1033 := z.EncBinary() - _ = yym1033 + yym1038 := z.EncBinary() + _ = yym1038 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) @@ -8536,17 +8577,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentGCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1034 := z.EncBinary() - _ = yym1034 + yym1039 := z.EncBinary() + _ = yym1039 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1036 := z.EncBinary() - _ = yym1036 + yym1041 := z.EncBinary() + _ = yym1041 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) @@ -8555,17 +8596,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1037 := z.EncBinary() - _ = yym1037 + yym1042 := z.EncBinary() + _ = yym1042 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1039 := z.EncBinary() - _ = yym1039 + yym1044 := z.EncBinary() + _ = yym1044 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) @@ -8574,17 +8615,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("secondaryNodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1040 := z.EncBinary() - _ = yym1040 + yym1045 := z.EncBinary() + _ = yym1045 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1042 := z.EncBinary() - _ = yym1042 + yym1047 := z.EncBinary() + _ = yym1047 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) @@ -8593,17 +8634,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("largeClusterSizeThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1043 := z.EncBinary() - _ = yym1043 + yym1048 := z.EncBinary() + _ = yym1048 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1045 := z.EncBinary() - _ = yym1045 + yym1050 := z.EncBinary() + _ = yym1050 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) @@ -8612,14 +8653,14 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("unhealthyZoneThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1046 := z.EncBinary() - _ = yym1046 + yym1051 := z.EncBinary() + _ = yym1051 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -8632,25 +8673,25 @@ func (x *KubeControllerManagerConfiguration) CodecDecodeSelf(d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1047 := z.DecBinary() - _ = yym1047 + yym1052 := z.DecBinary() + _ = yym1052 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1048 := r.ContainerType() - if yyct1048 == codecSelferValueTypeMap1234 { - yyl1048 := r.ReadMapStart() - if yyl1048 == 0 { + yyct1053 := r.ContainerType() + if yyct1053 == codecSelferValueTypeMap1234 { + yyl1053 := r.ReadMapStart() + if yyl1053 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1048, d) + x.codecDecodeSelfFromMap(yyl1053, d) } - } else if yyct1048 == codecSelferValueTypeArray1234 { - yyl1048 := r.ReadArrayStart() - if yyl1048 == 0 { + } else if yyct1053 == codecSelferValueTypeArray1234 { + yyl1053 := r.ReadArrayStart() + if yyl1053 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1048, d) + x.codecDecodeSelfFromArray(yyl1053, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8662,12 +8703,12 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1049Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1049Slc - var yyhl1049 bool = l >= 0 - for yyj1049 := 0; ; yyj1049++ { - if yyhl1049 { - if yyj1049 >= l { + var yys1054Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1054Slc + var yyhl1054 bool = l >= 0 + for yyj1054 := 0; ; yyj1054++ { + if yyhl1054 { + if yyj1054 >= l { break } } else { @@ -8676,10 +8717,10 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1049Slc = r.DecodeBytes(yys1049Slc, true, true) - yys1049 := string(yys1049Slc) + yys1054Slc = r.DecodeBytes(yys1054Slc, true, true) + yys1054 := string(yys1054Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1049 { + switch yys1054 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -8798,90 +8839,90 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1069 := &x.ServiceSyncPeriod - yym1070 := z.DecBinary() - _ = yym1070 + yyv1074 := &x.ServiceSyncPeriod + yym1075 := z.DecBinary() + _ = yym1075 if false { - } else if z.HasExtensions() && z.DecExt(yyv1069) { - } else if !yym1070 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1069) + } else if z.HasExtensions() && z.DecExt(yyv1074) { + } else if !yym1075 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1074) } else { - z.DecFallback(yyv1069, false) + z.DecFallback(yyv1074, false) } } case "nodeSyncPeriod": if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1071 := &x.NodeSyncPeriod - yym1072 := z.DecBinary() - _ = yym1072 + yyv1076 := &x.NodeSyncPeriod + yym1077 := z.DecBinary() + _ = yym1077 if false { - } else if z.HasExtensions() && z.DecExt(yyv1071) { - } else if !yym1072 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1071) + } else if z.HasExtensions() && z.DecExt(yyv1076) { + } else if !yym1077 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1076) } else { - z.DecFallback(yyv1071, false) + z.DecFallback(yyv1076, false) } } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1073 := &x.ResourceQuotaSyncPeriod - yym1074 := z.DecBinary() - _ = yym1074 + yyv1078 := &x.ResourceQuotaSyncPeriod + yym1079 := z.DecBinary() + _ = yym1079 if false { - } else if z.HasExtensions() && z.DecExt(yyv1073) { - } else if !yym1074 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1073) + } else if z.HasExtensions() && z.DecExt(yyv1078) { + } else if !yym1079 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1078) } else { - z.DecFallback(yyv1073, false) + z.DecFallback(yyv1078, false) } } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1075 := &x.NamespaceSyncPeriod - yym1076 := z.DecBinary() - _ = yym1076 + yyv1080 := &x.NamespaceSyncPeriod + yym1081 := z.DecBinary() + _ = yym1081 if false { - } else if z.HasExtensions() && z.DecExt(yyv1075) { - } else if !yym1076 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1075) + } else if z.HasExtensions() && z.DecExt(yyv1080) { + } else if !yym1081 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1080) } else { - z.DecFallback(yyv1075, false) + z.DecFallback(yyv1080, false) } } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1077 := &x.PVClaimBinderSyncPeriod - yym1078 := z.DecBinary() - _ = yym1078 + yyv1082 := &x.PVClaimBinderSyncPeriod + yym1083 := z.DecBinary() + _ = yym1083 if false { - } else if z.HasExtensions() && z.DecExt(yyv1077) { - } else if !yym1078 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1077) + } else if z.HasExtensions() && z.DecExt(yyv1082) { + } else if !yym1083 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1082) } else { - z.DecFallback(yyv1077, false) + z.DecFallback(yyv1082, false) } } case "minResyncPeriod": if r.TryDecodeAsNil() { x.MinResyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1079 := &x.MinResyncPeriod - yym1080 := z.DecBinary() - _ = yym1080 + yyv1084 := &x.MinResyncPeriod + yym1085 := z.DecBinary() + _ = yym1085 if false { - } else if z.HasExtensions() && z.DecExt(yyv1079) { - } else if !yym1080 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1079) + } else if z.HasExtensions() && z.DecExt(yyv1084) { + } else if !yym1085 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1084) } else { - z.DecFallback(yyv1079, false) + z.DecFallback(yyv1084, false) } } case "terminatedPodGCThreshold": @@ -8894,45 +8935,45 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1082 := &x.HorizontalPodAutoscalerSyncPeriod - yym1083 := z.DecBinary() - _ = yym1083 + yyv1087 := &x.HorizontalPodAutoscalerSyncPeriod + yym1088 := z.DecBinary() + _ = yym1088 if false { - } else if z.HasExtensions() && z.DecExt(yyv1082) { - } else if !yym1083 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1082) + } else if z.HasExtensions() && z.DecExt(yyv1087) { + } else if !yym1088 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1087) } else { - z.DecFallback(yyv1082, false) + z.DecFallback(yyv1087, false) } } case "deploymentControllerSyncPeriod": if r.TryDecodeAsNil() { x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1084 := &x.DeploymentControllerSyncPeriod - yym1085 := z.DecBinary() - _ = yym1085 + yyv1089 := &x.DeploymentControllerSyncPeriod + yym1090 := z.DecBinary() + _ = yym1090 if false { - } else if z.HasExtensions() && z.DecExt(yyv1084) { - } else if !yym1085 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1084) + } else if z.HasExtensions() && z.DecExt(yyv1089) { + } else if !yym1090 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1089) } else { - z.DecFallback(yyv1084, false) + z.DecFallback(yyv1089, false) } } case "podEvictionTimeout": if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1086 := &x.PodEvictionTimeout - yym1087 := z.DecBinary() - _ = yym1087 + yyv1091 := &x.PodEvictionTimeout + yym1092 := z.DecBinary() + _ = yym1092 if false { - } else if z.HasExtensions() && z.DecExt(yyv1086) { - } else if !yym1087 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1086) + } else if z.HasExtensions() && z.DecExt(yyv1091) { + } else if !yym1092 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1091) } else { - z.DecFallback(yyv1086, false) + z.DecFallback(yyv1091, false) } } case "deletingPodsQps": @@ -8951,15 +8992,15 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1090 := &x.NodeMonitorGracePeriod - yym1091 := z.DecBinary() - _ = yym1091 + yyv1095 := &x.NodeMonitorGracePeriod + yym1096 := z.DecBinary() + _ = yym1096 if false { - } else if z.HasExtensions() && z.DecExt(yyv1090) { - } else if !yym1091 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1090) + } else if z.HasExtensions() && z.DecExt(yyv1095) { + } else if !yym1096 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1095) } else { - z.DecFallback(yyv1090, false) + z.DecFallback(yyv1095, false) } } case "registerRetryCount": @@ -8972,30 +9013,30 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1093 := &x.NodeStartupGracePeriod - yym1094 := z.DecBinary() - _ = yym1094 + yyv1098 := &x.NodeStartupGracePeriod + yym1099 := z.DecBinary() + _ = yym1099 if false { - } else if z.HasExtensions() && z.DecExt(yyv1093) { - } else if !yym1094 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1093) + } else if z.HasExtensions() && z.DecExt(yyv1098) { + } else if !yym1099 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1098) } else { - z.DecFallback(yyv1093, false) + z.DecFallback(yyv1098, false) } } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { x.NodeMonitorPeriod = pkg1_unversioned.Duration{} } else { - yyv1095 := &x.NodeMonitorPeriod - yym1096 := z.DecBinary() - _ = yym1096 + yyv1100 := &x.NodeMonitorPeriod + yym1101 := z.DecBinary() + _ = yym1101 if false { - } else if z.HasExtensions() && z.DecExt(yyv1095) { - } else if !yym1096 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1095) + } else if z.HasExtensions() && z.DecExt(yyv1100) { + } else if !yym1101 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1100) } else { - z.DecFallback(yyv1095, false) + z.DecFallback(yyv1100, false) } } case "serviceAccountKeyFile": @@ -9092,29 +9133,29 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1112 := &x.LeaderElection - yyv1112.CodecDecodeSelf(d) + yyv1117 := &x.LeaderElection + yyv1117.CodecDecodeSelf(d) } case "volumeConfiguration": if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1113 := &x.VolumeConfiguration - yyv1113.CodecDecodeSelf(d) + yyv1118 := &x.VolumeConfiguration + yyv1118.CodecDecodeSelf(d) } case "controllerStartInterval": if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1114 := &x.ControllerStartInterval - yym1115 := z.DecBinary() - _ = yym1115 + yyv1119 := &x.ControllerStartInterval + yym1120 := z.DecBinary() + _ = yym1120 if false { - } else if z.HasExtensions() && z.DecExt(yyv1114) { - } else if !yym1115 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1114) + } else if z.HasExtensions() && z.DecExt(yyv1119) { + } else if !yym1120 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1119) } else { - z.DecFallback(yyv1114, false) + z.DecFallback(yyv1119, false) } } case "enableGarbageCollector": @@ -9154,9 +9195,9 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } default: - z.DecStructFieldNotFound(-1, yys1049) - } // end switch yys1049 - } // end for yyj1049 + z.DecStructFieldNotFound(-1, yys1054) + } // end switch yys1054 + } // end for yyj1054 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -9164,16 +9205,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1122 int - var yyb1122 bool - var yyhl1122 bool = l >= 0 - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + var yyj1127 int + var yyb1127 bool + var yyhl1127 bool = l >= 0 + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9183,13 +9224,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Kind = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9199,13 +9240,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.APIVersion = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9215,13 +9256,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Port = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9231,13 +9272,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Address = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9247,13 +9288,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudProvider = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9263,13 +9304,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9279,13 +9320,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentEndpointSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9295,13 +9336,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRSSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9311,13 +9352,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRCSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9327,13 +9368,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentServiceSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9343,13 +9384,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentResourceQuotaSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9359,13 +9400,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDeploymentSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9375,13 +9416,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDaemonSetSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9391,13 +9432,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentJobSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9407,13 +9448,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentNamespaceSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9423,13 +9464,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentSATokenSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9439,13 +9480,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRC = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9455,13 +9496,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRS = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9471,13 +9512,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForDaemonSet = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9485,24 +9526,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1142 := &x.ServiceSyncPeriod - yym1143 := z.DecBinary() - _ = yym1143 + yyv1147 := &x.ServiceSyncPeriod + yym1148 := z.DecBinary() + _ = yym1148 if false { - } else if z.HasExtensions() && z.DecExt(yyv1142) { - } else if !yym1143 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1142) + } else if z.HasExtensions() && z.DecExt(yyv1147) { + } else if !yym1148 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1147) } else { - z.DecFallback(yyv1142, false) + z.DecFallback(yyv1147, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9510,24 +9551,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1144 := &x.NodeSyncPeriod - yym1145 := z.DecBinary() - _ = yym1145 + yyv1149 := &x.NodeSyncPeriod + yym1150 := z.DecBinary() + _ = yym1150 if false { - } else if z.HasExtensions() && z.DecExt(yyv1144) { - } else if !yym1145 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1144) + } else if z.HasExtensions() && z.DecExt(yyv1149) { + } else if !yym1150 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1149) } else { - z.DecFallback(yyv1144, false) + z.DecFallback(yyv1149, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9535,24 +9576,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1146 := &x.ResourceQuotaSyncPeriod - yym1147 := z.DecBinary() - _ = yym1147 + yyv1151 := &x.ResourceQuotaSyncPeriod + yym1152 := z.DecBinary() + _ = yym1152 if false { - } else if z.HasExtensions() && z.DecExt(yyv1146) { - } else if !yym1147 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1146) + } else if z.HasExtensions() && z.DecExt(yyv1151) { + } else if !yym1152 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1151) } else { - z.DecFallback(yyv1146, false) + z.DecFallback(yyv1151, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9560,24 +9601,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1148 := &x.NamespaceSyncPeriod - yym1149 := z.DecBinary() - _ = yym1149 + yyv1153 := &x.NamespaceSyncPeriod + yym1154 := z.DecBinary() + _ = yym1154 if false { - } else if z.HasExtensions() && z.DecExt(yyv1148) { - } else if !yym1149 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1148) + } else if z.HasExtensions() && z.DecExt(yyv1153) { + } else if !yym1154 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1153) } else { - z.DecFallback(yyv1148, false) + z.DecFallback(yyv1153, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9585,73 +9626,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1150 := &x.PVClaimBinderSyncPeriod - yym1151 := z.DecBinary() - _ = yym1151 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1150) { - } else if !yym1151 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1150) - } else { - z.DecFallback(yyv1150, false) - } - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1152 := &x.MinResyncPeriod - yym1153 := z.DecBinary() - _ = yym1153 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1152) { - } else if !yym1153 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1152) - } else { - z.DecFallback(yyv1152, false) - } - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.TerminatedPodGCThreshold = 0 - } else { - x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1155 := &x.HorizontalPodAutoscalerSyncPeriod + yyv1155 := &x.PVClaimBinderSyncPeriod yym1156 := z.DecBinary() _ = yym1156 if false { @@ -9662,21 +9637,21 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1155, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1157 := &x.DeploymentControllerSyncPeriod + yyv1157 := &x.MinResyncPeriod yym1158 := z.DecBinary() _ = yym1158 if false { @@ -9687,13 +9662,79 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1157, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.TerminatedPodGCThreshold = 0 + } else { + x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1160 := &x.HorizontalPodAutoscalerSyncPeriod + yym1161 := z.DecBinary() + _ = yym1161 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1160) { + } else if !yym1161 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1160) + } else { + z.DecFallback(yyv1160, false) + } + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1162 := &x.DeploymentControllerSyncPeriod + yym1163 := z.DecBinary() + _ = yym1163 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1162) { + } else if !yym1163 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1162) + } else { + z.DecFallback(yyv1162, false) + } + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9701,24 +9742,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1159 := &x.PodEvictionTimeout - yym1160 := z.DecBinary() - _ = yym1160 + yyv1164 := &x.PodEvictionTimeout + yym1165 := z.DecBinary() + _ = yym1165 if false { - } else if z.HasExtensions() && z.DecExt(yyv1159) { - } else if !yym1160 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1159) + } else if z.HasExtensions() && z.DecExt(yyv1164) { + } else if !yym1165 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1164) } else { - z.DecFallback(yyv1159, false) + z.DecFallback(yyv1164, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9728,13 +9769,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsQps = float32(r.DecodeFloat(true)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9744,13 +9785,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsBurst = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9758,73 +9799,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1163 := &x.NodeMonitorGracePeriod - yym1164 := z.DecBinary() - _ = yym1164 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1163) { - } else if !yym1164 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1163) - } else { - z.DecFallback(yyv1163, false) - } - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.RegisterRetryCount = 0 - } else { - x.RegisterRetryCount = int32(r.DecodeInt(32)) - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} - } else { - yyv1166 := &x.NodeStartupGracePeriod - yym1167 := z.DecBinary() - _ = yym1167 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1166) { - } else if !yym1167 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1166) - } else { - z.DecFallback(yyv1166, false) - } - } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l - } else { - yyb1122 = r.CheckBreak() - } - if yyb1122 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} - } else { - yyv1168 := &x.NodeMonitorPeriod + yyv1168 := &x.NodeMonitorGracePeriod yym1169 := z.DecBinary() _ = yym1169 if false { @@ -9835,13 +9810,79 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1168, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.RegisterRetryCount = 0 + } else { + x.RegisterRetryCount = int32(r.DecodeInt(32)) + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + } else { + yyv1171 := &x.NodeStartupGracePeriod + yym1172 := z.DecBinary() + _ = yym1172 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1171) { + } else if !yym1172 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1171) + } else { + z.DecFallback(yyv1171, false) + } + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + } else { + yyv1173 := &x.NodeMonitorPeriod + yym1174 := z.DecBinary() + _ = yym1174 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1173) { + } else if !yym1174 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1173) + } else { + z.DecFallback(yyv1173, false) + } + } + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l + } else { + yyb1127 = r.CheckBreak() + } + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9851,13 +9892,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceAccountKeyFile = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9867,13 +9908,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningCertFile = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9883,13 +9924,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningKeyFile = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9899,13 +9940,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ApproveAllKubeletCSRsForGroup = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9915,13 +9956,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9931,13 +9972,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterName = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9947,13 +9988,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterCIDR = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9963,13 +10004,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceCIDR = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9979,13 +10020,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeCIDRMaskSize = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9995,13 +10036,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.AllocateNodeCIDRs = bool(r.DecodeBool()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10011,13 +10052,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConfigureCloudRoutes = bool(r.DecodeBool()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10027,13 +10068,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.RootCAFile = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10043,13 +10084,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ContentType = string(r.DecodeString()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10059,13 +10100,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10075,13 +10116,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10089,16 +10130,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1185 := &x.LeaderElection - yyv1185.CodecDecodeSelf(d) + yyv1190 := &x.LeaderElection + yyv1190.CodecDecodeSelf(d) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10106,16 +10147,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1186 := &x.VolumeConfiguration - yyv1186.CodecDecodeSelf(d) + yyv1191 := &x.VolumeConfiguration + yyv1191.CodecDecodeSelf(d) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10123,24 +10164,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1187 := &x.ControllerStartInterval - yym1188 := z.DecBinary() - _ = yym1188 + yyv1192 := &x.ControllerStartInterval + yym1193 := z.DecBinary() + _ = yym1193 if false { - } else if z.HasExtensions() && z.DecExt(yyv1187) { - } else if !yym1188 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1187) + } else if z.HasExtensions() && z.DecExt(yyv1192) { + } else if !yym1193 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1192) } else { - z.DecFallback(yyv1187, false) + z.DecFallback(yyv1192, false) } } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10150,13 +10191,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableGarbageCollector = bool(r.DecodeBool()) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10166,13 +10207,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentGCSyncs = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10182,13 +10223,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10198,13 +10239,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.SecondaryNodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10214,13 +10255,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LargeClusterSizeThreshold = int32(r.DecodeInt(32)) } - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10231,17 +10272,17 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } for { - yyj1122++ - if yyhl1122 { - yyb1122 = yyj1122 > l + yyj1127++ + if yyhl1127 { + yyb1127 = yyj1127 > l } else { - yyb1122 = r.CheckBreak() + yyb1127 = r.CheckBreak() } - if yyb1122 { + if yyb1127 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1122-1, "") + z.DecStructFieldNotFound(yyj1127-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -10253,33 +10294,33 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1195 := z.EncBinary() - _ = yym1195 + yym1200 := z.EncBinary() + _ = yym1200 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1196 := !z.EncBinary() - yy2arr1196 := z.EncBasicHandle().StructToArray - var yyq1196 [4]bool - _, _, _ = yysep1196, yyq1196, yy2arr1196 - const yyr1196 bool = false - var yynn1196 int - if yyr1196 || yy2arr1196 { + yysep1201 := !z.EncBinary() + yy2arr1201 := z.EncBasicHandle().StructToArray + var yyq1201 [4]bool + _, _, _ = yysep1201, yyq1201, yy2arr1201 + const yyr1201 bool = false + var yynn1201 int + if yyr1201 || yy2arr1201 { r.EncodeArrayStart(4) } else { - yynn1196 = 4 - for _, b := range yyq1196 { + yynn1201 = 4 + for _, b := range yyq1201 { if b { - yynn1196++ + yynn1201++ } } - r.EncodeMapStart(yynn1196) - yynn1196 = 0 + r.EncodeMapStart(yynn1201) + yynn1201 = 0 } - if yyr1196 || yy2arr1196 { + if yyr1201 || yy2arr1201 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1198 := z.EncBinary() - _ = yym1198 + yym1203 := z.EncBinary() + _ = yym1203 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) @@ -10288,17 +10329,17 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableHostPathProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1199 := z.EncBinary() - _ = yym1199 + yym1204 := z.EncBinary() + _ = yym1204 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) } } - if yyr1196 || yy2arr1196 { + if yyr1201 || yy2arr1201 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1201 := z.EncBinary() - _ = yym1201 + yym1206 := z.EncBinary() + _ = yym1206 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) @@ -10307,28 +10348,28 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDynamicProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1202 := z.EncBinary() - _ = yym1202 + yym1207 := z.EncBinary() + _ = yym1207 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) } } - if yyr1196 || yy2arr1196 { + if yyr1201 || yy2arr1201 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1204 := &x.PersistentVolumeRecyclerConfiguration - yy1204.CodecEncodeSelf(e) + yy1209 := &x.PersistentVolumeRecyclerConfiguration + yy1209.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("persitentVolumeRecyclerConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1205 := &x.PersistentVolumeRecyclerConfiguration - yy1205.CodecEncodeSelf(e) + yy1210 := &x.PersistentVolumeRecyclerConfiguration + yy1210.CodecEncodeSelf(e) } - if yyr1196 || yy2arr1196 { + if yyr1201 || yy2arr1201 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1207 := z.EncBinary() - _ = yym1207 + yym1212 := z.EncBinary() + _ = yym1212 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) @@ -10337,14 +10378,14 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("flexVolumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1208 := z.EncBinary() - _ = yym1208 + yym1213 := z.EncBinary() + _ = yym1213 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) } } - if yyr1196 || yy2arr1196 { + if yyr1201 || yy2arr1201 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10357,25 +10398,25 @@ func (x *VolumeConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1209 := z.DecBinary() - _ = yym1209 + yym1214 := z.DecBinary() + _ = yym1214 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1210 := r.ContainerType() - if yyct1210 == codecSelferValueTypeMap1234 { - yyl1210 := r.ReadMapStart() - if yyl1210 == 0 { + yyct1215 := r.ContainerType() + if yyct1215 == codecSelferValueTypeMap1234 { + yyl1215 := r.ReadMapStart() + if yyl1215 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1210, d) + x.codecDecodeSelfFromMap(yyl1215, d) } - } else if yyct1210 == codecSelferValueTypeArray1234 { - yyl1210 := r.ReadArrayStart() - if yyl1210 == 0 { + } else if yyct1215 == codecSelferValueTypeArray1234 { + yyl1215 := r.ReadArrayStart() + if yyl1215 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1210, d) + x.codecDecodeSelfFromArray(yyl1215, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10387,12 +10428,12 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1211Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1211Slc - var yyhl1211 bool = l >= 0 - for yyj1211 := 0; ; yyj1211++ { - if yyhl1211 { - if yyj1211 >= l { + var yys1216Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1216Slc + var yyhl1216 bool = l >= 0 + for yyj1216 := 0; ; yyj1216++ { + if yyhl1216 { + if yyj1216 >= l { break } } else { @@ -10401,10 +10442,10 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1211Slc = r.DecodeBytes(yys1211Slc, true, true) - yys1211 := string(yys1211Slc) + yys1216Slc = r.DecodeBytes(yys1216Slc, true, true) + yys1216 := string(yys1216Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1211 { + switch yys1216 { case "enableHostPathProvisioning": if r.TryDecodeAsNil() { x.EnableHostPathProvisioning = false @@ -10421,8 +10462,8 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1214 := &x.PersistentVolumeRecyclerConfiguration - yyv1214.CodecDecodeSelf(d) + yyv1219 := &x.PersistentVolumeRecyclerConfiguration + yyv1219.CodecDecodeSelf(d) } case "flexVolumePluginDir": if r.TryDecodeAsNil() { @@ -10431,9 +10472,9 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.FlexVolumePluginDir = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys1211) - } // end switch yys1211 - } // end for yyj1211 + z.DecStructFieldNotFound(-1, yys1216) + } // end switch yys1216 + } // end for yyj1216 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10441,16 +10482,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1216 int - var yyb1216 bool - var yyhl1216 bool = l >= 0 - yyj1216++ - if yyhl1216 { - yyb1216 = yyj1216 > l + var yyj1221 int + var yyb1221 bool + var yyhl1221 bool = l >= 0 + yyj1221++ + if yyhl1221 { + yyb1221 = yyj1221 > l } else { - yyb1216 = r.CheckBreak() + yyb1221 = r.CheckBreak() } - if yyb1216 { + if yyb1221 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10460,13 +10501,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableHostPathProvisioning = bool(r.DecodeBool()) } - yyj1216++ - if yyhl1216 { - yyb1216 = yyj1216 > l + yyj1221++ + if yyhl1221 { + yyb1221 = yyj1221 > l } else { - yyb1216 = r.CheckBreak() + yyb1221 = r.CheckBreak() } - if yyb1216 { + if yyb1221 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10476,13 +10517,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableDynamicProvisioning = bool(r.DecodeBool()) } - yyj1216++ - if yyhl1216 { - yyb1216 = yyj1216 > l + yyj1221++ + if yyhl1221 { + yyb1221 = yyj1221 > l } else { - yyb1216 = r.CheckBreak() + yyb1221 = r.CheckBreak() } - if yyb1216 { + if yyb1221 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10490,16 +10531,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1219 := &x.PersistentVolumeRecyclerConfiguration - yyv1219.CodecDecodeSelf(d) + yyv1224 := &x.PersistentVolumeRecyclerConfiguration + yyv1224.CodecDecodeSelf(d) } - yyj1216++ - if yyhl1216 { - yyb1216 = yyj1216 > l + yyj1221++ + if yyhl1221 { + yyb1221 = yyj1221 > l } else { - yyb1216 = r.CheckBreak() + yyb1221 = r.CheckBreak() } - if yyb1216 { + if yyb1221 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10510,17 +10551,17 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.FlexVolumePluginDir = string(r.DecodeString()) } for { - yyj1216++ - if yyhl1216 { - yyb1216 = yyj1216 > l + yyj1221++ + if yyhl1221 { + yyb1221 = yyj1221 > l } else { - yyb1216 = r.CheckBreak() + yyb1221 = r.CheckBreak() } - if yyb1216 { + if yyb1221 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1216-1, "") + z.DecStructFieldNotFound(yyj1221-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -10532,33 +10573,33 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc if x == nil { r.EncodeNil() } else { - yym1221 := z.EncBinary() - _ = yym1221 + yym1226 := z.EncBinary() + _ = yym1226 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1222 := !z.EncBinary() - yy2arr1222 := z.EncBasicHandle().StructToArray - var yyq1222 [7]bool - _, _, _ = yysep1222, yyq1222, yy2arr1222 - const yyr1222 bool = false - var yynn1222 int - if yyr1222 || yy2arr1222 { + yysep1227 := !z.EncBinary() + yy2arr1227 := z.EncBasicHandle().StructToArray + var yyq1227 [7]bool + _, _, _ = yysep1227, yyq1227, yy2arr1227 + const yyr1227 bool = false + var yynn1227 int + if yyr1227 || yy2arr1227 { r.EncodeArrayStart(7) } else { - yynn1222 = 7 - for _, b := range yyq1222 { + yynn1227 = 7 + for _, b := range yyq1227 { if b { - yynn1222++ + yynn1227++ } } - r.EncodeMapStart(yynn1222) - yynn1222 = 0 + r.EncodeMapStart(yynn1227) + yynn1227 = 0 } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1224 := z.EncBinary() - _ = yym1224 + yym1229 := z.EncBinary() + _ = yym1229 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) @@ -10567,17 +10608,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maximumRetry")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1225 := z.EncBinary() - _ = yym1225 + yym1230 := z.EncBinary() + _ = yym1230 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1227 := z.EncBinary() - _ = yym1227 + yym1232 := z.EncBinary() + _ = yym1232 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) @@ -10586,17 +10627,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1228 := z.EncBinary() - _ = yym1228 + yym1233 := z.EncBinary() + _ = yym1233 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1230 := z.EncBinary() - _ = yym1230 + yym1235 := z.EncBinary() + _ = yym1235 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) @@ -10605,17 +10646,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1231 := z.EncBinary() - _ = yym1231 + yym1236 := z.EncBinary() + _ = yym1236 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1233 := z.EncBinary() - _ = yym1233 + yym1238 := z.EncBinary() + _ = yym1238 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) @@ -10624,17 +10665,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1234 := z.EncBinary() - _ = yym1234 + yym1239 := z.EncBinary() + _ = yym1239 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1236 := z.EncBinary() - _ = yym1236 + yym1241 := z.EncBinary() + _ = yym1241 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) @@ -10643,17 +10684,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1237 := z.EncBinary() - _ = yym1237 + yym1242 := z.EncBinary() + _ = yym1242 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1239 := z.EncBinary() - _ = yym1239 + yym1244 := z.EncBinary() + _ = yym1244 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) @@ -10662,17 +10703,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1240 := z.EncBinary() - _ = yym1240 + yym1245 := z.EncBinary() + _ = yym1245 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1242 := z.EncBinary() - _ = yym1242 + yym1247 := z.EncBinary() + _ = yym1247 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) @@ -10681,14 +10722,14 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1243 := z.EncBinary() - _ = yym1243 + yym1248 := z.EncBinary() + _ = yym1248 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) } } - if yyr1222 || yy2arr1222 { + if yyr1227 || yy2arr1227 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10701,25 +10742,25 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecDecodeSelf(d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1244 := z.DecBinary() - _ = yym1244 + yym1249 := z.DecBinary() + _ = yym1249 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1245 := r.ContainerType() - if yyct1245 == codecSelferValueTypeMap1234 { - yyl1245 := r.ReadMapStart() - if yyl1245 == 0 { + yyct1250 := r.ContainerType() + if yyct1250 == codecSelferValueTypeMap1234 { + yyl1250 := r.ReadMapStart() + if yyl1250 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1245, d) + x.codecDecodeSelfFromMap(yyl1250, d) } - } else if yyct1245 == codecSelferValueTypeArray1234 { - yyl1245 := r.ReadArrayStart() - if yyl1245 == 0 { + } else if yyct1250 == codecSelferValueTypeArray1234 { + yyl1250 := r.ReadArrayStart() + if yyl1250 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1245, d) + x.codecDecodeSelfFromArray(yyl1250, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10731,12 +10772,12 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1246Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1246Slc - var yyhl1246 bool = l >= 0 - for yyj1246 := 0; ; yyj1246++ { - if yyhl1246 { - if yyj1246 >= l { + var yys1251Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1251Slc + var yyhl1251 bool = l >= 0 + for yyj1251 := 0; ; yyj1251++ { + if yyhl1251 { + if yyj1251 >= l { break } } else { @@ -10745,10 +10786,10 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1246Slc = r.DecodeBytes(yys1246Slc, true, true) - yys1246 := string(yys1246Slc) + yys1251Slc = r.DecodeBytes(yys1251Slc, true, true) + yys1251 := string(yys1251Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1246 { + switch yys1251 { case "maximumRetry": if r.TryDecodeAsNil() { x.MaximumRetry = 0 @@ -10792,9 +10833,9 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } default: - z.DecStructFieldNotFound(-1, yys1246) - } // end switch yys1246 - } // end for yyj1246 + z.DecStructFieldNotFound(-1, yys1251) + } // end switch yys1251 + } // end for yyj1251 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10802,16 +10843,16 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1254 int - var yyb1254 bool - var yyhl1254 bool = l >= 0 - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + var yyj1259 int + var yyb1259 bool + var yyhl1259 bool = l >= 0 + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10821,13 +10862,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MaximumRetry = int32(r.DecodeInt(32)) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10837,13 +10878,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10853,13 +10894,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathNFS = string(r.DecodeString()) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10869,13 +10910,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.IncrementTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10885,13 +10926,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathHostPath = string(r.DecodeString()) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10901,13 +10942,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutHostPath = int32(r.DecodeInt(32)) } - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10918,17 +10959,17 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } for { - yyj1254++ - if yyhl1254 { - yyb1254 = yyj1254 > l + yyj1259++ + if yyhl1259 { + yyb1259 = yyj1259 > l } else { - yyb1254 = r.CheckBreak() + yyb1259 = r.CheckBreak() } - if yyb1254 { + if yyb1259 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1254-1, "") + z.DecStructFieldNotFound(yyj1259-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -10938,20 +10979,20 @@ func (x codecSelfer1234) encconfig_ConfigurationMap(v pkg2_config.ConfigurationM z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk1262, yyv1262 := range v { + for yyk1267, yyv1267 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym1263 := z.EncBinary() - _ = yym1263 + yym1268 := z.EncBinary() + _ = yym1268 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk1262)) + r.EncodeString(codecSelferC_UTF81234, string(yyk1267)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1264 := z.EncBinary() - _ = yym1264 + yym1269 := z.EncBinary() + _ = yym1269 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyv1262)) + r.EncodeString(codecSelferC_UTF81234, string(yyv1267)) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10962,63 +11003,63 @@ func (x codecSelfer1234) decconfig_ConfigurationMap(v *pkg2_config.Configuration z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1265 := *v - yyl1265 := r.ReadMapStart() - yybh1265 := z.DecBasicHandle() - if yyv1265 == nil { - yyrl1265, _ := z.DecInferLen(yyl1265, yybh1265.MaxInitLen, 32) - yyv1265 = make(map[string]string, yyrl1265) - *v = yyv1265 + yyv1270 := *v + yyl1270 := r.ReadMapStart() + yybh1270 := z.DecBasicHandle() + if yyv1270 == nil { + yyrl1270, _ := z.DecInferLen(yyl1270, yybh1270.MaxInitLen, 32) + yyv1270 = make(map[string]string, yyrl1270) + *v = yyv1270 } - var yymk1265 string - var yymv1265 string - var yymg1265 bool - if yybh1265.MapValueReset { + var yymk1270 string + var yymv1270 string + var yymg1270 bool + if yybh1270.MapValueReset { } - if yyl1265 > 0 { - for yyj1265 := 0; yyj1265 < yyl1265; yyj1265++ { + if yyl1270 > 0 { + for yyj1270 := 0; yyj1270 < yyl1270; yyj1270++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1265 = "" + yymk1270 = "" } else { - yymk1265 = string(r.DecodeString()) + yymk1270 = string(r.DecodeString()) } - if yymg1265 { - yymv1265 = yyv1265[yymk1265] + if yymg1270 { + yymv1270 = yyv1270[yymk1270] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1265 = "" + yymv1270 = "" } else { - yymv1265 = string(r.DecodeString()) + yymv1270 = string(r.DecodeString()) } - if yyv1265 != nil { - yyv1265[yymk1265] = yymv1265 + if yyv1270 != nil { + yyv1270[yymk1270] = yymv1270 } } - } else if yyl1265 < 0 { - for yyj1265 := 0; !r.CheckBreak(); yyj1265++ { + } else if yyl1270 < 0 { + for yyj1270 := 0; !r.CheckBreak(); yyj1270++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1265 = "" + yymk1270 = "" } else { - yymk1265 = string(r.DecodeString()) + yymk1270 = string(r.DecodeString()) } - if yymg1265 { - yymv1265 = yyv1265[yymk1265] + if yymg1270 { + yymv1270 = yyv1270[yymk1270] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1265 = "" + yymv1270 = "" } else { - yymv1265 = string(r.DecodeString()) + yymv1270 = string(r.DecodeString()) } - if yyv1265 != nil { - yyv1265[yymk1265] = yymv1265 + if yyv1270 != nil { + yyv1270[yymk1270] = yymv1270 } } } // else len==0: TODO: Should we clear map entries? diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go index 09197df740..397802c6cf 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go @@ -66,12 +66,14 @@ type KubeProxyConfiguration struct { // Must be greater than 0. Only applicable for proxyMode=userspace. UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to - // leave as-is). This takes precedence over conntrackMaxPerCore. + // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` // conntrackMaxPerCore is the maximum number of NAT connections to track - // per CPU core (0 to leave as-is). This value is only considered if - // conntrackMax == 0. + // per CPU core (0 to leave the limit as-is and ignore conntrackMin). ConntrackMaxPerCore int32 `json:"conntrackMaxPerCore"` + // conntrackMin is the minimum value of connect-tracking records to allocate, + // regardless of conntrackMaxPerCore (set conntrackMaxPerCore=0 to leave the limit as-is). + ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open // (e.g. '250ms', '2s'). Must be greater than 0. ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go index 72736b2225..070ad978b0 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -89,6 +89,9 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { if obj.ConntrackMaxPerCore == 0 { obj.ConntrackMaxPerCore = 32 * 1024 } + if obj.ConntrackMin == 0 { + obj.ConntrackMin = 128 * 1024 + } } if obj.IPTablesMasqueradeBit == nil { temp := int32(14) diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go index 1a34a0058b..3fe0941b25 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go @@ -63,12 +63,14 @@ type KubeProxyConfiguration struct { // Must be greater than 0. Only applicable for proxyMode=userspace. UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to - // leave as-is). This takes precedence over conntrackMaxPerCore. + // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` // conntrackMaxPerCore is the maximum number of NAT connections to track - // per CPU core (0 to leave as-is). This value is only considered if - // conntrackMax == 0. + // per CPU core (0 to leave the limit as-is and ignore conntrackMin). ConntrackMaxPerCore int32 `json:"conntrackMaxPerCore"` + // conntrackMin is the minimum value of connect-tracking records to allocate, + // regardless of conntrackMaxPerCore (set conntrackMaxPerCore=0 to leave the limit as-is). + ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open // (e.g. '250ms', '2s'). Must be greater than 0. ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go index c540752003..bd60ba5e82 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go @@ -69,6 +69,7 @@ func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyCon out.UDPIdleTimeout = in.UDPIdleTimeout out.ConntrackMax = in.ConntrackMax out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout return nil } @@ -98,6 +99,7 @@ func autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyCon out.UDPIdleTimeout = in.UDPIdleTimeout out.ConntrackMax = in.ConntrackMax out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go index abc4cfc4a6..58380d4866 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go @@ -75,6 +75,7 @@ func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c out.UDPIdleTimeout = in.UDPIdleTimeout out.ConntrackMax = in.ConntrackMax out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/zz_generated.deepcopy.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/zz_generated.deepcopy.go index b6ceb626c8..1ebaeaa1ed 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -162,6 +162,7 @@ func DeepCopy_componentconfig_KubeProxyConfiguration(in interface{}, out interfa out.UDPIdleTimeout = in.UDPIdleTimeout out.ConntrackMax = in.ConntrackMax out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit.go b/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit.go index b2859014bc..63803d2203 100644 --- a/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit.go +++ b/vendor/k8s.io/kubernetes/pkg/apiserver/audit/audit.go @@ -24,6 +24,7 @@ import ( "net/http" "time" + "github.com/golang/glog" "github.com/pborman/uuid" "k8s.io/kubernetes/pkg/apiserver" @@ -39,7 +40,11 @@ type auditResponseWriter struct { } func (a *auditResponseWriter) WriteHeader(code int) { - fmt.Fprintf(a.out, "%s AUDIT: id=%q response=\"%d\"\n", time.Now().Format(time.RFC3339Nano), a.id, code) + line := fmt.Sprintf("%s AUDIT: id=%q response=\"%d\"\n", time.Now().Format(time.RFC3339Nano), a.id, code) + if _, err := fmt.Fprint(a.out, line); err != nil { + glog.Errorf("Unable to write audit log: %s, the error is: %v", line, err) + } + a.ResponseWriter.WriteHeader(code) } @@ -92,8 +97,11 @@ func WithAudit(handler http.Handler, attributeGetter apiserver.RequestAttributeG } id := uuid.NewRandom().String() - fmt.Fprintf(out, "%s AUDIT: id=%q ip=%q method=%q user=%q as=%q namespace=%q uri=%q\n", + line := fmt.Sprintf("%s AUDIT: id=%q ip=%q method=%q user=%q as=%q namespace=%q uri=%q\n", time.Now().Format(time.RFC3339Nano), id, utilnet.GetClientIP(req), req.Method, attribs.GetUser().GetName(), asuser, namespace, req.URL) + if _, err := fmt.Fprint(out, line); err != nil { + glog.Errorf("Unable to write audit log: %s, the error is: %v", line, err) + } respWriter := decorateResponseWriter(w, out, id) handler.ServeHTTP(respWriter, req) }) diff --git a/vendor/k8s.io/kubernetes/pkg/auth/handlers/handlers.go b/vendor/k8s.io/kubernetes/pkg/auth/handlers/handlers.go index 0f6e226e9c..20fced2c0d 100644 --- a/vendor/k8s.io/kubernetes/pkg/auth/handlers/handlers.go +++ b/vendor/k8s.io/kubernetes/pkg/auth/handlers/handlers.go @@ -43,7 +43,8 @@ func init() { // NewRequestAuthenticator creates an http handler that tries to authenticate the given request as a user, and then // stores any such user found onto the provided context for the request. If authentication fails or returns an error -// the failed handler is used. On success, handler is invoked to serve the request. +// the failed handler is used. On success, "Authorization" header is removed from the request and handler +// is invoked to serve the request. func NewRequestAuthenticator(mapper api.RequestContextMapper, auth authenticator.Request, failed http.Handler, handler http.Handler) (http.Handler, error) { return api.NewRequestContextFilter( mapper, @@ -57,6 +58,9 @@ func NewRequestAuthenticator(mapper api.RequestContextMapper, auth authenticator return } + // authorization header is not required anymore in case of a successful authentication. + req.Header.Del("Authorization") + if ctx, ok := mapper.Get(req); ok { mapper.Update(req, api.WithUser(ctx, user)) } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/controller.go b/vendor/k8s.io/kubernetes/pkg/client/cache/controller.go similarity index 83% rename from vendor/k8s.io/kubernetes/pkg/controller/framework/controller.go rename to vendor/k8s.io/kubernetes/pkg/client/cache/controller.go index 8cbd124a36..59fd52051e 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/controller.go +++ b/vendor/k8s.io/kubernetes/pkg/client/cache/controller.go @@ -14,13 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package framework +package cache import ( "sync" "time" - "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/runtime" utilruntime "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" @@ -28,13 +27,13 @@ import ( // Config contains all the settings for a Controller. type Config struct { - // The queue for your objects; either a cache.FIFO or - // a cache.DeltaFIFO. Your Process() function should accept + // The queue for your objects; either a FIFO or + // a DeltaFIFO. Your Process() function should accept // the output of this Oueue's Pop() method. - cache.Queue + Queue // Something that can list and watch your objects. - cache.ListerWatcher + ListerWatcher // Something that can process your objects. Process ProcessFunc @@ -45,7 +44,7 @@ type Config struct { // Reprocess everything at least this often. // Note that if it takes longer for you to clear the queue than this // period, you will end up processing items in the order determined - // by cache.FIFO.Replace(). Currently, this is random. If this is a + // by FIFO.Replace(). Currently, this is random. If this is a // problem, we can change that replacement policy to append new // things to the end of the queue instead of replacing the entire // queue. @@ -64,7 +63,7 @@ type ProcessFunc func(obj interface{}) error // Controller is a generic controller framework. type Controller struct { config Config - reflector *cache.Reflector + reflector *Reflector reflectorMutex sync.RWMutex } @@ -87,7 +86,7 @@ func New(c *Config) *Controller { // Run blocks; call via go. func (c *Controller) Run(stopCh <-chan struct{}) { defer utilruntime.HandleCrash() - r := cache.NewReflector( + r := NewReflector( c.config.ListerWatcher, c.config.ObjectType, c.config.Queue, @@ -110,9 +109,9 @@ func (c *Controller) HasSynced() bool { // Requeue adds the provided object back into the queue if it does not already exist. func (c *Controller) Requeue(obj interface{}) error { - return c.config.Queue.AddIfNotPresent(cache.Deltas{ - cache.Delta{ - Type: cache.Sync, + return c.config.Queue.AddIfNotPresent(Deltas{ + Delta{ + Type: Sync, Object: obj, }, }) @@ -124,7 +123,7 @@ func (c *Controller) Requeue(obj interface{}) error { // concurrently. func (c *Controller) processLoop() { for { - obj, err := c.config.Queue.Pop(cache.PopProcessFunc(c.config.Process)) + obj, err := c.config.Queue.Pop(PopProcessFunc(c.config.Process)) if err != nil { if c.config.RetryOnError { // This is the safe way to re-enqueue. @@ -145,7 +144,7 @@ func (c *Controller) processLoop() { // get called even if nothing changed. This is useful for periodically // evaluating or syncing something. // * OnDelete will get the final state of the item if it is known, otherwise -// it will get an object of type cache.DeletedFinalStateUnknown. This can +// it will get an object of type DeletedFinalStateUnknown. This can // happen if the watch is closed and misses the delete event and we don't // notice the deletion until the subsequent re-list. type ResourceEventHandler interface { @@ -185,18 +184,18 @@ func (r ResourceEventHandlerFuncs) OnDelete(obj interface{}) { } // DeletionHandlingMetaNamespaceKeyFunc checks for -// cache.DeletedFinalStateUnknown objects before calling -// cache.MetaNamespaceKeyFunc. +// DeletedFinalStateUnknown objects before calling +// MetaNamespaceKeyFunc. func DeletionHandlingMetaNamespaceKeyFunc(obj interface{}) (string, error) { - if d, ok := obj.(cache.DeletedFinalStateUnknown); ok { + if d, ok := obj.(DeletedFinalStateUnknown); ok { return d.Key, nil } - return cache.MetaNamespaceKeyFunc(obj) + return MetaNamespaceKeyFunc(obj) } -// NewInformer returns a cache.Store and a controller for populating the store +// NewInformer returns a Store and a controller for populating the store // while also providing event notifications. You should only used the returned -// cache.Store for Get/List operations; Add/Modify/Deletes will cause the event +// Store for Get/List operations; Add/Modify/Deletes will cause the event // notifications to be faulty. // // Parameters: @@ -210,18 +209,18 @@ func DeletionHandlingMetaNamespaceKeyFunc(obj interface{}) (string, error) { // * h is the object you want notifications sent to. // func NewInformer( - lw cache.ListerWatcher, + lw ListerWatcher, objType runtime.Object, resyncPeriod time.Duration, h ResourceEventHandler, -) (cache.Store, *Controller) { +) (Store, *Controller) { // This will hold the client state, as we know it. - clientState := cache.NewStore(DeletionHandlingMetaNamespaceKeyFunc) + clientState := NewStore(DeletionHandlingMetaNamespaceKeyFunc) // This will hold incoming changes. Note how we pass clientState in as a // KeyLister, that way resync operations will result in the correct set // of update/delete deltas. - fifo := cache.NewDeltaFIFO(cache.MetaNamespaceKeyFunc, nil, clientState) + fifo := NewDeltaFIFO(MetaNamespaceKeyFunc, nil, clientState) cfg := &Config{ Queue: fifo, @@ -232,9 +231,9 @@ func NewInformer( Process: func(obj interface{}) error { // from oldest to newest - for _, d := range obj.(cache.Deltas) { + for _, d := range obj.(Deltas) { switch d.Type { - case cache.Sync, cache.Added, cache.Updated: + case Sync, Added, Updated: if old, exists, err := clientState.Get(d.Object); err == nil && exists { if err := clientState.Update(d.Object); err != nil { return err @@ -246,7 +245,7 @@ func NewInformer( } h.OnAdd(d.Object) } - case cache.Deleted: + case Deleted: if err := clientState.Delete(d.Object); err != nil { return err } @@ -259,9 +258,9 @@ func NewInformer( return clientState, New(cfg) } -// NewIndexerInformer returns a cache.Indexer and a controller for populating the index +// NewIndexerInformer returns a Indexer and a controller for populating the index // while also providing event notifications. You should only used the returned -// cache.Index for Get/List operations; Add/Modify/Deletes will cause the event +// Index for Get/List operations; Add/Modify/Deletes will cause the event // notifications to be faulty. // // Parameters: @@ -275,19 +274,19 @@ func NewInformer( // * h is the object you want notifications sent to. // func NewIndexerInformer( - lw cache.ListerWatcher, + lw ListerWatcher, objType runtime.Object, resyncPeriod time.Duration, h ResourceEventHandler, - indexers cache.Indexers, -) (cache.Indexer, *Controller) { + indexers Indexers, +) (Indexer, *Controller) { // This will hold the client state, as we know it. - clientState := cache.NewIndexer(DeletionHandlingMetaNamespaceKeyFunc, indexers) + clientState := NewIndexer(DeletionHandlingMetaNamespaceKeyFunc, indexers) // This will hold incoming changes. Note how we pass clientState in as a // KeyLister, that way resync operations will result in the correct set // of update/delete deltas. - fifo := cache.NewDeltaFIFO(cache.MetaNamespaceKeyFunc, nil, clientState) + fifo := NewDeltaFIFO(MetaNamespaceKeyFunc, nil, clientState) cfg := &Config{ Queue: fifo, @@ -298,9 +297,9 @@ func NewIndexerInformer( Process: func(obj interface{}) error { // from oldest to newest - for _, d := range obj.(cache.Deltas) { + for _, d := range obj.(Deltas) { switch d.Type { - case cache.Sync, cache.Added, cache.Updated: + case Sync, Added, Updated: if old, exists, err := clientState.Get(d.Object); err == nil && exists { if err := clientState.Update(d.Object); err != nil { return err @@ -312,7 +311,7 @@ func NewIndexerInformer( } h.OnAdd(d.Object) } - case cache.Deleted: + case Deleted: if err := clientState.Delete(d.Object); err != nil { return err } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/shared_informer.go b/vendor/k8s.io/kubernetes/pkg/client/cache/shared_informer.go similarity index 90% rename from vendor/k8s.io/kubernetes/pkg/controller/framework/shared_informer.go rename to vendor/k8s.io/kubernetes/pkg/client/cache/shared_informer.go index 87dcac6d22..510a96900e 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/shared_informer.go +++ b/vendor/k8s.io/kubernetes/pkg/client/cache/shared_informer.go @@ -14,14 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package framework +package cache import ( "fmt" "sync" "time" - "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/runtime" utilruntime "k8s.io/kubernetes/pkg/util/runtime" ) @@ -39,7 +38,7 @@ type SharedInformer interface { // You may NOT add a handler *after* the SharedInformer is running. That will result in an error being returned. // TODO we should try to remove this restriction eventually. AddEventHandler(handler ResourceEventHandler) error - GetStore() cache.Store + GetStore() Store // GetController gives back a synthetic interface that "votes" to start the informer GetController() ControllerInterface Run(stopCh <-chan struct{}) @@ -50,24 +49,24 @@ type SharedInformer interface { type SharedIndexInformer interface { SharedInformer // AddIndexers add indexers to the informer before it starts. - AddIndexers(indexers cache.Indexers) error - GetIndexer() cache.Indexer + AddIndexers(indexers Indexers) error + GetIndexer() Indexer } // NewSharedInformer creates a new instance for the listwatcher. // TODO: create a cache/factory of these at a higher level for the list all, watch all of a given resource that can // be shared amongst all consumers. -func NewSharedInformer(lw cache.ListerWatcher, objType runtime.Object, resyncPeriod time.Duration) SharedInformer { - return NewSharedIndexInformer(lw, objType, resyncPeriod, cache.Indexers{}) +func NewSharedInformer(lw ListerWatcher, objType runtime.Object, resyncPeriod time.Duration) SharedInformer { + return NewSharedIndexInformer(lw, objType, resyncPeriod, Indexers{}) } // NewSharedIndexInformer creates a new instance for the listwatcher. // TODO: create a cache/factory of these at a higher level for the list all, watch all of a given resource that can // be shared amongst all consumers. -func NewSharedIndexInformer(lw cache.ListerWatcher, objType runtime.Object, resyncPeriod time.Duration, indexers cache.Indexers) SharedIndexInformer { +func NewSharedIndexInformer(lw ListerWatcher, objType runtime.Object, resyncPeriod time.Duration, indexers Indexers) SharedIndexInformer { sharedIndexInformer := &sharedIndexInformer{ processor: &sharedProcessor{}, - indexer: cache.NewIndexer(DeletionHandlingMetaNamespaceKeyFunc, indexers), + indexer: NewIndexer(DeletionHandlingMetaNamespaceKeyFunc, indexers), listerWatcher: lw, objectType: objType, fullResyncPeriod: resyncPeriod, @@ -76,13 +75,13 @@ func NewSharedIndexInformer(lw cache.ListerWatcher, objType runtime.Object, resy } type sharedIndexInformer struct { - indexer cache.Indexer + indexer Indexer controller *Controller processor *sharedProcessor // This block is tracked to handle late initialization of the controller - listerWatcher cache.ListerWatcher + listerWatcher ListerWatcher objectType runtime.Object fullResyncPeriod time.Duration @@ -129,7 +128,7 @@ type deleteNotification struct { func (s *sharedIndexInformer) Run(stopCh <-chan struct{}) { defer utilruntime.HandleCrash() - fifo := cache.NewDeltaFIFO(cache.MetaNamespaceKeyFunc, nil, s.indexer) + fifo := NewDeltaFIFO(MetaNamespaceKeyFunc, nil, s.indexer) cfg := &Config{ Queue: fifo, @@ -180,15 +179,15 @@ func (s *sharedIndexInformer) LastSyncResourceVersion() string { return s.controller.reflector.LastSyncResourceVersion() } -func (s *sharedIndexInformer) GetStore() cache.Store { +func (s *sharedIndexInformer) GetStore() Store { return s.indexer } -func (s *sharedIndexInformer) GetIndexer() cache.Indexer { +func (s *sharedIndexInformer) GetIndexer() Indexer { return s.indexer } -func (s *sharedIndexInformer) AddIndexers(indexers cache.Indexers) error { +func (s *sharedIndexInformer) AddIndexers(indexers Indexers) error { s.startedLock.Lock() defer s.startedLock.Unlock() @@ -240,9 +239,9 @@ func (s *sharedIndexInformer) HandleDeltas(obj interface{}) error { defer s.blockDeltas.Unlock() // from oldest to newest - for _, d := range obj.(cache.Deltas) { + for _, d := range obj.(Deltas) { switch d.Type { - case cache.Sync, cache.Added, cache.Updated: + case Sync, Added, Updated: if old, exists, err := s.indexer.Get(d.Object); err == nil && exists { if err := s.indexer.Update(d.Object); err != nil { return err @@ -254,7 +253,7 @@ func (s *sharedIndexInformer) HandleDeltas(obj interface{}) error { } s.processor.distribute(addNotification{newObj: d.Object}) } - case cache.Deleted: + case Deleted: if err := s.indexer.Delete(d.Object); err != nil { return err } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/certificates/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/certificates/controller.go index 430d50e04c..6e3257728f 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/certificates/controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/certificates/controller.go @@ -29,7 +29,6 @@ import ( unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" utilcertificates "k8s.io/kubernetes/pkg/util/certificates" utilruntime "k8s.io/kubernetes/pkg/util/runtime" @@ -47,7 +46,7 @@ type CertificateController struct { kubeClient clientset.Interface // CSR framework and store - csrController *framework.Controller + csrController *cache.Controller csrStore cache.StoreToCertificateRequestLister // To allow injection of updateCertificateRequestStatus for testing. @@ -85,7 +84,7 @@ func NewCertificateController(kubeClient clientset.Interface, syncPeriod time.Du } // Manage the addition/update of certificate requests - cc.csrStore.Store, cc.csrController = framework.NewInformer( + cc.csrStore.Store, cc.csrController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return cc.kubeClient.Certificates().CertificateSigningRequests().List(options) @@ -96,7 +95,7 @@ func NewCertificateController(kubeClient clientset.Interface, syncPeriod time.Du }, &certificates.CertificateSigningRequest{}, syncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { csr := obj.(*certificates.CertificateSigningRequest) glog.V(4).Infof("Adding certificate request %s", csr.Name) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go index 0baa16e71e..d7fbd09a33 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go @@ -31,7 +31,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" @@ -54,7 +53,7 @@ const ( ) var ( - KeyFunc = framework.DeletionHandlingMetaNamespaceKeyFunc + KeyFunc = cache.DeletionHandlingMetaNamespaceKeyFunc ) type ResyncPeriodFunc func() time.Duration @@ -220,6 +219,8 @@ type Expectations interface { // ControlleeExpectations track controllee creates/deletes. type ControlleeExpectations struct { + // Important: Since these two int64 fields are using sync/atomic, they have to be at the top of the struct due to a bug on 32-bit platforms + // See: https://golang.org/pkg/sync/atomic/ for more information add int64 del int64 key string diff --git a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go index 3e1726f80d..e5c6fefa97 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/daemon/daemoncontroller.go @@ -23,8 +23,6 @@ import ( "sync" "time" - "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" @@ -34,8 +32,7 @@ import ( unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -45,6 +42,8 @@ import ( "k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" + + "github.com/golang/glog" ) const ( @@ -75,7 +74,7 @@ type DaemonSetsController struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewDaemonSetsController(passing SharedInformer), this // will be null - internalPodInformer framework.SharedInformer + internalPodInformer cache.SharedInformer // An dsc is temporarily suspended after creating/deleting these many replicas. // It resumes normal action after observing the watch events for them. @@ -92,11 +91,11 @@ type DaemonSetsController struct { // A store of nodes nodeStore cache.StoreToNodeLister // Watches changes to all daemon sets. - dsController *framework.Controller + dsController *cache.Controller // Watches changes to all pods - podController framework.ControllerInterface + podController cache.ControllerInterface // Watches changes to all nodes. - nodeController *framework.Controller + nodeController *cache.Controller // podStoreSynced returns true if the pod store has been synced at least once. // Added as a member to the struct to allow injection for testing. podStoreSynced func() bool @@ -107,7 +106,7 @@ type DaemonSetsController struct { queue *workqueue.Type } -func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, lookupCacheSize int) *DaemonSetsController { +func NewDaemonSetsController(podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, lookupCacheSize int) *DaemonSetsController { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) // TODO: remove the wrapper when every clients have moved to use the clientset. @@ -128,7 +127,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie queue: workqueue.NewNamed("daemonset"), } // Manage addition/update of daemon sets. - dsc.dsStore.Store, dsc.dsController = framework.NewInformer( + dsc.dsStore.Store, dsc.dsController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(options) @@ -140,7 +139,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie &extensions.DaemonSet{}, // TODO: Can we have much longer period here? FullDaemonSetResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { ds := obj.(*extensions.DaemonSet) glog.V(4).Infof("Adding daemon set %s", ds.Name) @@ -173,7 +172,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie // Watch for creation/deletion of pods. The reason we watch is that we don't want a daemon set to create/delete // more pods until all the effects (expectations) of a daemon set's create/delete have been observed. - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: dsc.addPod, UpdateFunc: dsc.updatePod, DeleteFunc: dsc.deletePod, @@ -183,7 +182,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie dsc.podStoreSynced = podInformer.HasSynced // Watch for new nodes or updates to nodes - daemon pods are launched on new nodes, and possibly when labels on nodes change, - dsc.nodeStore.Store, dsc.nodeController = framework.NewInformer( + dsc.nodeStore.Store, dsc.nodeController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dsc.kubeClient.Core().Nodes().List(options) @@ -194,7 +193,7 @@ func NewDaemonSetsController(podInformer framework.SharedIndexInformer, kubeClie }, &api.Node{}, resyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: dsc.addNode, UpdateFunc: dsc.updateNode, }, diff --git a/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go index a69a61b7f0..e0ce9728f2 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/deployment/deployment_controller.go @@ -36,7 +36,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -70,15 +69,15 @@ type DeploymentController struct { // A store of deployments, populated by the dController dStore cache.StoreToDeploymentLister // Watches changes to all deployments - dController *framework.Controller + dController *cache.Controller // A store of ReplicaSets, populated by the rsController rsStore cache.StoreToReplicaSetLister // Watches changes to all ReplicaSets - rsController *framework.Controller + rsController *cache.Controller // A store of pods, populated by the podController podStore cache.StoreToPodLister // Watches changes to all pods - podController *framework.Controller + podController *cache.Controller // dStoreSynced returns true if the Deployment store has been synced at least once. // Added as a member to the struct to allow injection for testing. @@ -110,7 +109,7 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "deployment"), } - dc.dStore.Indexer, dc.dController = framework.NewIndexerInformer( + dc.dStore.Indexer, dc.dController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.client.Extensions().Deployments(api.NamespaceAll).List(options) @@ -121,7 +120,7 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller }, &extensions.Deployment{}, FullDeploymentResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: dc.addDeploymentNotification, UpdateFunc: dc.updateDeploymentNotification, // This will enter the sync loop and no-op, because the deployment has been deleted from the store. @@ -130,7 +129,7 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) - dc.rsStore.Store, dc.rsController = framework.NewInformer( + dc.rsStore.Store, dc.rsController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.client.Extensions().ReplicaSets(api.NamespaceAll).List(options) @@ -141,14 +140,14 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller }, &extensions.ReplicaSet{}, resyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: dc.addReplicaSet, UpdateFunc: dc.updateReplicaSet, DeleteFunc: dc.deleteReplicaSet, }, ) - dc.podStore.Indexer, dc.podController = framework.NewIndexerInformer( + dc.podStore.Indexer, dc.podController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.client.Core().Pods(api.NamespaceAll).List(options) @@ -159,7 +158,7 @@ func NewDeploymentController(client clientset.Interface, resyncPeriod controller }, &api.Pod{}, resyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: dc.addPod, UpdateFunc: dc.updatePod, DeleteFunc: dc.deletePod, diff --git a/vendor/k8s.io/kubernetes/pkg/controller/disruption/disruption.go b/vendor/k8s.io/kubernetes/pkg/controller/disruption/disruption.go index c8395a2874..9a9caa6084 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/disruption/disruption.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/disruption/disruption.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/intstr" @@ -47,22 +46,22 @@ type DisruptionController struct { kubeClient *client.Client pdbStore cache.Store - pdbController *framework.Controller + pdbController *cache.Controller pdbLister cache.StoreToPodDisruptionBudgetLister - podController framework.ControllerInterface + podController cache.ControllerInterface podLister cache.StoreToPodLister rcIndexer cache.Indexer - rcController *framework.Controller + rcController *cache.Controller rcLister cache.StoreToReplicationControllerLister rsStore cache.Store - rsController *framework.Controller + rsController *cache.Controller rsLister cache.StoreToReplicaSetLister dIndexer cache.Indexer - dController *framework.Controller + dController *cache.Controller dLister cache.StoreToDeploymentLister queue *workqueue.Type @@ -84,7 +83,7 @@ type controllerAndScale struct { // controllers and their scale. type podControllerFinder func(*api.Pod) ([]controllerAndScale, error) -func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClient *client.Client) *DisruptionController { +func NewDisruptionController(podInformer cache.SharedIndexInformer, kubeClient *client.Client) *DisruptionController { dc := &DisruptionController{ kubeClient: kubeClient, podController: podInformer.GetController(), @@ -97,13 +96,13 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie dc.podLister.Indexer = podInformer.GetIndexer() - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: dc.addPod, UpdateFunc: dc.updatePod, DeleteFunc: dc.deletePod, }) - dc.pdbStore, dc.pdbController = framework.NewInformer( + dc.pdbStore, dc.pdbController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.kubeClient.Policy().PodDisruptionBudgets(api.NamespaceAll).List(options) @@ -114,7 +113,7 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie }, &policy.PodDisruptionBudget{}, 30*time.Second, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: dc.addDb, UpdateFunc: dc.updateDb, DeleteFunc: dc.removeDb, @@ -122,7 +121,7 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie ) dc.pdbLister.Store = dc.pdbStore - dc.rcIndexer, dc.rcController = framework.NewIndexerInformer( + dc.rcIndexer, dc.rcController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.kubeClient.ReplicationControllers(api.NamespaceAll).List(options) @@ -133,13 +132,13 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie }, &api.ReplicationController{}, 30*time.Second, - framework.ResourceEventHandlerFuncs{}, + cache.ResourceEventHandlerFuncs{}, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) dc.rcLister.Indexer = dc.rcIndexer - dc.rsStore, dc.rsController = framework.NewInformer( + dc.rsStore, dc.rsController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.kubeClient.Extensions().ReplicaSets(api.NamespaceAll).List(options) @@ -150,12 +149,12 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie }, &extensions.ReplicaSet{}, 30*time.Second, - framework.ResourceEventHandlerFuncs{}, + cache.ResourceEventHandlerFuncs{}, ) dc.rsLister.Store = dc.rsStore - dc.dIndexer, dc.dController = framework.NewIndexerInformer( + dc.dIndexer, dc.dController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return dc.kubeClient.Extensions().Deployments(api.NamespaceAll).List(options) @@ -166,7 +165,7 @@ func NewDisruptionController(podInformer framework.SharedIndexInformer, kubeClie }, &extensions.Deployment{}, 30*time.Second, - framework.ResourceEventHandlerFuncs{}, + cache.ResourceEventHandlerFuncs{}, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go index 9c9f06e7d0..349e57aeea 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/endpoint/endpoints_controller.go @@ -34,8 +34,7 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -66,11 +65,11 @@ const ( ) var ( - keyFunc = framework.DeletionHandlingMetaNamespaceKeyFunc + keyFunc = cache.DeletionHandlingMetaNamespaceKeyFunc ) // NewEndpointController returns a new *EndpointController. -func NewEndpointController(podInformer framework.SharedIndexInformer, client *clientset.Clientset) *EndpointController { +func NewEndpointController(podInformer cache.SharedIndexInformer, client *clientset.Clientset) *EndpointController { if client != nil && client.Core().GetRESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("endpoint_controller", client.Core().GetRESTClient().GetRateLimiter()) } @@ -79,7 +78,7 @@ func NewEndpointController(podInformer framework.SharedIndexInformer, client *cl queue: workqueue.NewNamed("endpoint"), } - e.serviceStore.Store, e.serviceController = framework.NewInformer( + e.serviceStore.Store, e.serviceController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Core().Services(api.NamespaceAll).List(options) @@ -91,7 +90,7 @@ func NewEndpointController(podInformer framework.SharedIndexInformer, client *cl &api.Service{}, // TODO: Can we have much longer period here? FullServiceResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: e.enqueueService, UpdateFunc: func(old, cur interface{}) { e.enqueueService(cur) @@ -100,7 +99,7 @@ func NewEndpointController(podInformer framework.SharedIndexInformer, client *cl }, ) - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: e.addPod, UpdateFunc: e.updatePod, DeleteFunc: e.deletePod, @@ -133,7 +132,7 @@ type EndpointController struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewEndpointController(passing SharedInformer), this // will be null - internalPodInformer framework.SharedIndexInformer + internalPodInformer cache.SharedIndexInformer // Services that need to be updated. A channel is inappropriate here, // because it allows services with lots of pods to be serviced much @@ -144,8 +143,8 @@ type EndpointController struct { // Since we join two objects, we'll watch both of them with // controllers. - serviceController *framework.Controller - podController framework.ControllerInterface + serviceController *cache.Controller + podController cache.ControllerInterface // podStoreSynced returns true if the pod store has been synced at least once. // Added as a member to the struct to allow injection for testing. podStoreSynced func() bool diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/doc.go b/vendor/k8s.io/kubernetes/pkg/controller/framework/doc.go deleted file mode 100644 index feceba36c9..0000000000 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/doc.go +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package framework implements all the grunt work involved in running a simple controller. -package framework diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/fake_controller_source.go b/vendor/k8s.io/kubernetes/pkg/controller/framework/fake_controller_source.go deleted file mode 100644 index ee00c0586e..0000000000 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/fake_controller_source.go +++ /dev/null @@ -1,262 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package framework - -import ( - "errors" - "math/rand" - "strconv" - "sync" - - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/runtime" - "k8s.io/kubernetes/pkg/types" - "k8s.io/kubernetes/pkg/watch" -) - -func NewFakeControllerSource() *FakeControllerSource { - return &FakeControllerSource{ - Items: map[nnu]runtime.Object{}, - Broadcaster: watch.NewBroadcaster(100, watch.WaitIfChannelFull), - } -} - -func NewFakePVControllerSource() *FakePVControllerSource { - return &FakePVControllerSource{ - FakeControllerSource{ - Items: map[nnu]runtime.Object{}, - Broadcaster: watch.NewBroadcaster(100, watch.WaitIfChannelFull), - }} -} - -func NewFakePVCControllerSource() *FakePVCControllerSource { - return &FakePVCControllerSource{ - FakeControllerSource{ - Items: map[nnu]runtime.Object{}, - Broadcaster: watch.NewBroadcaster(100, watch.WaitIfChannelFull), - }} -} - -// FakeControllerSource implements listing/watching for testing. -type FakeControllerSource struct { - lock sync.RWMutex - Items map[nnu]runtime.Object - changes []watch.Event // one change per resourceVersion - Broadcaster *watch.Broadcaster -} - -type FakePVControllerSource struct { - FakeControllerSource -} - -type FakePVCControllerSource struct { - FakeControllerSource -} - -// namespace, name, uid to be used as a key. -type nnu struct { - namespace, name string - uid types.UID -} - -// Add adds an object to the set and sends an add event to watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) Add(obj runtime.Object) { - f.Change(watch.Event{Type: watch.Added, Object: obj}, 1) -} - -// Modify updates an object in the set and sends a modified event to watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) Modify(obj runtime.Object) { - f.Change(watch.Event{Type: watch.Modified, Object: obj}, 1) -} - -// Delete deletes an object from the set and sends a delete event to watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) Delete(lastValue runtime.Object) { - f.Change(watch.Event{Type: watch.Deleted, Object: lastValue}, 1) -} - -// AddDropWatch adds an object to the set but forgets to send an add event to -// watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) AddDropWatch(obj runtime.Object) { - f.Change(watch.Event{Type: watch.Added, Object: obj}, 0) -} - -// ModifyDropWatch updates an object in the set but forgets to send a modify -// event to watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) ModifyDropWatch(obj runtime.Object) { - f.Change(watch.Event{Type: watch.Modified, Object: obj}, 0) -} - -// DeleteDropWatch deletes an object from the set but forgets to send a delete -// event to watchers. -// obj's ResourceVersion is set. -func (f *FakeControllerSource) DeleteDropWatch(lastValue runtime.Object) { - f.Change(watch.Event{Type: watch.Deleted, Object: lastValue}, 0) -} - -func (f *FakeControllerSource) key(accessor meta.Object) nnu { - return nnu{accessor.GetNamespace(), accessor.GetName(), accessor.GetUID()} -} - -// Change records the given event (setting the object's resource version) and -// sends a watch event with the specified probability. -func (f *FakeControllerSource) Change(e watch.Event, watchProbability float64) { - f.lock.Lock() - defer f.lock.Unlock() - - accessor, err := meta.Accessor(e.Object) - if err != nil { - panic(err) // this is test code only - } - - resourceVersion := len(f.changes) + 1 - accessor.SetResourceVersion(strconv.Itoa(resourceVersion)) - f.changes = append(f.changes, e) - key := f.key(accessor) - switch e.Type { - case watch.Added, watch.Modified: - f.Items[key] = e.Object - case watch.Deleted: - delete(f.Items, key) - } - - if rand.Float64() < watchProbability { - f.Broadcaster.Action(e.Type, e.Object) - } -} - -func (f *FakeControllerSource) getListItemsLocked() ([]runtime.Object, error) { - list := make([]runtime.Object, 0, len(f.Items)) - for _, obj := range f.Items { - // Must make a copy to allow clients to modify the object. - // Otherwise, if they make a change and write it back, they - // will inadvertently change our canonical copy (in - // addition to racing with other clients). - objCopy, err := api.Scheme.DeepCopy(obj) - if err != nil { - return nil, err - } - list = append(list, objCopy.(runtime.Object)) - } - return list, nil -} - -// List returns a list object, with its resource version set. -func (f *FakeControllerSource) List(options api.ListOptions) (runtime.Object, error) { - f.lock.RLock() - defer f.lock.RUnlock() - list, err := f.getListItemsLocked() - if err != nil { - return nil, err - } - listObj := &api.List{} - if err := meta.SetList(listObj, list); err != nil { - return nil, err - } - objMeta, err := api.ListMetaFor(listObj) - if err != nil { - return nil, err - } - resourceVersion := len(f.changes) - objMeta.ResourceVersion = strconv.Itoa(resourceVersion) - return listObj, nil -} - -// List returns a list object, with its resource version set. -func (f *FakePVControllerSource) List(options api.ListOptions) (runtime.Object, error) { - f.lock.RLock() - defer f.lock.RUnlock() - list, err := f.FakeControllerSource.getListItemsLocked() - if err != nil { - return nil, err - } - listObj := &api.PersistentVolumeList{} - if err := meta.SetList(listObj, list); err != nil { - return nil, err - } - objMeta, err := api.ListMetaFor(listObj) - if err != nil { - return nil, err - } - resourceVersion := len(f.changes) - objMeta.ResourceVersion = strconv.Itoa(resourceVersion) - return listObj, nil -} - -// List returns a list object, with its resource version set. -func (f *FakePVCControllerSource) List(options api.ListOptions) (runtime.Object, error) { - f.lock.RLock() - defer f.lock.RUnlock() - list, err := f.FakeControllerSource.getListItemsLocked() - if err != nil { - return nil, err - } - listObj := &api.PersistentVolumeClaimList{} - if err := meta.SetList(listObj, list); err != nil { - return nil, err - } - objMeta, err := api.ListMetaFor(listObj) - if err != nil { - return nil, err - } - resourceVersion := len(f.changes) - objMeta.ResourceVersion = strconv.Itoa(resourceVersion) - return listObj, nil -} - -// Watch returns a watch, which will be pre-populated with all changes -// after resourceVersion. -func (f *FakeControllerSource) Watch(options api.ListOptions) (watch.Interface, error) { - f.lock.RLock() - defer f.lock.RUnlock() - rc, err := strconv.Atoi(options.ResourceVersion) - if err != nil { - return nil, err - } - if rc < len(f.changes) { - changes := []watch.Event{} - for _, c := range f.changes[rc:] { - // Must make a copy to allow clients to modify the - // object. Otherwise, if they make a change and write - // it back, they will inadvertently change the our - // canonical copy (in addition to racing with other - // clients). - objCopy, err := api.Scheme.DeepCopy(c.Object) - if err != nil { - return nil, err - } - changes = append(changes, watch.Event{Type: c.Type, Object: objCopy.(runtime.Object)}) - } - return f.Broadcaster.WatchWithPrefix(changes), nil - } else if rc > len(f.changes) { - return nil, errors.New("resource version in the future not supported by this fake") - } - return f.Broadcaster.Watch(), nil -} - -// Shutdown closes the underlying broadcaster, waiting for events to be -// delivered. It's an error to call any method after calling shutdown. This is -// enforced by Shutdown() leaving f locked. -func (f *FakeControllerSource) Shutdown() { - f.lock.Lock() // Purposely no unlock. - f.Broadcaster.Shutdown() -} diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go index 566306e576..6c233bb7ef 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/garbagecollector.go @@ -32,7 +32,6 @@ import ( "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/typed/dynamic" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" @@ -49,7 +48,7 @@ const ResourceResyncTime time.Duration = 0 type monitor struct { store cache.Store - controller *framework.Controller + controller *cache.Controller } type objectReference struct { @@ -488,11 +487,11 @@ func (gc *GarbageCollector) monitorFor(resource unversioned.GroupVersionResource } runtimeObject.GetObjectKind().SetGroupVersionKind(kind) } - monitor.store, monitor.controller = framework.NewInformer( + monitor.store, monitor.controller = cache.NewInformer( gcListWatcher(client, resource), nil, ResourceResyncTime, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ // add the event to the propagator's eventQueue. AddFunc: func(obj interface{}) { setObjectTypeMeta(obj) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/informers/core.go b/vendor/k8s.io/kubernetes/pkg/controller/informers/core.go similarity index 90% rename from vendor/k8s.io/kubernetes/pkg/controller/framework/informers/core.go rename to vendor/k8s.io/kubernetes/pkg/controller/informers/core.go index a4f40b5870..b471427f01 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/informers/core.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/informers/core.go @@ -21,13 +21,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/controller/framework" ) // PodInformer is type of SharedIndexInformer which watches and lists all pods. // Interface provides constructor for informer and lister for pods type PodInformer interface { - Informer() framework.SharedIndexInformer + Informer() cache.SharedIndexInformer Lister() *cache.StoreToPodLister } @@ -37,7 +36,7 @@ type podInformer struct { // Informer checks whether podInformer exists in sharedInformerFactory and if not, it creates new informer of type // podInformer and connects it to sharedInformerFactory -func (f *podInformer) Informer() framework.SharedIndexInformer { +func (f *podInformer) Informer() cache.SharedIndexInformer { f.lock.Lock() defer f.lock.Unlock() @@ -63,7 +62,7 @@ func (f *podInformer) Lister() *cache.StoreToPodLister { // NamespaceInformer is type of SharedIndexInformer which watches and lists all namespaces. // Interface provides constructor for informer and lister for namsespaces type NamespaceInformer interface { - Informer() framework.SharedIndexInformer + Informer() cache.SharedIndexInformer Lister() *cache.IndexerToNamespaceLister } @@ -73,7 +72,7 @@ type namespaceInformer struct { // Informer checks whether namespaceInformer exists in sharedInformerFactory and if not, it creates new informer of type // namespaceInformer and connects it to sharedInformerFactory -func (f *namespaceInformer) Informer() framework.SharedIndexInformer { +func (f *namespaceInformer) Informer() cache.SharedIndexInformer { f.lock.Lock() defer f.lock.Unlock() @@ -99,7 +98,7 @@ func (f *namespaceInformer) Lister() *cache.IndexerToNamespaceLister { // NodeInformer is type of SharedIndexInformer which watches and lists all nodes. // Interface provides constructor for informer and lister for nodes type NodeInformer interface { - Informer() framework.SharedIndexInformer + Informer() cache.SharedIndexInformer Lister() *cache.StoreToNodeLister } @@ -109,7 +108,7 @@ type nodeInformer struct { // Informer checks whether nodeInformer exists in sharedInformerFactory and if not, it creates new informer of type // nodeInformer and connects it to sharedInformerFactory -func (f *nodeInformer) Informer() framework.SharedIndexInformer { +func (f *nodeInformer) Informer() cache.SharedIndexInformer { f.lock.Lock() defer f.lock.Unlock() @@ -135,7 +134,7 @@ func (f *nodeInformer) Lister() *cache.StoreToNodeLister { // PVCInformer is type of SharedIndexInformer which watches and lists all persistent volume claims. // Interface provides constructor for informer and lister for persistent volume claims type PVCInformer interface { - Informer() framework.SharedIndexInformer + Informer() cache.SharedIndexInformer Lister() *cache.StoreToPVCFetcher } @@ -145,7 +144,7 @@ type pvcInformer struct { // Informer checks whether pvcInformer exists in sharedInformerFactory and if not, it creates new informer of type // pvcInformer and connects it to sharedInformerFactory -func (f *pvcInformer) Informer() framework.SharedIndexInformer { +func (f *pvcInformer) Informer() cache.SharedIndexInformer { f.lock.Lock() defer f.lock.Unlock() @@ -171,7 +170,7 @@ func (f *pvcInformer) Lister() *cache.StoreToPVCFetcher { // PVInformer is type of SharedIndexInformer which watches and lists all persistent volumes. // Interface provides constructor for informer and lister for persistent volumes type PVInformer interface { - Informer() framework.SharedIndexInformer + Informer() cache.SharedIndexInformer Lister() *cache.StoreToPVFetcher } @@ -181,7 +180,7 @@ type pvInformer struct { // Informer checks whether pvInformer exists in sharedInformerFactory and if not, it creates new informer of type // pvInformer and connects it to sharedInformerFactory -func (f *pvInformer) Informer() framework.SharedIndexInformer { +func (f *pvInformer) Informer() cache.SharedIndexInformer { f.lock.Lock() defer f.lock.Unlock() diff --git a/vendor/k8s.io/kubernetes/pkg/controller/framework/informers/factory.go b/vendor/k8s.io/kubernetes/pkg/controller/informers/factory.go similarity index 89% rename from vendor/k8s.io/kubernetes/pkg/controller/framework/informers/factory.go rename to vendor/k8s.io/kubernetes/pkg/controller/informers/factory.go index de1a6918db..31329fec68 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/framework/informers/factory.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/informers/factory.go @@ -24,7 +24,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -47,7 +46,7 @@ type sharedInformerFactory struct { lock sync.Mutex defaultResync time.Duration - informers map[reflect.Type]framework.SharedIndexInformer + informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started // this allows calling of Start method multiple times startedInformers map[reflect.Type]bool @@ -58,7 +57,7 @@ func NewSharedInformerFactory(client clientset.Interface, defaultResync time.Dur return &sharedInformerFactory{ client: client, defaultResync: defaultResync, - informers: make(map[reflect.Type]framework.SharedIndexInformer), + informers: make(map[reflect.Type]cache.SharedIndexInformer), startedInformers: make(map[reflect.Type]bool), } } @@ -102,8 +101,8 @@ func (f *sharedInformerFactory) PersistentVolumes() PVInformer { } // NewPodInformer returns a SharedIndexInformer that lists and watches all pods -func NewPodInformer(client clientset.Interface, resyncPeriod time.Duration) framework.SharedIndexInformer { - sharedIndexInformer := framework.NewSharedIndexInformer( +func NewPodInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.Core().Pods(api.NamespaceAll).List(options) @@ -121,8 +120,8 @@ func NewPodInformer(client clientset.Interface, resyncPeriod time.Duration) fram } // NewNodeInformer returns a SharedIndexInformer that lists and watches all nodes -func NewNodeInformer(client clientset.Interface, resyncPeriod time.Duration) framework.SharedIndexInformer { - sharedIndexInformer := framework.NewSharedIndexInformer( +func NewNodeInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.Core().Nodes().List(options) @@ -139,8 +138,8 @@ func NewNodeInformer(client clientset.Interface, resyncPeriod time.Duration) fra } // NewPVCInformer returns a SharedIndexInformer that lists and watches all PVCs -func NewPVCInformer(client clientset.Interface, resyncPeriod time.Duration) framework.SharedIndexInformer { - sharedIndexInformer := framework.NewSharedIndexInformer( +func NewPVCInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.Core().PersistentVolumeClaims(api.NamespaceAll).List(options) @@ -157,8 +156,8 @@ func NewPVCInformer(client clientset.Interface, resyncPeriod time.Duration) fram } // NewPVInformer returns a SharedIndexInformer that lists and watches all PVs -func NewPVInformer(client clientset.Interface, resyncPeriod time.Duration) framework.SharedIndexInformer { - sharedIndexInformer := framework.NewSharedIndexInformer( +func NewPVInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.Core().PersistentVolumes().List(options) @@ -175,8 +174,8 @@ func NewPVInformer(client clientset.Interface, resyncPeriod time.Duration) frame } // NewNamespaceInformer returns a SharedIndexInformer that lists and watches namespaces -func NewNamespaceInformer(client clientset.Interface, resyncPeriod time.Duration) framework.SharedIndexInformer { - sharedIndexInformer := framework.NewSharedIndexInformer( +func NewNamespaceInformer(client clientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return client.Core().Namespaces().List(options) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go index a11f5b24fe..27c6c2179e 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/job/jobcontroller.go @@ -31,8 +31,7 @@ import ( unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" replicationcontroller "k8s.io/kubernetes/pkg/controller/replication" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -51,7 +50,7 @@ type JobController struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewJobController(passing SharedInformer), this // will be null - internalPodInformer framework.SharedInformer + internalPodInformer cache.SharedInformer // To allow injection of updateJobStatus for testing. updateHandler func(job *batch.Job) error @@ -66,7 +65,7 @@ type JobController struct { // A store of job, populated by the jobController jobStore cache.StoreToJobLister // Watches changes to all jobs - jobController *framework.Controller + jobController *cache.Controller // A store of pods, populated by the podController podStore cache.StoreToPodLister @@ -77,7 +76,7 @@ type JobController struct { recorder record.EventRecorder } -func NewJobController(podInformer framework.SharedIndexInformer, kubeClient clientset.Interface) *JobController { +func NewJobController(podInformer cache.SharedIndexInformer, kubeClient clientset.Interface) *JobController { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) // TODO: remove the wrapper when every clients have moved to use the clientset. @@ -98,7 +97,7 @@ func NewJobController(podInformer framework.SharedIndexInformer, kubeClient clie recorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "job-controller"}), } - jm.jobStore.Store, jm.jobController = framework.NewInformer( + jm.jobStore.Store, jm.jobController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return jm.kubeClient.Batch().Jobs(api.NamespaceAll).List(options) @@ -110,7 +109,7 @@ func NewJobController(podInformer framework.SharedIndexInformer, kubeClient clie &batch.Job{}, // TODO: Can we have much longer period here? replicationcontroller.FullControllerResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: jm.enqueueController, UpdateFunc: func(old, cur interface{}) { if job := cur.(*batch.Job); !IsJobFinished(job) { @@ -121,7 +120,7 @@ func NewJobController(podInformer framework.SharedIndexInformer, kubeClient clie }, ) - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: jm.addPod, UpdateFunc: jm.updatePod, DeleteFunc: jm.deletePod, diff --git a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go index 7ecce17048..bf5d3a6def 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go @@ -25,7 +25,6 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" utilruntime "k8s.io/kubernetes/pkg/util/runtime" @@ -45,7 +44,7 @@ type NamespaceController struct { // store that holds the namespaces store cache.Store // controller that observes the namespaces - controller *framework.Controller + controller *cache.Controller // namespaces that have been queued up for processing by workers queue workqueue.RateLimitingInterface // list of preferred group versions and their corresponding resource set for namespace deletion @@ -95,7 +94,7 @@ func NewNamespaceController( } // configure the backing store/controller - store, controller := framework.NewInformer( + store, controller := cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return kubeClient.Core().Namespaces().List(options) @@ -106,7 +105,7 @@ func NewNamespaceController( }, &api.Namespace{}, resyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { namespace := obj.(*api.Namespace) namespaceController.enqueueNamespace(namespace) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go index 5cbdf3dadd..91ff222a6b 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/node/nodecontroller.go @@ -33,8 +33,7 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -136,13 +135,13 @@ type NodeController struct { maximumGracePeriod time.Duration recorder record.EventRecorder // Pod framework and store - podController framework.ControllerInterface + podController cache.ControllerInterface podStore cache.StoreToPodLister // Node framework and store - nodeController *framework.Controller + nodeController *cache.Controller nodeStore cache.StoreToNodeLister // DaemonSet framework and store - daemonSetController *framework.Controller + daemonSetController *cache.Controller daemonSetStore cache.StoreToDaemonSetLister // allocate/recycle CIDRs for node if allocateNodeCIDRs == true cidrAllocator CIDRAllocator @@ -164,7 +163,7 @@ type NodeController struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewDaemonSetsController(passing SharedInformer), this // will be null - internalPodInformer framework.SharedIndexInformer + internalPodInformer cache.SharedIndexInformer } // NewNodeController returns a new node controller to sync instances from cloudprovider. @@ -172,7 +171,7 @@ type NodeController struct { // podCIDRs it has already allocated to nodes. Since we don't allow podCIDR changes // currently, this should be handled as a fatal error. func NewNodeController( - podInformer framework.SharedIndexInformer, + podInformer cache.SharedIndexInformer, cloud cloudprovider.Interface, kubeClient clientset.Interface, podEvictionTimeout time.Duration, @@ -241,16 +240,16 @@ func NewNodeController( nc.enterFullDisruptionFunc = nc.HealthyQPSFunc nc.computeZoneStateFunc = nc.ComputeZoneState - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: nc.maybeDeleteTerminatingPod, UpdateFunc: func(_, obj interface{}) { nc.maybeDeleteTerminatingPod(obj) }, }) nc.podStore.Indexer = podInformer.GetIndexer() nc.podController = podInformer.GetController() - nodeEventHandlerFuncs := framework.ResourceEventHandlerFuncs{} + nodeEventHandlerFuncs := cache.ResourceEventHandlerFuncs{} if nc.allocateNodeCIDRs { - nodeEventHandlerFuncs = framework.ResourceEventHandlerFuncs{ + nodeEventHandlerFuncs = cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { node := obj.(*api.Node) err := nc.cidrAllocator.AllocateOrOccupyCIDR(node) @@ -296,7 +295,7 @@ func NewNodeController( } } - nc.nodeStore.Store, nc.nodeController = framework.NewInformer( + nc.nodeStore.Store, nc.nodeController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return nc.kubeClient.Core().Nodes().List(options) @@ -310,7 +309,7 @@ func NewNodeController( nodeEventHandlerFuncs, ) - nc.daemonSetStore.Store, nc.daemonSetController = framework.NewInformer( + nc.daemonSetStore.Store, nc.daemonSetController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return nc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(options) @@ -321,7 +320,7 @@ func NewNodeController( }, &extensions.DaemonSet{}, controller.NoResyncPeriodFunc(), - framework.ResourceEventHandlerFuncs{}, + cache.ResourceEventHandlerFuncs{}, ) if allocateNodeCIDRs { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/petset/pet_set.go b/vendor/k8s.io/kubernetes/pkg/controller/petset/pet_set.go index 1d400611d3..4aa1ec3f11 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/petset/pet_set.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/petset/pet_set.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/errors" utilruntime "k8s.io/kubernetes/pkg/util/runtime" @@ -63,12 +62,12 @@ type PetSetController struct { // podStoreSynced returns true if the pod store has synced at least once. podStoreSynced func() bool // Watches changes to all pods. - podController framework.ControllerInterface + podController cache.ControllerInterface // A store of PetSets, populated by the psController. psStore cache.StoreToPetSetLister // Watches changes to all PetSets. - psController *framework.Controller + psController *cache.Controller // A store of the 1 unhealthy pet blocking progress for a given ps blockingPetStore *unhealthyPetTracker @@ -82,7 +81,7 @@ type PetSetController struct { } // NewPetSetController creates a new petset controller. -func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient *client.Client, resyncPeriod time.Duration) *PetSetController { +func NewPetSetController(podInformer cache.SharedIndexInformer, kubeClient *client.Client, resyncPeriod time.Duration) *PetSetController { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(kubeClient.Events("")) @@ -98,7 +97,7 @@ func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient * queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "petset"), } - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ // lookup the petset and enqueue AddFunc: psc.addPod, // lookup current and old petset if labels changed @@ -109,7 +108,7 @@ func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient * psc.podStore.Indexer = podInformer.GetIndexer() psc.podController = podInformer.GetController() - psc.psStore.Store, psc.psController = framework.NewInformer( + psc.psStore.Store, psc.psController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return psc.kubeClient.Apps().PetSets(api.NamespaceAll).List(options) @@ -120,7 +119,7 @@ func NewPetSetController(podInformer framework.SharedIndexInformer, kubeClient * }, &apps.PetSet{}, petSetResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: psc.enqueuePetSet, UpdateFunc: func(old, cur interface{}) { oldPS := old.(*apps.PetSet) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go index b528902f93..e2f870f641 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go @@ -33,7 +33,6 @@ import ( unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned" "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" "k8s.io/kubernetes/pkg/runtime" utilruntime "k8s.io/kubernetes/pkg/util/runtime" @@ -61,14 +60,14 @@ type HorizontalController struct { // A store of HPA objects, populated by the controller. store cache.Store // Watches changes to all HPA objects. - controller *framework.Controller + controller *cache.Controller } var downscaleForbiddenWindow = 5 * time.Minute var upscaleForbiddenWindow = 3 * time.Minute -func newInformer(controller *HorizontalController, resyncPeriod time.Duration) (cache.Store, *framework.Controller) { - return framework.NewInformer( +func newInformer(controller *HorizontalController, resyncPeriod time.Duration) (cache.Store, *cache.Controller) { + return cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return controller.hpaNamespacer.HorizontalPodAutoscalers(api.NamespaceAll).List(options) @@ -79,7 +78,7 @@ func newInformer(controller *HorizontalController, resyncPeriod time.Duration) ( }, &autoscaling.HorizontalPodAutoscaler{}, resyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { hpa := obj.(*autoscaling.HorizontalPodAutoscaler) hasCPUPolicy := hpa.Spec.TargetCPUUtilizationPercentage != nil diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/metrics/metrics_client.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/metrics/metrics_client.go index 0ad555a4ab..692e961648 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/metrics/metrics_client.go @@ -123,8 +123,8 @@ func (h *HeapsterMetricsClient) GetCpuConsumptionAndRequestInMillis(namespace st requestSum := int64(0) missing := false for _, pod := range podList.Items { - if pod.Status.Phase == api.PodPending { - // Skip pending pods. + if pod.Status.Phase != api.PodRunning { + // Count only running pods. continue } @@ -144,7 +144,7 @@ func (h *HeapsterMetricsClient) GetCpuConsumptionAndRequestInMillis(namespace st return 0, 0, time.Time{}, fmt.Errorf("some pods do not have request for cpu") } glog.V(4).Infof("%s %s - sum of CPU requested: %d", namespace, selector, requestSum) - requestAvg := requestSum / int64(len(podList.Items)) + requestAvg := requestSum / int64(len(podNames)) // Consumption is already averaged and in millis. consumption, timestamp, err := h.getCpuUtilizationForPods(namespace, selector, podNames) if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go index a2175c5add..e1f90ecf3f 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -44,7 +43,7 @@ const ( type PodGCController struct { kubeClient clientset.Interface podStore cache.StoreToPodLister - podStoreSyncer *framework.Controller + podStoreSyncer *cache.Controller deletePod func(namespace, name string) error threshold int } @@ -63,7 +62,7 @@ func New(kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFun terminatedSelector := fields.ParseSelectorOrDie("status.phase!=" + string(api.PodPending) + ",status.phase!=" + string(api.PodRunning) + ",status.phase!=" + string(api.PodUnknown)) - gcc.podStore.Indexer, gcc.podStoreSyncer = framework.NewIndexerInformer( + gcc.podStore.Indexer, gcc.podStoreSyncer = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { options.FieldSelector = terminatedSelector @@ -76,7 +75,7 @@ func New(kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFun }, &api.Pod{}, resyncPeriod(), - framework.ResourceEventHandlerFuncs{}, + cache.ResourceEventHandlerFuncs{}, // We don't need to build a index for podStore here actually, but build one for consistency. // It will ensure that if people start making use of the podStore in more specific ways, // they'll get the benefits they expect. It will also reserve the name for future refactorings. diff --git a/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go b/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go index e8a04acba6..8dd63f726c 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go @@ -36,8 +36,7 @@ import ( unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" @@ -81,7 +80,7 @@ type ReplicaSetController struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewReplicationManager(passing SharedInformer), this // will be null - internalPodInformer framework.SharedIndexInformer + internalPodInformer cache.SharedIndexInformer // A ReplicaSet is temporarily suspended after creating/deleting these many replicas. // It resumes normal action after observing the watch events for them. @@ -95,11 +94,11 @@ type ReplicaSetController struct { // A store of ReplicaSets, populated by the rsController rsStore cache.StoreToReplicaSetLister // Watches changes to all ReplicaSets - rsController *framework.Controller + rsController *cache.Controller // A store of pods, populated by the podController podStore cache.StoreToPodLister // Watches changes to all pods - podController framework.ControllerInterface + podController cache.ControllerInterface // podStoreSynced returns true if the pod store has been synced at least once. // Added as a member to the struct to allow injection for testing. podStoreSynced func() bool @@ -115,7 +114,7 @@ type ReplicaSetController struct { } // NewReplicaSetController creates a new ReplicaSetController. -func NewReplicaSetController(podInformer framework.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicaSetController { +func NewReplicaSetController(podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicaSetController { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")}) @@ -126,7 +125,7 @@ func NewReplicaSetController(podInformer framework.SharedIndexInformer, kubeClie } // newReplicaSetController configures a replica set controller with the specified event recorder -func newReplicaSetController(eventRecorder record.EventRecorder, podInformer framework.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicaSetController { +func newReplicaSetController(eventRecorder record.EventRecorder, podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicaSetController { if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("replicaset_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) } @@ -143,7 +142,7 @@ func newReplicaSetController(eventRecorder record.EventRecorder, podInformer fra garbageCollectorEnabled: garbageCollectorEnabled, } - rsc.rsStore.Store, rsc.rsController = framework.NewInformer( + rsc.rsStore.Store, rsc.rsController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rsc.kubeClient.Extensions().ReplicaSets(api.NamespaceAll).List(options) @@ -155,7 +154,7 @@ func newReplicaSetController(eventRecorder record.EventRecorder, podInformer fra &extensions.ReplicaSet{}, // TODO: Can we have much longer period here? FullControllerResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: rsc.enqueueReplicaSet, UpdateFunc: rsc.updateRS, // This will enter the sync loop and no-op, because the replica set has been deleted from the store. @@ -165,7 +164,7 @@ func newReplicaSetController(eventRecorder record.EventRecorder, podInformer fra }, ) - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: rsc.addPod, // This invokes the ReplicaSet for every pod change, eg: host assignment. Though this might seem like // overkill the most frequent pod update is status, and the associated ReplicaSet will only list from diff --git a/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go index 679ca827ed..fafbad77e1 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go @@ -34,8 +34,7 @@ import ( unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" @@ -86,7 +85,7 @@ type ReplicationManager struct { // we have a personal informer, we must start it ourselves. If you start // the controller using NewReplicationManager(passing SharedInformer), this // will be null - internalPodInformer framework.SharedIndexInformer + internalPodInformer cache.SharedIndexInformer // An rc is temporarily suspended after creating/deleting these many replicas. // It resumes normal action after observing the watch events for them. @@ -100,11 +99,11 @@ type ReplicationManager struct { // A store of replication controllers, populated by the rcController rcStore cache.StoreToReplicationControllerLister // Watches changes to all replication controllers - rcController *framework.Controller + rcController *cache.Controller // A store of pods, populated by the podController podStore cache.StoreToPodLister // Watches changes to all pods - podController framework.ControllerInterface + podController cache.ControllerInterface // podStoreSynced returns true if the pod store has been synced at least once. // Added as a member to the struct to allow injection for testing. podStoreSynced func() bool @@ -120,7 +119,7 @@ type ReplicationManager struct { } // NewReplicationManager creates a replication manager -func NewReplicationManager(podInformer framework.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicationManager { +func NewReplicationManager(podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicationManager { eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) eventBroadcaster.StartRecordingToSink(&unversionedcore.EventSinkImpl{Interface: kubeClient.Core().Events("")}) @@ -130,7 +129,7 @@ func NewReplicationManager(podInformer framework.SharedIndexInformer, kubeClient } // newReplicationManager configures a replication manager with the specified event recorder -func newReplicationManager(eventRecorder record.EventRecorder, podInformer framework.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicationManager { +func newReplicationManager(eventRecorder record.EventRecorder, podInformer cache.SharedIndexInformer, kubeClient clientset.Interface, resyncPeriod controller.ResyncPeriodFunc, burstReplicas int, lookupCacheSize int, garbageCollectorEnabled bool) *ReplicationManager { if kubeClient != nil && kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("replication_controller", kubeClient.Core().GetRESTClient().GetRateLimiter()) } @@ -147,7 +146,7 @@ func newReplicationManager(eventRecorder record.EventRecorder, podInformer frame garbageCollectorEnabled: garbageCollectorEnabled, } - rm.rcStore.Indexer, rm.rcController = framework.NewIndexerInformer( + rm.rcStore.Indexer, rm.rcController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rm.kubeClient.Core().ReplicationControllers(api.NamespaceAll).List(options) @@ -159,7 +158,7 @@ func newReplicationManager(eventRecorder record.EventRecorder, podInformer frame &api.ReplicationController{}, // TODO: Can we have much longer period here? FullControllerResyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: rm.enqueueController, UpdateFunc: rm.updateRC, // This will enter the sync loop and no-op, because the controller has been deleted from the store. @@ -170,7 +169,7 @@ func newReplicationManager(eventRecorder record.EventRecorder, podInformer frame cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: rm.addPod, // This invokes the rc for every pod change, eg: host assignment. Though this might seem like overkill // the most frequent pod update is status, and the associated rc will only list from local storage, so diff --git a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/replenishment_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/replenishment_controller.go index 98aa9c8c5e..8dd7e526d0 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/replenishment_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/replenishment_controller.go @@ -27,8 +27,7 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/quota/evaluator/core" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -90,18 +89,18 @@ func ObjectReplenishmentDeleteFunc(options *ReplenishmentControllerOptions) func type ReplenishmentControllerFactory interface { // NewController returns a controller configured with the specified options. // This method is NOT thread-safe. - NewController(options *ReplenishmentControllerOptions) (framework.ControllerInterface, error) + NewController(options *ReplenishmentControllerOptions) (cache.ControllerInterface, error) } // replenishmentControllerFactory implements ReplenishmentControllerFactory type replenishmentControllerFactory struct { kubeClient clientset.Interface - podInformer framework.SharedInformer + podInformer cache.SharedInformer } // NewReplenishmentControllerFactory returns a factory that knows how to build controllers // to replenish resources when updated or deleted -func NewReplenishmentControllerFactory(podInformer framework.SharedInformer, kubeClient clientset.Interface) ReplenishmentControllerFactory { +func NewReplenishmentControllerFactory(podInformer cache.SharedInformer, kubeClient clientset.Interface) ReplenishmentControllerFactory { return &replenishmentControllerFactory{ kubeClient: kubeClient, podInformer: podInformer, @@ -112,8 +111,8 @@ func NewReplenishmentControllerFactoryFromClient(kubeClient clientset.Interface) return NewReplenishmentControllerFactory(nil, kubeClient) } -func (r *replenishmentControllerFactory) NewController(options *ReplenishmentControllerOptions) (framework.ControllerInterface, error) { - var result framework.ControllerInterface +func (r *replenishmentControllerFactory) NewController(options *ReplenishmentControllerOptions) (cache.ControllerInterface, error) { + var result cache.ControllerInterface if r.kubeClient != nil && r.kubeClient.Core().GetRESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("replenishment_controller", r.kubeClient.Core().GetRESTClient().GetRateLimiter()) } @@ -121,7 +120,7 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon switch options.GroupKind { case api.Kind("Pod"): if r.podInformer != nil { - r.podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + r.podInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{ UpdateFunc: PodReplenishmentUpdateFunc(options), DeleteFunc: ObjectReplenishmentDeleteFunc(options), }) @@ -133,7 +132,7 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon result = r.podInformer case api.Kind("Service"): - _, result = framework.NewInformer( + _, result = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return r.kubeClient.Core().Services(api.NamespaceAll).List(options) @@ -144,13 +143,13 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon }, &api.Service{}, options.ResyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ UpdateFunc: ServiceReplenishmentUpdateFunc(options), DeleteFunc: ObjectReplenishmentDeleteFunc(options), }, ) case api.Kind("ReplicationController"): - _, result = framework.NewInformer( + _, result = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return r.kubeClient.Core().ReplicationControllers(api.NamespaceAll).List(options) @@ -161,12 +160,12 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon }, &api.ReplicationController{}, options.ResyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ DeleteFunc: ObjectReplenishmentDeleteFunc(options), }, ) case api.Kind("PersistentVolumeClaim"): - _, result = framework.NewInformer( + _, result = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return r.kubeClient.Core().PersistentVolumeClaims(api.NamespaceAll).List(options) @@ -177,12 +176,12 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon }, &api.PersistentVolumeClaim{}, options.ResyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ DeleteFunc: ObjectReplenishmentDeleteFunc(options), }, ) case api.Kind("Secret"): - _, result = framework.NewInformer( + _, result = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return r.kubeClient.Core().Secrets(api.NamespaceAll).List(options) @@ -193,12 +192,12 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon }, &api.Secret{}, options.ResyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ DeleteFunc: ObjectReplenishmentDeleteFunc(options), }, ) case api.Kind("ConfigMap"): - _, result = framework.NewInformer( + _, result = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return r.kubeClient.Core().ConfigMaps(api.NamespaceAll).List(options) @@ -209,7 +208,7 @@ func (r *replenishmentControllerFactory) NewController(options *ReplenishmentCon }, &api.ConfigMap{}, options.ResyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ DeleteFunc: ObjectReplenishmentDeleteFunc(options), }, ) @@ -254,7 +253,7 @@ func IsUnhandledGroupKindError(err error) bool { // returning the first success or failure it hits. If there are no hits either way, it return an UnhandledGroupKind error type UnionReplenishmentControllerFactory []ReplenishmentControllerFactory -func (f UnionReplenishmentControllerFactory) NewController(options *ReplenishmentControllerOptions) (framework.ControllerInterface, error) { +func (f UnionReplenishmentControllerFactory) NewController(options *ReplenishmentControllerOptions) (cache.ControllerInterface, error) { for _, factory := range f { controller, err := factory.NewController(options) if !IsUnhandledGroupKindError(err) { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go index 8b01ef8675..8476bb2e6c 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/quota" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -60,7 +59,7 @@ type ResourceQuotaController struct { // An index of resource quota objects by namespace rqIndexer cache.Indexer // Watches changes to all resource quota - rqController *framework.Controller + rqController *cache.Controller // ResourceQuota objects that need to be synchronized queue workqueue.RateLimitingInterface // missingUsageQueue holds objects that are missing the initial usage informatino @@ -72,7 +71,7 @@ type ResourceQuotaController struct { // knows how to calculate usage registry quota.Registry // controllers monitoring to notify for replenishment - replenishmentControllers []framework.ControllerInterface + replenishmentControllers []cache.ControllerInterface } func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *ResourceQuotaController { @@ -83,7 +82,7 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour missingUsageQueue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "resourcequota_priority"), resyncPeriod: options.ResyncPeriod, registry: options.Registry, - replenishmentControllers: []framework.ControllerInterface{}, + replenishmentControllers: []cache.ControllerInterface{}, } if options.KubeClient != nil && options.KubeClient.Core().GetRESTClient().GetRateLimiter() != nil { metrics.RegisterMetricAndTrackRateLimiterUsage("resource_quota_controller", options.KubeClient.Core().GetRESTClient().GetRateLimiter()) @@ -92,7 +91,7 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour rq.syncHandler = rq.syncResourceQuotaFromKey // build the controller that observes quota - rq.rqIndexer, rq.rqController = framework.NewIndexerInformer( + rq.rqIndexer, rq.rqController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return rq.kubeClient.Core().ResourceQuotas(api.NamespaceAll).List(options) @@ -103,7 +102,7 @@ func NewResourceQuotaController(options *ResourceQuotaControllerOptions) *Resour }, &api.ResourceQuota{}, rq.resyncPeriod(), - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: rq.addQuota, UpdateFunc: func(old, cur interface{}) { // We are only interested in observing updates to quota.spec to drive updates to quota.status. diff --git a/vendor/k8s.io/kubernetes/pkg/controller/route/routecontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/route/routecontroller.go index 179de8e917..470e4421a7 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/route/routecontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/route/routecontroller.go @@ -80,7 +80,7 @@ func (rc *RouteController) reconcileNodeRoutes() error { if err != nil { return fmt.Errorf("error listing routes: %v", err) } - // TODO (cjcullen): use pkg/controller/framework.NewInformer to watch this + // TODO (cjcullen): use pkg/controller/cache.NewInformer to watch this // and reduce the number of lists needed. nodeList, err := rc.kubeClient.Core().Nodes().List(api.ListOptions{}) if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go index 33278b7751..8af49cef8e 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go @@ -33,7 +33,6 @@ import ( "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" pkg_runtime "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -88,7 +87,7 @@ type ServiceController struct { // A store of services, populated by the serviceController serviceStore cache.StoreToServiceLister // Watches changes to all services - serviceController *framework.Controller + serviceController *cache.Controller eventBroadcaster record.EventBroadcaster eventRecorder record.EventRecorder nodeLister cache.StoreToNodeLister @@ -120,7 +119,7 @@ func New(cloud cloudprovider.Interface, kubeClient clientset.Interface, clusterN }, workingQueue: workqueue.NewDelayingQueue(), } - s.serviceStore.Store, s.serviceController = framework.NewInformer( + s.serviceStore.Store, s.serviceController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (pkg_runtime.Object, error) { return s.kubeClient.Core().Services(api.NamespaceAll).List(options) @@ -131,7 +130,7 @@ func New(cloud cloudprovider.Interface, kubeClient clientset.Interface, clusterN }, &api.Service{}, serviceSyncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: s.enqueueService, UpdateFunc: func(old, cur interface{}) { oldSvc, ok1 := old.(*api.Service) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go index 5062305e5a..4a1b434d86 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/metrics" @@ -80,7 +79,7 @@ func NewServiceAccountsController(cl clientset.Interface, options ServiceAccount // If we're maintaining a single account, we can scope the accounts we watch to just that name accountSelector = fields.SelectorFromSet(map[string]string{api.ObjectNameField: options.ServiceAccounts[0].Name}) } - e.serviceAccounts, e.serviceAccountController = framework.NewIndexerInformer( + e.serviceAccounts, e.serviceAccountController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { options.FieldSelector = accountSelector @@ -93,13 +92,13 @@ func NewServiceAccountsController(cl clientset.Interface, options ServiceAccount }, &api.ServiceAccount{}, options.ServiceAccountResync, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ DeleteFunc: e.serviceAccountDeleted, }, cache.Indexers{"namespace": cache.MetaNamespaceIndexFunc}, ) - e.namespaces, e.namespaceController = framework.NewIndexerInformer( + e.namespaces, e.namespaceController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Core().Namespaces().List(options) @@ -110,7 +109,7 @@ func NewServiceAccountsController(cl clientset.Interface, options ServiceAccount }, &api.Namespace{}, options.NamespaceResync, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: e.namespaceAdded, UpdateFunc: e.namespaceUpdated, }, @@ -131,8 +130,8 @@ type ServiceAccountsController struct { namespaces cache.Indexer // Since we join two objects, we'll watch both of them with controllers. - serviceAccountController *framework.Controller - namespaceController *framework.Controller + serviceAccountController *cache.Controller + namespaceController *cache.Controller } // Runs controller loops and returns immediately diff --git a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller.go index cdaf141167..01260de5e2 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/tokens_controller.go @@ -27,7 +27,6 @@ import ( "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/registry/secret" "k8s.io/kubernetes/pkg/runtime" @@ -90,7 +89,7 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions metrics.RegisterMetricAndTrackRateLimiterUsage("serviceaccount_controller", cl.Core().GetRESTClient().GetRateLimiter()) } - e.serviceAccounts, e.serviceAccountController = framework.NewInformer( + e.serviceAccounts, e.serviceAccountController = cache.NewInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { return e.client.Core().ServiceAccounts(api.NamespaceAll).List(options) @@ -101,7 +100,7 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions }, &api.ServiceAccount{}, options.ServiceAccountResync, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: e.queueServiceAccountSync, UpdateFunc: e.queueServiceAccountUpdateSync, DeleteFunc: e.queueServiceAccountSync, @@ -109,7 +108,7 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions ) tokenSelector := fields.SelectorFromSet(map[string]string{api.SecretTypeField: string(api.SecretTypeServiceAccountToken)}) - e.secrets, e.secretController = framework.NewIndexerInformer( + e.secrets, e.secretController = cache.NewIndexerInformer( &cache.ListWatch{ ListFunc: func(options api.ListOptions) (runtime.Object, error) { options.FieldSelector = tokenSelector @@ -122,7 +121,7 @@ func NewTokensController(cl clientset.Interface, options TokensControllerOptions }, &api.Secret{}, options.SecretResync, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: e.queueSecretSync, UpdateFunc: e.queueSecretUpdateSync, DeleteFunc: e.queueSecretSync, @@ -144,8 +143,8 @@ type TokensController struct { secrets cache.Indexer // Since we join two objects, we'll watch both of them with controllers. - serviceAccountController *framework.Controller - secretController *framework.Controller + serviceAccountController *cache.Controller + secretController *cache.Controller // syncServiceAccountQueue handles service account events: // * ensures a referenced token exists for service accounts which still exist diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go index c1055a7ba0..9c4544c8b9 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -25,10 +25,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" + kcache "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler" @@ -66,10 +66,10 @@ type AttachDetachController interface { // NewAttachDetachController returns a new instance of AttachDetachController. func NewAttachDetachController( kubeClient internalclientset.Interface, - podInformer framework.SharedInformer, - nodeInformer framework.SharedInformer, - pvcInformer framework.SharedInformer, - pvInformer framework.SharedInformer, + podInformer kcache.SharedInformer, + nodeInformer kcache.SharedInformer, + pvcInformer kcache.SharedInformer, + pvInformer kcache.SharedInformer, cloud cloudprovider.Interface, plugins []volume.VolumePlugin, recorder record.EventRecorder) (AttachDetachController, error) { @@ -94,13 +94,13 @@ func NewAttachDetachController( cloud: cloud, } - podInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + podInformer.AddEventHandler(kcache.ResourceEventHandlerFuncs{ AddFunc: adc.podAdd, UpdateFunc: adc.podUpdate, DeleteFunc: adc.podDelete, }) - nodeInformer.AddEventHandler(framework.ResourceEventHandlerFuncs{ + nodeInformer.AddEventHandler(kcache.ResourceEventHandlerFuncs{ AddFunc: adc.nodeAdd, UpdateFunc: adc.nodeUpdate, DeleteFunc: adc.nodeDelete, @@ -143,12 +143,12 @@ type attachDetachController struct { // pvcInformer is the shared PVC informer used to fetch and store PVC // objects from the API server. It is shared with other controllers and // therefore the PVC objects in its store should be treated as immutable. - pvcInformer framework.SharedInformer + pvcInformer kcache.SharedInformer // pvInformer is the shared PV informer used to fetch and store PV objects // from the API server. It is shared with other controllers and therefore // the PV objects in its store should be treated as immutable. - pvInformer framework.SharedInformer + pvInformer kcache.SharedInformer // cloud provider used by volume host cloud cloudprovider.Interface diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go index 55bff28d2d..4f1a0bdb37 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go @@ -66,12 +66,12 @@ type ActualStateOfWorld interface { // the specified volume, an error is returned. SetVolumeMountedByNode(volumeName api.UniqueVolumeName, nodeName string, mounted bool) error - // ResetNodeStatusUpdateNeeded resets statusUpdateNeeded for the specified - // node to false indicating the AttachedVolume field of the Node's Status - // object has been updated. - // If no node with the name nodeName exists in list of attached nodes for - // the specified volume, an error is returned. - ResetNodeStatusUpdateNeeded(nodeName string) error + // SetNodeStatusUpdateNeeded sets statusUpdateNeeded for the specified + // node to true indicating the AttachedVolume field in the Node's Status + // object needs to be updated by the node updater again. + // If the specifed node does not exist in the nodesToUpdateStatusFor list, + // log the error and return + SetNodeStatusUpdateNeeded(nodeName string) // ResetDetachRequestTime resets the detachRequestTime to 0 which indicates there is no detach // request any more for the volume @@ -278,8 +278,17 @@ func (asw *actualStateOfWorld) AddVolumeNode( nodesAttachedTo: make(map[string]nodeAttachedTo), devicePath: devicePath, } - asw.attachedVolumes[volumeName] = volumeObj + } else { + // If volume object already exists, it indicates that the information would be out of date. + // Update the fields for volume object except the nodes attached to the volumes. + volumeObj.devicePath = devicePath + volumeObj.spec = volumeSpec + glog.V(2).Infof("Volume %q is already added to attachedVolume list to node %q, update device path %q", + volumeName, + nodeName, + devicePath) } + asw.attachedVolumes[volumeName] = volumeObj _, nodeExists := volumeObj.nodesAttachedTo[nodeName] if !nodeExists { @@ -322,7 +331,7 @@ func (asw *actualStateOfWorld) SetVolumeMountedByNode( nodeObj.mountedByNode = mounted volumeObj.nodesAttachedTo[nodeName] = nodeObj - glog.V(4).Infof("SetVolumeMountedByNode volume %v to the node %q mounted %q", + glog.V(4).Infof("SetVolumeMountedByNode volume %v to the node %q mounted %t", volumeName, nodeName, mounted) @@ -433,21 +442,28 @@ func (asw *actualStateOfWorld) addVolumeToReportAsAttached( } } -func (asw *actualStateOfWorld) ResetNodeStatusUpdateNeeded( - nodeName string) error { - asw.Lock() - defer asw.Unlock() - // Remove volume from volumes to report as attached +// Update the flag statusUpdateNeeded to indicate whether node status is already updated or +// needs to be updated again by the node status updater. +// If the specifed node does not exist in the nodesToUpdateStatusFor list, log the error and return +// This is an internal function and caller should acquire and release the lock +func (asw *actualStateOfWorld) updateNodeStatusUpdateNeeded(nodeName string, needed bool) { nodeToUpdate, nodeToUpdateExists := asw.nodesToUpdateStatusFor[nodeName] if !nodeToUpdateExists { - return fmt.Errorf( - "failed to ResetNodeStatusUpdateNeeded(nodeName=%q) nodeName does not exist", + // should not happen + glog.Errorf( + "Failed to set statusUpdateNeeded to needed %t because nodeName=%q does not exist", + needed, nodeName) } - nodeToUpdate.statusUpdateNeeded = false + nodeToUpdate.statusUpdateNeeded = needed asw.nodesToUpdateStatusFor[nodeName] = nodeToUpdate - return nil +} + +func (asw *actualStateOfWorld) SetNodeStatusUpdateNeeded(nodeName string) { + asw.Lock() + defer asw.Unlock() + asw.updateNodeStatusUpdateNeeded(nodeName, true) } func (asw *actualStateOfWorld) DeleteVolumeNode( @@ -529,7 +545,7 @@ func (asw *actualStateOfWorld) GetVolumesToReportAttached() map[string][]api.Att defer asw.RUnlock() volumesToReportAttached := make(map[string][]api.AttachedVolume) - for _, nodeToUpdateObj := range asw.nodesToUpdateStatusFor { + for nodeName, nodeToUpdateObj := range asw.nodesToUpdateStatusFor { if nodeToUpdateObj.statusUpdateNeeded { attachedVolumes := make( []api.AttachedVolume, @@ -544,6 +560,10 @@ func (asw *actualStateOfWorld) GetVolumesToReportAttached() map[string][]api.Att } volumesToReportAttached[nodeToUpdateObj.nodeName] = attachedVolumes } + // When GetVolumesToReportAttached is called by node status updater, the current status + // of this node will be updated, so set the flag statusUpdateNeeded to false indicating + // the current status is already updated. + asw.updateNodeStatusUpdateNeeded(nodeName, false) } return volumesToReportAttached @@ -557,6 +577,7 @@ func getAttachedVolume( VolumeName: attachedVolume.volumeName, VolumeSpec: attachedVolume.spec, NodeName: nodeAttachedTo.nodeName, + DevicePath: attachedVolume.devicePath, PluginIsAttachable: true, }, MountedByNode: nodeAttachedTo.mountedByNode, diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go index f1abbb0a4c..d74ef32681 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go @@ -25,7 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api" kcache "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/volume/util/volumehelper" @@ -48,7 +47,7 @@ type DesiredStateOfWorldPopulator interface { // desiredStateOfWorld - the cache to populate func NewDesiredStateOfWorldPopulator( loopSleepDuration time.Duration, - podInformer framework.SharedInformer, + podInformer kcache.SharedInformer, desiredStateOfWorld cache.DesiredStateOfWorld) DesiredStateOfWorldPopulator { return &desiredStateOfWorldPopulator{ loopSleepDuration: loopSleepDuration, @@ -59,7 +58,7 @@ func NewDesiredStateOfWorldPopulator( type desiredStateOfWorldPopulator struct { loopSleepDuration time.Duration - podInformer framework.SharedInformer + podInformer kcache.SharedInformer desiredStateOfWorld cache.DesiredStateOfWorld } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go index 0e1de23a68..1c41b7daf3 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater/node_status_updater.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" + kcache "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache" "k8s.io/kubernetes/pkg/util/strategicpatch" ) @@ -42,7 +42,7 @@ type NodeStatusUpdater interface { // NewNodeStatusUpdater returns a new instance of NodeStatusUpdater. func NewNodeStatusUpdater( kubeClient internalclientset.Interface, - nodeInformer framework.SharedInformer, + nodeInformer kcache.SharedInformer, actualStateOfWorld cache.ActualStateOfWorld) NodeStatusUpdater { return &nodeStatusUpdater{ actualStateOfWorld: actualStateOfWorld, @@ -53,7 +53,7 @@ func NewNodeStatusUpdater( type nodeStatusUpdater struct { kubeClient internalclientset.Interface - nodeInformer framework.SharedInformer + nodeInformer kcache.SharedInformer actualStateOfWorld cache.ActualStateOfWorld } @@ -107,20 +107,15 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error { _, err = nsu.kubeClient.Core().Nodes().PatchStatus(nodeName, patchBytes) if err != nil { + // If update node status fails, reset flag statusUpdateNeeded back to true + // to indicate this node status needs to be udpated again + nsu.actualStateOfWorld.SetNodeStatusUpdateNeeded(nodeName) return fmt.Errorf( "failed to kubeClient.Core().Nodes().Patch for node %q. %v", nodeName, err) } - err = nsu.actualStateOfWorld.ResetNodeStatusUpdateNeeded(nodeName) - if err != nil { - return fmt.Errorf( - "failed to ResetNodeStatusUpdateNeeded for node %q. %v", - nodeName, - err) - } - glog.V(3).Infof( "Updating status for node %q succeeded. patchBytes: %q", nodeName, diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go index 2231bd3490..2959806694 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller.go @@ -28,7 +28,6 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/util/goroutinemap" vol "k8s.io/kubernetes/pkg/volume" @@ -150,12 +149,12 @@ const createProvisionedPVInterval = 10 * time.Second // PersistentVolumeController is a controller that synchronizes // PersistentVolumeClaims and PersistentVolumes. It starts two -// framework.Controllers that watch PersistentVolume and PersistentVolumeClaim +// cache.Controllers that watch PersistentVolume and PersistentVolumeClaim // changes. type PersistentVolumeController struct { - volumeController *framework.Controller + volumeController *cache.Controller volumeSource cache.ListerWatcher - claimController *framework.Controller + claimController *cache.Controller claimSource cache.ListerWatcher classReflector *cache.Reflector classSource cache.ListerWatcher @@ -191,7 +190,7 @@ type PersistentVolumeController struct { } // syncClaim is the main controller method to decide what to do with a claim. -// It's invoked by appropriate framework.Controller callbacks when a claim is +// It's invoked by appropriate cache.Controller callbacks when a claim is // created, updated or periodically synced. We do not differentiate between // these events. // For easier readability, it was split into syncUnboundClaim and syncBoundClaim @@ -381,7 +380,7 @@ func (ctrl *PersistentVolumeController) syncBoundClaim(claim *api.PersistentVolu } // syncVolume is the main controller method to decide what to do with a volume. -// It's invoked by appropriate framework.Controller callbacks when a volume is +// It's invoked by appropriate cache.Controller callbacks when a volume is // created, updated or periodically synced. We do not differentiate between // these events. func (ctrl *PersistentVolumeController) syncVolume(volume *api.PersistentVolume) error { @@ -913,7 +912,6 @@ func (ctrl *PersistentVolumeController) unbindVolume(volume *api.PersistentVolum // Update the status _, err = ctrl.updateVolumePhase(newVol, api.VolumeAvailable, "") return err - } // reclaimVolume implements volume.Spec.PersistentVolumeReclaimPolicy and @@ -996,7 +994,8 @@ func (ctrl *PersistentVolumeController) recycleVolumeOperation(arg interface{}) } // Plugin found - recycler, err := plugin.NewRecycler(volume.Name, spec) + recorder := ctrl.newRecyclerEventRecorder(volume) + recycler, err := plugin.NewRecycler(volume.Name, spec, recorder) if err != nil { // Cannot create recycler strerr := fmt.Sprintf("Failed to create recycler: %v", err) @@ -1024,6 +1023,8 @@ func (ctrl *PersistentVolumeController) recycleVolumeOperation(arg interface{}) } glog.V(2).Infof("volume %q recycled", volume.Name) + // Send an event + ctrl.eventRecorder.Event(volume, api.EventTypeNormal, "VolumeRecycled", "Volume recycled") // Make the volume available again if err = ctrl.unbindVolume(volume); err != nil { // Oops, could not save the volume and therefore the controller will @@ -1366,6 +1367,17 @@ func (ctrl *PersistentVolumeController) scheduleOperation(operationName string, } } +// newRecyclerEventRecorder returns a RecycleEventRecorder that sends all events +// to given volume. +func (ctrl *PersistentVolumeController) newRecyclerEventRecorder(volume *api.PersistentVolume) vol.RecycleEventRecorder { + return func(eventtype, message string) { + ctrl.eventRecorder.Eventf(volume, eventtype, "RecyclerPod", "Recycler pod: %s", message) + } +} + +// findProvisionablePlugin finds a provisioner plugin for a given claim. +// It returns either the provisioning plugin or nil when an external +// provisioner is requested. func (ctrl *PersistentVolumeController) findProvisionablePlugin(claim *api.PersistentVolumeClaim) (vol.ProvisionableVolumePlugin, *storage.StorageClass, error) { // TODO: remove this alpha behavior in 1.5 alpha := hasAnnotation(claim.ObjectMeta, annAlphaClass) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller_base.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller_base.go index 93fe8326f5..d9f4c93d1d 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller_base.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/controller_base.go @@ -30,7 +30,6 @@ import ( unversioned_core "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/goroutinemap" @@ -65,7 +64,7 @@ func NewPersistentVolumeController( controller := &PersistentVolumeController{ volumes: newPersistentVolumeOrderedIndex(), - claims: cache.NewStore(framework.DeletionHandlingMetaNamespaceKeyFunc), + claims: cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc), kubeClient: kubeClient, eventRecorder: eventRecorder, runningOperations: goroutinemap.NewGoRoutineMap(false /* exponentialBackOffOnError */), @@ -120,22 +119,22 @@ func NewPersistentVolumeController( } controller.classSource = classSource - _, controller.volumeController = framework.NewIndexerInformer( + _, controller.volumeController = cache.NewIndexerInformer( volumeSource, &api.PersistentVolume{}, syncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: controller.addVolume, UpdateFunc: controller.updateVolume, DeleteFunc: controller.deleteVolume, }, cache.Indexers{"accessmodes": accessModesIndexFunc}, ) - _, controller.claimController = framework.NewInformer( + _, controller.claimController = cache.NewInformer( claimSource, &api.PersistentVolumeClaim{}, syncPeriod, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: controller.addClaim, UpdateFunc: controller.updateClaim, DeleteFunc: controller.deleteClaim, @@ -144,7 +143,7 @@ func NewPersistentVolumeController( // This is just a cache of StorageClass instances, no special actions are // needed when a class is created/deleted/updated. - controller.classes = cache.NewStore(framework.DeletionHandlingMetaNamespaceKeyFunc) + controller.classes = cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc) controller.classReflector = cache.NewReflector( classSource, &storage.StorageClass{}, @@ -212,7 +211,7 @@ func (ctrl *PersistentVolumeController) storeClaimUpdate(claim *api.PersistentVo return storeObjectUpdate(ctrl.claims, claim, "claim") } -// addVolume is callback from framework.Controller watching PersistentVolume +// addVolume is callback from cache.Controller watching PersistentVolume // events. func (ctrl *PersistentVolumeController) addVolume(obj interface{}) { pv, ok := obj.(*api.PersistentVolume) @@ -247,7 +246,7 @@ func (ctrl *PersistentVolumeController) addVolume(obj interface{}) { } } -// updateVolume is callback from framework.Controller watching PersistentVolume +// updateVolume is callback from cache.Controller watching PersistentVolume // events. func (ctrl *PersistentVolumeController) updateVolume(oldObj, newObj interface{}) { newVolume, ok := newObj.(*api.PersistentVolume) @@ -282,7 +281,7 @@ func (ctrl *PersistentVolumeController) updateVolume(oldObj, newObj interface{}) } } -// deleteVolume is callback from framework.Controller watching PersistentVolume +// deleteVolume is callback from cache.Controller watching PersistentVolume // events. func (ctrl *PersistentVolumeController) deleteVolume(obj interface{}) { _ = ctrl.volumes.store.Delete(obj) @@ -330,7 +329,7 @@ func (ctrl *PersistentVolumeController) deleteVolume(obj interface{}) { } } -// addClaim is callback from framework.Controller watching PersistentVolumeClaim +// addClaim is callback from cache.Controller watching PersistentVolumeClaim // events. func (ctrl *PersistentVolumeController) addClaim(obj interface{}) { // Store the new claim version in the cache and do not process it if this is @@ -360,7 +359,7 @@ func (ctrl *PersistentVolumeController) addClaim(obj interface{}) { } } -// updateClaim is callback from framework.Controller watching PersistentVolumeClaim +// updateClaim is callback from cache.Controller watching PersistentVolumeClaim // events. func (ctrl *PersistentVolumeController) updateClaim(oldObj, newObj interface{}) { // Store the new claim version in the cache and do not process it if this is @@ -390,7 +389,7 @@ func (ctrl *PersistentVolumeController) updateClaim(oldObj, newObj interface{}) } } -// deleteClaim is callback from framework.Controller watching PersistentVolumeClaim +// deleteClaim is callback from cache.Controller watching PersistentVolumeClaim // events. func (ctrl *PersistentVolumeController) deleteClaim(obj interface{}) { _ = ctrl.claims.Delete(obj) diff --git a/vendor/k8s.io/kubernetes/pkg/genericapiserver/genericapiserver.go b/vendor/k8s.io/kubernetes/pkg/genericapiserver/genericapiserver.go index 0d97fa37b9..0b17cdb65a 100644 --- a/vendor/k8s.io/kubernetes/pkg/genericapiserver/genericapiserver.go +++ b/vendor/k8s.io/kubernetes/pkg/genericapiserver/genericapiserver.go @@ -502,6 +502,7 @@ func (s *GenericAPIServer) init(c *Config) { attributeGetter := apiserver.NewRequestAttributeGetter(s.RequestContextMapper, s.NewRequestInfoResolver()) handler = apiserver.WithAuthorizationCheck(handler, attributeGetter, s.authorizer) + handler = apiserver.WithImpersonation(handler, s.RequestContextMapper, s.authorizer) if len(c.AuditLogPath) != 0 { // audit handler must comes before the impersonationFilter to read the original user writer := &lumberjack.Logger{ @@ -511,9 +512,7 @@ func (s *GenericAPIServer) init(c *Config) { MaxSize: c.AuditLogMaxSize, } handler = audit.WithAudit(handler, attributeGetter, writer) - defer writer.Close() } - handler = apiserver.WithImpersonation(handler, s.RequestContextMapper, s.authorizer) // Install Authenticator if c.Authenticator != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/genericapiserver/options/server_run_options.go b/vendor/k8s.io/kubernetes/pkg/genericapiserver/options/server_run_options.go index 72947f8f6f..27367bccf6 100644 --- a/vendor/k8s.io/kubernetes/pkg/genericapiserver/options/server_run_options.go +++ b/vendor/k8s.io/kubernetes/pkg/genericapiserver/options/server_run_options.go @@ -38,8 +38,6 @@ import ( ) const ( - DefaultDeserializationCacheSize = 50000 - // TODO: This can be tightened up. It still matches objects named watch or proxy. defaultLongRunningRequestRE = "(/|^)((watch|proxy)(/|$)|(logs?|portforward|exec|attach)/?$)" ) @@ -157,7 +155,9 @@ func NewServerRunOptions() *ServerRunOptions { func (o *ServerRunOptions) WithEtcdOptions() *ServerRunOptions { o.StorageConfig = storagebackend.Config{ Prefix: DefaultEtcdPathPrefix, - DeserializationCacheSize: DefaultDeserializationCacheSize, + // Default cache size to 0 - if unset, its size will be set based on target + // memory usage. + DeserializationCacheSize: 0, } return o } diff --git a/vendor/k8s.io/kubernetes/pkg/genericapiserver/tunneler.go b/vendor/k8s.io/kubernetes/pkg/genericapiserver/tunneler.go index a239bc9013..5a80dadbc2 100644 --- a/vendor/k8s.io/kubernetes/pkg/genericapiserver/tunneler.go +++ b/vendor/k8s.io/kubernetes/pkg/genericapiserver/tunneler.go @@ -46,14 +46,17 @@ type Tunneler interface { } type SSHTunneler struct { + // Important: Since these two int64 fields are using sync/atomic, they have to be at the top of the struct due to a bug on 32-bit platforms + // See: https://golang.org/pkg/sync/atomic/ for more information + lastSync int64 // Seconds since Epoch + lastSSHKeySync int64 // Seconds since Epoch + SSHUser string SSHKeyfile string InstallSSHKey InstallSSHKey HealthCheckURL *url.URL tunnels *ssh.SSHTunnelList - lastSync int64 // Seconds since Epoch - lastSSHKeySync int64 // Seconds since Epoch lastSyncMetric prometheus.GaugeFunc clock clock.Clock diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index e8c3751fe8..b91b7e2178 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -158,9 +158,6 @@ const ( // Period for performing image garbage collection. ImageGCPeriod = 5 * time.Minute - // maxImagesInStatus is the number of max images we store in image status. - maxImagesInNodeStatus = 50 - // Minimum number of dead containers to keep in a pod minDeadContainerInPod = 1 ) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go index 2c9a850257..b155de781d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go @@ -39,6 +39,15 @@ import ( "k8s.io/kubernetes/pkg/volume/util/volumehelper" ) +const ( + // maxImagesInNodeStatus is the number of max images we store in image status. + maxImagesInNodeStatus = 50 + + // maxNamesPerImageInNodeStatus is max number of names per image stored in + // the node status. + maxNamesPerImageInNodeStatus = 5 +) + // registerWithApiServer registers the node with the cluster master. It is safe // to call multiple times, but not concurrently (kl.registrationCompleted is // not locked). @@ -501,8 +510,13 @@ func (kl *Kubelet) setNodeStatusImages(node *api.Node) { } for _, image := range containerImages { + names := append(image.RepoDigests, image.RepoTags...) + // Report up to maxNamesPerImageInNodeStatus names per image. + if len(names) > maxNamesPerImageInNodeStatus { + names = names[0:maxNamesPerImageInNodeStatus] + } imagesOnNode = append(imagesOnNode, api.ContainerImage{ - Names: append(image.RepoTags, image.RepoDigests...), + Names: names, SizeBytes: image.Size, }) } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go index 3838b31558..a11b711d16 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go @@ -40,6 +40,12 @@ func (kl *Kubelet) ListVolumesForPod(podUID types.UID) (map[string]volume.Volume podVolumes := kl.volumeManager.GetMountedVolumesForPod( volumetypes.UniquePodName(podUID)) for outerVolumeSpecName, volume := range podVolumes { + // TODO: volume.Mounter could be nil if volume object is recovered + // from reconciler's sync state process. PR 33616 will fix this problem + // to create Mounter object when recovering volume state. + if volume.Mounter == nil { + continue + } volumesToReturn[outerVolumeSpecName] = volume.Mounter } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go index 5eaa4eb500..8fea2d80f8 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/cache/actual_state_of_world.go @@ -366,8 +366,15 @@ func (asw *actualStateOfWorld) addVolume( globallyMounted: false, devicePath: devicePath, } - asw.attachedVolumes[volumeName] = volumeObj + } else { + // If volume object already exists, update the fields such as device path + volumeObj.devicePath = devicePath + volumeObj.spec = volumeSpec + glog.V(2).Infof("Volume %q is already added to attachedVolume list, update device path %q", + volumeName, + devicePath) } + asw.attachedVolumes[volumeName] = volumeObj return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/storage/etcd/etcd_watcher.go b/vendor/k8s.io/kubernetes/pkg/storage/etcd/etcd_watcher.go index b9ea1b3aec..2ffcad479e 100644 --- a/vendor/k8s.io/kubernetes/pkg/storage/etcd/etcd_watcher.go +++ b/vendor/k8s.io/kubernetes/pkg/storage/etcd/etcd_watcher.go @@ -79,6 +79,12 @@ func exceptKey(except string) includeFunc { // etcdWatcher converts a native etcd watch to a watch.Interface. type etcdWatcher struct { + // HighWaterMarks for performance debugging. + // Important: Since HighWaterMark is using sync/atomic, it has to be at the top of the struct due to a bug on 32-bit platforms + // See: https://golang.org/pkg/sync/atomic/ for more information + incomingHWM HighWaterMark + outgoingHWM HighWaterMark + encoding runtime.Codec // Note that versioner is required for etcdWatcher to work correctly. // There is no public constructor of it, so be careful when manipulating @@ -108,10 +114,6 @@ type etcdWatcher struct { // Injectable for testing. Send the event down the outgoing channel. emit func(watch.Event) - // HighWaterMarks for performance debugging. - incomingHWM HighWaterMark - outgoingHWM HighWaterMark - cache etcdCache } diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go index 75dcdcea28..cfce9571aa 100644 --- a/vendor/k8s.io/kubernetes/pkg/version/base.go +++ b/vendor/k8s.io/kubernetes/pkg/version/base.go @@ -51,7 +51,7 @@ var ( // semantic version is a git hash, but the version itself is no // longer the direct output of "git describe", but a slight // translation to be semver compliant. - gitVersion string = "v1.4.0+$Format:%h$" + gitVersion string = "v1.4.1+$Format:%h$" gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" diff --git a/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go b/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go index 40a109a08a..28de189136 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/host_path/host_path.go @@ -46,7 +46,7 @@ func ProbeVolumePlugins(volumeConfig volume.VolumeConfig) []volume.VolumePlugin type hostPathPlugin struct { host volume.VolumeHost // decouple creating Recyclers/Deleters/Provisioners by deferring to a function. Allows for easier testing. - newRecyclerFunc func(pvName string, spec *volume.Spec, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) + newRecyclerFunc func(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) newDeleterFunc func(spec *volume.Spec, host volume.VolumeHost) (volume.Deleter, error) newProvisionerFunc func(options volume.VolumeOptions, host volume.VolumeHost) (volume.Provisioner, error) config volume.VolumeConfig @@ -112,8 +112,8 @@ func (plugin *hostPathPlugin) NewUnmounter(volName string, podUID types.UID) (vo }}, nil } -func (plugin *hostPathPlugin) NewRecycler(pvName string, spec *volume.Spec) (volume.Recycler, error) { - return plugin.newRecyclerFunc(pvName, spec, plugin.host, plugin.config) +func (plugin *hostPathPlugin) NewRecycler(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder) (volume.Recycler, error) { + return plugin.newRecyclerFunc(pvName, spec, eventRecorder, plugin.host, plugin.config) } func (plugin *hostPathPlugin) NewDeleter(spec *volume.Spec) (volume.Deleter, error) { @@ -142,18 +142,19 @@ func (plugin *hostPathPlugin) ConstructVolumeSpec(volumeName, mountPath string) return volume.NewSpecFromVolume(hostPathVolume), nil } -func newRecycler(pvName string, spec *volume.Spec, host volume.VolumeHost, config volume.VolumeConfig) (volume.Recycler, error) { +func newRecycler(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder, host volume.VolumeHost, config volume.VolumeConfig) (volume.Recycler, error) { if spec.PersistentVolume == nil || spec.PersistentVolume.Spec.HostPath == nil { return nil, fmt.Errorf("spec.PersistentVolumeSource.HostPath is nil") } path := spec.PersistentVolume.Spec.HostPath.Path return &hostPathRecycler{ - name: spec.Name(), - path: path, - host: host, - config: config, - timeout: volume.CalculateTimeoutForVolume(config.RecyclerMinimumTimeout, config.RecyclerTimeoutIncrement, spec.PersistentVolume), - pvName: pvName, + name: spec.Name(), + path: path, + host: host, + config: config, + timeout: volume.CalculateTimeoutForVolume(config.RecyclerMinimumTimeout, config.RecyclerTimeoutIncrement, spec.PersistentVolume), + pvName: pvName, + eventRecorder: eventRecorder, }, nil } @@ -234,7 +235,8 @@ type hostPathRecycler struct { config volume.VolumeConfig timeout int64 volume.MetricsNil - pvName string + pvName string + eventRecorder volume.RecycleEventRecorder } func (r *hostPathRecycler) GetPath() string { @@ -253,7 +255,7 @@ func (r *hostPathRecycler) Recycle() error { Path: r.path, }, } - return volume.RecycleVolumeByWatchingPodUntilCompletion(r.pvName, pod, r.host.GetKubeClient()) + return volume.RecycleVolumeByWatchingPodUntilCompletion(r.pvName, pod, r.host.GetKubeClient(), r.eventRecorder) } // hostPathProvisioner implements a Provisioner for the HostPath plugin diff --git a/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go b/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go index 4ca95781b6..a7eb34a000 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go @@ -46,7 +46,7 @@ func ProbeVolumePlugins(volumeConfig volume.VolumeConfig) []volume.VolumePlugin type nfsPlugin struct { host volume.VolumeHost // decouple creating recyclers by deferring to a function. Allows for easier testing. - newRecyclerFunc func(pvName string, spec *volume.Spec, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) + newRecyclerFunc func(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) config volume.VolumeConfig } @@ -132,8 +132,8 @@ func (plugin *nfsPlugin) newUnmounterInternal(volName string, podUID types.UID, }}, nil } -func (plugin *nfsPlugin) NewRecycler(pvName string, spec *volume.Spec) (volume.Recycler, error) { - return plugin.newRecyclerFunc(pvName, spec, plugin.host, plugin.config) +func (plugin *nfsPlugin) NewRecycler(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder) (volume.Recycler, error) { + return plugin.newRecyclerFunc(pvName, spec, eventRecorder, plugin.host, plugin.config) } func (plugin *nfsPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) { @@ -274,18 +274,19 @@ func (c *nfsUnmounter) TearDownAt(dir string) error { return nil } -func newRecycler(pvName string, spec *volume.Spec, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) { +func newRecycler(pvName string, spec *volume.Spec, eventRecorder volume.RecycleEventRecorder, host volume.VolumeHost, volumeConfig volume.VolumeConfig) (volume.Recycler, error) { if spec.PersistentVolume == nil || spec.PersistentVolume.Spec.NFS == nil { return nil, fmt.Errorf("spec.PersistentVolumeSource.NFS is nil") } return &nfsRecycler{ - name: spec.Name(), - server: spec.PersistentVolume.Spec.NFS.Server, - path: spec.PersistentVolume.Spec.NFS.Path, - host: host, - config: volumeConfig, - timeout: volume.CalculateTimeoutForVolume(volumeConfig.RecyclerMinimumTimeout, volumeConfig.RecyclerTimeoutIncrement, spec.PersistentVolume), - pvName: pvName, + name: spec.Name(), + server: spec.PersistentVolume.Spec.NFS.Server, + path: spec.PersistentVolume.Spec.NFS.Path, + host: host, + config: volumeConfig, + timeout: volume.CalculateTimeoutForVolume(volumeConfig.RecyclerMinimumTimeout, volumeConfig.RecyclerTimeoutIncrement, spec.PersistentVolume), + pvName: pvName, + eventRecorder: eventRecorder, }, nil } @@ -298,7 +299,8 @@ type nfsRecycler struct { config volume.VolumeConfig timeout int64 volume.MetricsNil - pvName string + pvName string + eventRecorder volume.RecycleEventRecorder } func (r *nfsRecycler) GetPath() string { @@ -318,7 +320,7 @@ func (r *nfsRecycler) Recycle() error { Path: r.path, }, } - return volume.RecycleVolumeByWatchingPodUntilCompletion(r.pvName, pod, r.host.GetKubeClient()) + return volume.RecycleVolumeByWatchingPodUntilCompletion(r.pvName, pod, r.host.GetKubeClient(), r.eventRecorder) } func getVolumeSource(spec *volume.Spec) (*api.NFSVolumeSource, bool, error) { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go index 8dd1b6a2e2..6e87cd225f 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/plugins.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/plugins.go @@ -124,9 +124,12 @@ type PersistentVolumePlugin interface { // again to new claims type RecyclableVolumePlugin interface { VolumePlugin - // NewRecycler creates a new volume.Recycler which knows how to reclaim - // this resource after the volume's release from a PersistentVolumeClaim - NewRecycler(pvName string, spec *Spec) (Recycler, error) + // NewRecycler creates a new volume.Recycler which knows how to reclaim this + // resource after the volume's release from a PersistentVolumeClaim. The + // recycler will use the provided recorder to write any events that might be + // interesting to user. It's expected that caller will pass these events to + // the PV being recycled. + NewRecycler(pvName string, spec *Spec, eventRecorder RecycleEventRecorder) (Recycler, error) } // DeletableVolumePlugin is an extended interface of VolumePlugin and is used diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util.go index 19a3afae9c..21d222f3bf 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util.go @@ -19,13 +19,10 @@ package volume import ( "fmt" "reflect" - "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" "hash/fnv" @@ -39,6 +36,8 @@ import ( "k8s.io/kubernetes/pkg/util/sets" ) +type RecycleEventRecorder func(eventtype, message string) + // RecycleVolumeByWatchingPodUntilCompletion is intended for use with volume // Recyclers. This function will save the given Pod to the API and watch it // until it completes, fails, or the pod's ActiveDeadlineSeconds is exceeded, @@ -52,8 +51,8 @@ import ( // pod - the pod designed by a volume plugin to recycle the volume. pod.Name // will be overwritten with unique name based on PV.Name. // client - kube client for API operations. -func RecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *api.Pod, kubeClient clientset.Interface) error { - return internalRecycleVolumeByWatchingPodUntilCompletion(pvName, pod, newRecyclerClient(kubeClient)) +func RecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *api.Pod, kubeClient clientset.Interface, recorder RecycleEventRecorder) error { + return internalRecycleVolumeByWatchingPodUntilCompletion(pvName, pod, newRecyclerClient(kubeClient, recorder)) } // same as above func comments, except 'recyclerClient' is a narrower pod API @@ -67,34 +66,61 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *api.P pod.Name = "recycler-for-" + pvName pod.GenerateName = "" + stopChannel := make(chan struct{}) + defer close(stopChannel) + podCh, err := recyclerClient.WatchPod(pod.Name, pod.Namespace, stopChannel) + if err != nil { + glog.V(4).Infof("cannot start watcher for pod %s/%s: %v", pod.Namespace, pod.Name, err) + return err + } + // Start the pod - _, err := recyclerClient.CreatePod(pod) + _, err = recyclerClient.CreatePod(pod) if err != nil { if errors.IsAlreadyExists(err) { glog.V(5).Infof("old recycler pod %q found for volume", pod.Name) } else { - return fmt.Errorf("Unexpected error creating recycler pod: %+v\n", err) + return fmt.Errorf("unexpected error creating recycler pod: %+v\n", err) } } defer recyclerClient.DeletePod(pod.Name, pod.Namespace) - // Now only the old pod or the new pod run. Watch it until it finishes. - stopChannel := make(chan struct{}) - defer close(stopChannel) - nextPod := recyclerClient.WatchPod(pod.Name, pod.Namespace, stopChannel) - + // Now only the old pod or the new pod run. Watch it until it finishes + // and send all events on the pod to the PV for { - watchedPod := nextPod() - if watchedPod.Status.Phase == api.PodSucceeded { - // volume.Recycle() returns nil on success, else error - return nil - } - if watchedPod.Status.Phase == api.PodFailed { - // volume.Recycle() returns nil on success, else error - if watchedPod.Status.Message != "" { - return fmt.Errorf(watchedPod.Status.Message) - } else { - return fmt.Errorf("pod failed, pod.Status.Message unknown.") + event := <-podCh + switch event.Object.(type) { + case *api.Pod: + // POD changed + pod := event.Object.(*api.Pod) + glog.V(4).Infof("recycler pod update received: %s %s/%s %s", event.Type, pod.Namespace, pod.Name, pod.Status.Phase) + switch event.Type { + case watch.Added, watch.Modified: + if pod.Status.Phase == api.PodSucceeded { + // Recycle succeeded. + return nil + } + if pod.Status.Phase == api.PodFailed { + if pod.Status.Message != "" { + return fmt.Errorf(pod.Status.Message) + } else { + return fmt.Errorf("pod failed, pod.Status.Message unknown.") + } + } + + case watch.Deleted: + return fmt.Errorf("recycler pod was deleted") + + case watch.Error: + return fmt.Errorf("recycler pod watcher failed") + } + + case *api.Event: + // Event received + podEvent := event.Object.(*api.Event) + glog.V(4).Infof("recycler event received: %s %s/%s %s/%s %s", event.Type, podEvent.Namespace, podEvent.Name, podEvent.InvolvedObject.Namespace, podEvent.InvolvedObject.Name, podEvent.Message) + if event.Type == watch.Added { + recyclerClient.Event(podEvent.Type, podEvent.Message) } } } @@ -106,15 +132,24 @@ type recyclerClient interface { CreatePod(pod *api.Pod) (*api.Pod, error) GetPod(name, namespace string) (*api.Pod, error) DeletePod(name, namespace string) error - WatchPod(name, namespace string, stopChannel chan struct{}) func() *api.Pod + // WatchPod returns a ListWatch for watching a pod. The stopChannel is used + // to close the reflector backing the watch. The caller is responsible for + // derring a close on the channel to stop the reflector. + WatchPod(name, namespace string, stopChannel chan struct{}) (<-chan watch.Event, error) + // Event sends an event to the volume that is being recycled. + Event(eventtype, message string) } -func newRecyclerClient(client clientset.Interface) recyclerClient { - return &realRecyclerClient{client} +func newRecyclerClient(client clientset.Interface, recorder RecycleEventRecorder) recyclerClient { + return &realRecyclerClient{ + client, + recorder, + } } type realRecyclerClient struct { - client clientset.Interface + client clientset.Interface + recorder RecycleEventRecorder } func (c *realRecyclerClient) CreatePod(pod *api.Pod) (*api.Pod, error) { @@ -129,28 +164,60 @@ func (c *realRecyclerClient) DeletePod(name, namespace string) error { return c.client.Core().Pods(namespace).Delete(name, nil) } -// WatchPod returns a ListWatch for watching a pod. The stopChannel is used -// to close the reflector backing the watch. The caller is responsible for -// derring a close on the channel to stop the reflector. -func (c *realRecyclerClient) WatchPod(name, namespace string, stopChannel chan struct{}) func() *api.Pod { - fieldSelector, _ := fields.ParseSelector("metadata.name=" + name) +func (c *realRecyclerClient) Event(eventtype, message string) { + c.recorder(eventtype, message) +} - podLW := &cache.ListWatch{ - ListFunc: func(options api.ListOptions) (runtime.Object, error) { - options.FieldSelector = fieldSelector - return c.client.Core().Pods(namespace).List(options) - }, - WatchFunc: func(options api.ListOptions) (watch.Interface, error) { - options.FieldSelector = fieldSelector - return c.client.Core().Pods(namespace).Watch(options) - }, +func (c *realRecyclerClient) WatchPod(name, namespace string, stopChannel chan struct{}) (<-chan watch.Event, error) { + podSelector, _ := fields.ParseSelector("metadata.name=" + name) + options := api.ListOptions{ + FieldSelector: podSelector, + Watch: true, } - queue := cache.NewFIFO(cache.MetaNamespaceKeyFunc) - cache.NewReflector(podLW, &api.Pod{}, queue, 1*time.Minute).RunUntil(stopChannel) - return func() *api.Pod { - return cache.Pop(queue).(*api.Pod) + podWatch, err := c.client.Core().Pods(namespace).Watch(options) + if err != nil { + return nil, err } + + eventSelector, _ := fields.ParseSelector("involvedObject.name=" + name) + eventWatch, err := c.client.Core().Events(namespace).Watch(api.ListOptions{ + FieldSelector: eventSelector, + Watch: true, + }) + if err != nil { + podWatch.Stop() + return nil, err + } + + eventCh := make(chan watch.Event, 0) + + go func() { + defer eventWatch.Stop() + defer podWatch.Stop() + defer close(eventCh) + + for { + select { + case _ = <-stopChannel: + return + + case podEvent, ok := <-podWatch.ResultChan(): + if !ok { + return + } + eventCh <- podEvent + + case eventEvent, ok := <-eventWatch.ResultChan(): + if !ok { + return + } + eventCh <- eventEvent + } + } + }() + + return eventCh, nil } // CalculateTimeoutForVolume calculates time for a Recycler pod to complete a diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision/admission.go index 4b06f63df1..f1f3eda157 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -19,6 +19,7 @@ package autoprovision import ( "io" + "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "fmt" @@ -26,8 +27,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" ) func init() { @@ -42,7 +42,7 @@ func init() { type provision struct { *admission.Handler client clientset.Interface - namespaceInformer framework.SharedIndexInformer + namespaceInformer cache.SharedIndexInformer } var _ = admission.WantsInformerFactory(&provision{}) diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/exists/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/exists/admission.go index e20e3b4ea7..292d44f7fc 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/exists/admission.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/exists/admission.go @@ -19,6 +19,7 @@ package exists import ( "io" + "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "fmt" @@ -26,8 +27,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" ) func init() { @@ -42,7 +42,7 @@ func init() { type exists struct { *admission.Handler client clientset.Interface - namespaceInformer framework.SharedIndexInformer + namespaceInformer cache.SharedIndexInformer } var _ = admission.WantsInformerFactory(&exists{}) diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle/admission.go b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle/admission.go index 212bd6d009..29eea68819 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -23,9 +23,9 @@ import ( lru "github.com/hashicorp/golang-lru" + "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/controller/framework" - "k8s.io/kubernetes/pkg/controller/framework/informers" + "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" @@ -52,7 +52,7 @@ type lifecycle struct { *admission.Handler client clientset.Interface immortalNamespaces sets.String - namespaceInformer framework.SharedIndexInformer + namespaceInformer cache.SharedIndexInformer // forceLiveLookupCache holds a list of entries for namespaces that we have a strong reason to believe are stale in our local cache. // if a namespace is in this cache, then we will ignore our local state and always fetch latest from api server. forceLiveLookupCache *lru.Cache diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/error.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/error.go index 9190772567..a71cdb9aae 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/error.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/error.go @@ -18,6 +18,7 @@ package predicates import ( "fmt" + "k8s.io/kubernetes/pkg/api" ) diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go index f0dddc4c67..c316ed2208 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -968,7 +968,7 @@ func (c *PodAffinityChecker) getMatchingAntiAffinityTerms(pod *api.Pod, allPods if err != nil { return nil, err } - if affinity.PodAntiAffinity != nil { + if affinity != nil && affinity.PodAntiAffinity != nil { existingPodNode, err := c.info.GetNodeInfo(existingPod.Spec.NodeName) if err != nil { return nil, err diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go index d5264223a5..9f306a69d6 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go @@ -29,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/cache" client "k8s.io/kubernetes/pkg/client/unversioned" - "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/runtime" @@ -77,8 +76,8 @@ type ConfigFactory struct { // Close this to stop all reflectors StopEverything chan struct{} - scheduledPodPopulator *framework.Controller - nodePopulator *framework.Controller + scheduledPodPopulator *cache.Controller + nodePopulator *cache.Controller schedulerCache schedulercache.Cache @@ -125,11 +124,11 @@ func NewConfigFactory(client *client.Client, schedulerName string, hardPodAffini // We construct this here instead of in CreateFromKeys because // ScheduledPodLister is something we provide to plug in functions that // they may need to call. - c.ScheduledPodLister.Indexer, c.scheduledPodPopulator = framework.NewIndexerInformer( + c.ScheduledPodLister.Indexer, c.scheduledPodPopulator = cache.NewIndexerInformer( c.createAssignedNonTerminatedPodLW(), &api.Pod{}, 0, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: c.addPodToCache, UpdateFunc: c.updatePodInCache, DeleteFunc: c.deletePodFromCache, @@ -137,11 +136,11 @@ func NewConfigFactory(client *client.Client, schedulerName string, hardPodAffini cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) - c.NodeLister.Store, c.nodePopulator = framework.NewInformer( + c.NodeLister.Store, c.nodePopulator = cache.NewInformer( c.createNodeLW(), &api.Node{}, 0, - framework.ResourceEventHandlerFuncs{ + cache.ResourceEventHandlerFuncs{ AddFunc: c.addNodeToCache, UpdateFunc: c.updateNodeInCache, DeleteFunc: c.deleteNodeFromCache, diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go index 556aea3082..985f9ed0f7 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go @@ -244,12 +244,12 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error { cache.mu.Lock() defer cache.mu.Unlock() - _, ok := cache.podStates[key] + cachedstate, ok := cache.podStates[key] switch { // An assumed pod won't have Delete/Remove event. It needs to have Add event // before Remove event, in which case the state would change from Assumed to Added. case ok && !cache.assumedPods[key]: - err := cache.removePod(pod) + err := cache.removePod(cachedstate.pod) if err != nil { return err }