From 9c3da934a78621c31e215dda57909abaf882c322 Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Mon, 12 Dec 2016 18:39:38 -0800 Subject: [PATCH] Upgrade to k8s v1.5 --- Godeps/Godeps.json | 2273 +++--- docs/minikube_start.md | 2 +- .../app/controllermanager.go | 25 +- .../cmd/kube-proxy/app/conntrack.go | 2 +- .../cmd/kubelet/app/options/options.go | 1 + .../k8s.io/kubernetes/pkg/api/rest/delete.go | 10 +- vendor/k8s.io/kubernetes/pkg/api/rest/rest.go | 4 + .../kubernetes/pkg/api/v1/generated.proto | 2 +- vendor/k8s.io/kubernetes/pkg/api/v1/types.go | 2 +- .../pkg/api/v1/types_swagger_doc_generated.go | 2 +- .../pkg/api/validation/validation.go | 3 - .../pkg/apis/autoscaling/register.go | 1 + .../kubernetes/pkg/apis/autoscaling/v1/BUILD | 13 + .../kubernetes/pkg/apis/batch/register.go | 1 + .../apis/componentconfig/types.generated.go | 6127 +++++++++-------- .../pkg/apis/componentconfig/types.go | 3 + .../apis/componentconfig/v1alpha1/defaults.go | 3 + .../apis/componentconfig/v1alpha1/types.go | 2 + .../v1alpha1/zz_generated.conversion.go | 6 + .../v1alpha1/zz_generated.deepcopy.go | 7 + .../componentconfig/zz_generated.deepcopy.go | 1 + .../kubernetes/pkg/apis/extensions/types.go | 2 - .../apis/extensions/validation/validation.go | 3 + .../kubernetes/pkg/apiserver/api_installer.go | 10 +- .../kubernetes/pkg/apiserver/resthandler.go | 4 +- .../kubernetes/pkg/client/cache/reflector.go | 4 + .../pkg/client/record/events_cache.go | 4 +- .../typed/discovery/discovery_client.go | 49 +- .../providers/azure/azure_util.go | 9 +- .../pkg/controller/controller_utils.go | 2 +- .../pkg/controller/cronjob/controller.go | 1 + .../namespace/namespace_controller.go | 28 +- .../namespace/namespace_controller_utils.go | 6 +- .../pkg/controller/node/controller_utils.go | 1 + .../kubernetes/pkg/controller/petset/pet.go | 4 +- .../controller/podautoscaler/horizontal.go | 6 +- .../pkg/controller/podgc/gc_controller.go | 1 + .../pkg/controller/replicaset/replica_set.go | 28 + .../replication/replication_controller.go | 28 + .../controller/service/servicecontroller.go | 7 + .../pkg/controller/serviceaccount/BUILD | 1 + .../attachdetach/attach_detach_controller.go | 23 +- .../cache/actual_state_of_world.go | 8 + .../attachdetach/reconciler/reconciler.go | 4 +- .../statusupdater/node_status_updater.go | 12 +- .../generated/openapi/zz_generated.openapi.go | 50 +- .../kubelet/api/v1alpha1/runtime/api.pb.go | 3 +- .../kubelet/api/v1alpha1/runtime/api.proto | 3 +- .../kubernetes/pkg/kubelet/eviction/BUILD | 1 + .../pkg/kubelet/eviction/eviction_manager.go | 66 +- .../pkg/kubelet/eviction/helpers.go | 9 +- .../eviction/threshold_notifier_linux.go | 119 + .../threshold_notifier_unsupported.go | 27 + .../kubernetes/pkg/kubelet/eviction/types.go | 10 + .../k8s.io/kubernetes/pkg/kubelet/kubelet.go | 37 +- .../pkg/kubelet/kubelet_node_status.go | 11 +- .../kubernetes/pkg/kubelet/kubelet_volumes.go | 17 +- .../pkg/kubelet/network/hostport/hostport.go | 3 +- .../pkg/kubelet/pod/mirror_client.go | 2 +- .../pkg/kubelet/status/status_manager.go | 1 + .../desired_state_of_world_populator.go | 23 +- .../pkg/master/thirdparty/thirdparty.go | 3 + .../kubernetes/pkg/proxy/iptables/proxier.go | 9 +- .../pkg/registry/core/pod/etcd/BUILD | 2 + .../pkg/registry/core/pod/etcd/eviction.go | 108 +- .../pkg/registry/core/pod/rest/log.go | 5 + .../service/ipallocator/controller/repair.go | 2 +- .../portallocator/controller/repair.go | 2 +- .../pkg/registry/generic/registry/store.go | 3 +- .../k8s.io/kubernetes/pkg/storage/cacher.go | 30 +- .../kubernetes/pkg/util/flowcontrol/BUILD | 2 +- .../pkg/util/flowcontrol/throttle.go | 2 +- .../kubernetes/pkg/util/iptables/iptables.go | 8 + .../k8s.io/kubernetes/pkg/util/mount/mount.go | 13 +- .../kubernetes/pkg/util/mount/mount_linux.go | 6 +- .../k8s.io/kubernetes/pkg/util/rand/rand.go | 12 +- .../kubernetes/pkg/util/ratelimit/BUILD | 25 - .../kubernetes/pkg/util/ratelimit/bucket.go | 170 - .../kubernetes/pkg/util/strategicpatch/BUILD | 1 - .../pkg/util/strategicpatch/patch.go | 282 +- .../kubernetes/pkg/util/workqueue/BUILD | 2 +- .../util/workqueue/default_rate_limiters.go | 4 +- vendor/k8s.io/kubernetes/pkg/version/base.go | 6 +- .../kubernetes/pkg/volume/aws_ebs/aws_ebs.go | 33 +- .../pkg/volume/azure_dd/azure_dd.go | 2 +- .../kubernetes/pkg/volume/cinder/cinder.go | 2 +- .../kubernetes/pkg/volume/gce_pd/gce_pd.go | 2 +- .../kubernetes/pkg/volume/glusterfs/BUILD | 1 - .../pkg/volume/glusterfs/glusterfs.go | 18 +- .../kubernetes/pkg/volume/host_path/BUILD | 1 + .../pkg/volume/host_path/host_path.go | 7 +- vendor/k8s.io/kubernetes/pkg/volume/nfs/BUILD | 1 + .../k8s.io/kubernetes/pkg/volume/nfs/nfs.go | 7 +- .../pkg/volume/photon_pd/photon_pd.go | 15 +- vendor/k8s.io/kubernetes/pkg/volume/util.go | 7 +- .../operationexecutor/operation_executor.go | 22 +- .../k8s.io/kubernetes/pkg/volume/util/util.go | 2 +- .../kubernetes/pkg/volume/volume_linux.go | 11 + .../volume/vsphere_volume/vsphere_volume.go | 2 +- .../plugin/pkg/client/auth/gcp/gcp.go | 42 + .../algorithm/predicates/predicates.go | 12 +- .../plugin/pkg/scheduler/factory/factory.go | 25 +- .../plugin/pkg/scheduler/scheduler.go | 7 + .../pkg/scheduler/schedulercache/cache.go | 100 +- 104 files changed, 5217 insertions(+), 4916 deletions(-) create mode 100644 vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_linux.go create mode 100644 vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_unsupported.go delete mode 100644 vendor/k8s.io/kubernetes/pkg/util/ratelimit/BUILD delete mode 100644 vendor/k8s.io/kubernetes/pkg/util/ratelimit/bucket.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7b2153ebbf..d827ec5cf8 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -2848,2843 +2848,2838 @@ }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-apiserver/app/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-controller-manager/app/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kube-proxy/app/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/cmd/kubelet/app/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/admission", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/annotations", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/endpoints", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/errors/storage", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/meta", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/meta/metatypes", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/pod", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/resource", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/service", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/v1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/api/validation/path", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery/announced", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apimachinery/registered", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/latest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v0", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/abac/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/apps/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authentication/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/v1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v2alpha1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/certificates/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/policy/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/rbac/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/v1beta1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apis/storage/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/authenticator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/filters", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/openapi", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/apiserver/request", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/abac", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/authorizer/union", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/group", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/handlers", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/auth/user", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/capabilities", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/cache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/chaosclient", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/leaderelection", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/listers/batch/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/listers/core/internalversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/record", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/restclient", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/retry", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/testing/core", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/transport", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery/fake", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/typed/dynamic", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/auth", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/aws", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/azure", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/openstack", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/photon", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/certificates", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/cronjob", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/daemon", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/deployment", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/deployment/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/disruption", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/endpoint", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/garbagecollector", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/informers", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/job", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/namespace", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/node", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/petset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/podgc", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replicaset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/replication", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/resourcequota", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/route", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/service", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/serviceaccount", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/controller/volume/persistentvolume", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/conversion/queryparams", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/aws", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider/gcp", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/fieldpath", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/fields", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/generated/openapi", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/authorizer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/filters", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/mux", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/openapi", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/openapi/common", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/routes", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/routes/data/swagger", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/genericapiserver/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/healthz", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/httplog", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cadvisor", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/client", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cm", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/cm/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/config", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/container", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/custommetrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockershim", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockershim/cm", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockershim/remote", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/dockertools", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/envvars", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/events", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/eviction", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/images", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/kuberuntime", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/leaky", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/lifecycle", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/cni", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/exec", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/hairpin", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/hostport", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/network/kubenet", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pleg", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/pod", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/prober/results", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/remote", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/rkt", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/portforward", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/remotecommand", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/stats", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/server/streaming", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/status", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/sysctl", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/types", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/cache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/csr", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/format", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/ioutils", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/queue", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/util/sliceutils", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/cache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/populator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/labels", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/master", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/master/ports", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/master/thirdparty", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/exec", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/http", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/probe/tcp", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/config", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/healthcheck", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/iptables", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/userspace", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/proxy/winuserspace", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/evaluator/core", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/generic", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/quota/install", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/apps/petset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/apps/petset/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/apps/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authentication/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authentication/tokenreview", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/authorization/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/autoscaling/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/batch/cronjob", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/batch/cronjob/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/batch/job", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/batch/job/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/batch/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/cachesize", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/certificates/certificates", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/certificates/certificates/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/certificates/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/componentstatus", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/configmap", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/configmap/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/controller", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/controller/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/endpoint", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/endpoint/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/event", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/event/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/limitrange", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/limitrange/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/namespace", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/namespace/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/node", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/node/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/node/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/persistentvolume", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/persistentvolume/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/pod", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/pod/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/pod/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/podtemplate", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/podtemplate/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/rangeallocation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/resourcequota", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/resourcequota/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/secret", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/secret/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/allocator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/allocator/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/ipallocator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/portallocator", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/serviceaccount", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/controller/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/daemonset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/deployment", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/deployment/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/ingress", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/replicaset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/registry", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/generic/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/policy/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrole", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/policybased", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/policybased", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/role", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/role/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/role/policybased", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/rolebinding", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/policybased", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/storage/rest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/storage/storageclass", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/registry/storage/storageclass/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/routes", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/json", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/protobuf", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/recognizer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/streaming", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/versioning", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/apparmor", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/apparmor", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/capabilities", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/group", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/selinux", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/user", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/securitycontext", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/selection", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/serviceaccount", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/ssh", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/etcd3", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/storagebackend", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/storage/storagebackend/factory", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/types", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/async", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/bandwidth", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/cache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/cert", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chmod", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/chown", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/clock", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/config", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/configz", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/dbus", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/diff", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/ebtables", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/env", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/errors", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/exec", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flag", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flock", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flowcontrol", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/flushwriter", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/framer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/goroutinemap", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/hash", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/homedir", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream/spdy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/integer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/interrupt", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/intstr", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/io", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/iptables", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/json", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/jsonpath", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/keymutex", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/labels", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/limitwriter", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/maps", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/mount", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/net/sets", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/netsh", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/node", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/oom", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/parsers", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/pod", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/procfs", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/proxy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/rand", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" - }, - { - "ImportPath": "k8s.io/kubernetes/pkg/util/ratelimit", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/replicaset", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/resourcecontainer", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/rlimit", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/runtime", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/selinux", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sets", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/slice", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strategicpatch", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/strings", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/sysctl", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/system", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/term", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/uuid", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/validation/field", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wait", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/workqueue", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/workqueue/prometheus", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/wsstream", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/util/yaml", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/version", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/aws_ebs", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/azure_dd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/azure_file", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cephfs", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/cinder", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/configmap", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/downwardapi", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/empty_dir", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/fc", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flexvolume", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/flocker", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/gce_pd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/git_repo", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/glusterfs", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/host_path", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/iscsi", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/nfs", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/photon_pd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/quobyte", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/rbd", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/secret", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/operationexecutor", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/types", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/util/volumehelper", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/volume/vsphere_volume", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/pkg/watch/versioned", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/admit", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/alwayspullimages", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/antiaffinity", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/deny", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/exec", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/gc", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/imagepolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/initialresources", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/limitranger", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/autoprovision", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/exists", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/namespace/lifecycle", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/persistentvolume/label", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/podnodeselector", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/resourcequota", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/security/podsecuritypolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/securitycontext/scdeny", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/serviceaccount", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/admission/storageclass/default", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/keystone", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/password/passwordfile", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/anonymous", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/basicauth", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/headerrequest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/union", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/request/x509", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/oidc", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokenfile", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/webhook", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/auth/authorizer/webhook", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth/gcp", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/client/auth/oidc", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider/defaults", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/latest", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/v1", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/api/validation", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/factory", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/metrics", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/plugin/pkg/webhook", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/expansion", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/json", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/netutil", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/reflect", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" }, { "ImportPath": "k8s.io/kubernetes/third_party/forked/golang/template", - "Comment": "v1.5.0-beta.1", - "Rev": "8c6525e891be1c44cbdd6fcf53097a3adb11d68c" + "Comment": "v1.5.0", + "Rev": "58b7c16a52c03e4a849874602be42ee71afdcab1" } ] } diff --git a/docs/minikube_start.md b/docs/minikube_start.md index fa06b96054..148b33552e 100644 --- a/docs/minikube_start.md +++ b/docs/minikube_start.md @@ -27,7 +27,7 @@ minikube start --insecure-registry stringSlice Insecure Docker registries to pass to the Docker daemon --iso-url string Location of the minikube iso (default "https://storage.googleapis.com/minikube/minikube-0.7.iso") --kubernetes-version string The kubernetes version that the minikube VM will use (ex: v1.2.3) - OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.5.0-beta.1") + OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64) (default "v1.5.0") --kvm-network string The KVM network name. (only supported with KVM driver) (default "default") --memory int Amount of RAM allocated to the minikube VM (default 2048) --network-plugin string The name of the network plugin 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 dacd9cba92..17a87feb6b 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 @@ -369,11 +369,30 @@ func StartControllers(s *options.CMServer, kubeconfig *restclient.Config, rootCl // Find the list of namespaced resources via discovery that the namespace controller must manage namespaceKubeClient := client("namespace-controller") namespaceClientPool := dynamic.NewClientPool(restclient.AddUserAgent(kubeconfig, "namespace-controller"), restMapper, dynamic.LegacyAPIPathResolverFunc) - groupVersionResources, err := namespaceKubeClient.Discovery().ServerPreferredNamespacedResources() + // TODO: consider using a list-watch + cache here rather than polling + var gvrFn func() ([]unversioned.GroupVersionResource, error) + rsrcs, err := namespaceKubeClient.Discovery().ServerResources() if err != nil { - glog.Fatalf("Failed to get supported resources from server: %v", err) + glog.Fatalf("Failed to get group version resources: %v", err) } - namespaceController := namespacecontroller.NewNamespaceController(namespaceKubeClient, namespaceClientPool, groupVersionResources, s.NamespaceSyncPeriod.Duration, api.FinalizerKubernetes) + for _, rsrcList := range rsrcs { + for ix := range rsrcList.APIResources { + rsrc := &rsrcList.APIResources[ix] + if rsrc.Kind == "ThirdPartyResource" { + gvrFn = namespaceKubeClient.Discovery().ServerPreferredNamespacedResources + } + } + } + if gvrFn == nil { + gvr, err := namespaceKubeClient.Discovery().ServerPreferredNamespacedResources() + if err != nil { + glog.Fatalf("Failed to get resources: %v", err) + } + gvrFn = func() ([]unversioned.GroupVersionResource, error) { + return gvr, nil + } + } + namespaceController := namespacecontroller.NewNamespaceController(namespaceKubeClient, namespaceClientPool, gvrFn, s.NamespaceSyncPeriod.Duration, api.FinalizerKubernetes) go namespaceController.Run(int(s.ConcurrentNamespaceSyncs), wait.NeverStop) time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter)) diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/conntrack.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/conntrack.go index a7e982f036..e1180c3f89 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/conntrack.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/conntrack.go @@ -98,7 +98,7 @@ func isSysFSWritable() (bool, error) { for _, mountPoint := range mountPoints { const sysfsDevice = "sysfs" - if mountPoint.Device != sysfsDevice { + if mountPoint.Type != sysfsDevice { continue } // Check whether sysfs is 'rw' diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go index 610701e8eb..7959735c24 100644 --- a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go +++ b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go @@ -246,6 +246,7 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) { fs.DurationVar(&s.EvictionPressureTransitionPeriod.Duration, "eviction-pressure-transition-period", s.EvictionPressureTransitionPeriod.Duration, "Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition.") fs.Int32Var(&s.EvictionMaxPodGracePeriod, "eviction-max-pod-grace-period", s.EvictionMaxPodGracePeriod, "Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. If negative, defer to pod specified value.") fs.StringVar(&s.EvictionMinimumReclaim, "eviction-minimum-reclaim", s.EvictionMinimumReclaim, "A set of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure.") + fs.BoolVar(&s.ExperimentalKernelMemcgNotification, "experimental-kernel-memcg-notification", s.ExperimentalKernelMemcgNotification, "If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.") fs.Int32Var(&s.PodsPerCore, "pods-per-core", s.PodsPerCore, "Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit.") fs.BoolVar(&s.ProtectKernelDefaults, "protect-kernel-defaults", s.ProtectKernelDefaults, "Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.") diff --git a/vendor/k8s.io/kubernetes/pkg/api/rest/delete.go b/vendor/k8s.io/kubernetes/pkg/api/rest/delete.go index 5a76f214a6..3f853d8c54 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/rest/delete.go +++ b/vendor/k8s.io/kubernetes/pkg/api/rest/delete.go @@ -80,7 +80,15 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx api.Context, obj runtime.Obje // if we are already being deleted, we may only shorten the deletion grace period // this means the object was gracefully deleted previously but deletionGracePeriodSeconds was not set, // so we force deletion immediately - if objectMeta.DeletionGracePeriodSeconds == nil { + // IMPORTANT: + // The deletion operation happens in two phases. + // 1. Update to set DeletionGracePeriodSeconds and DeletionTimestamp + // 2. Delete the object from storage. + // If the update succeeds, but the delete fails (network error, internal storage error, etc.), + // a resource was previously left in a state that was non-recoverable. We + // check if the existing stored resource has a grace period as 0 and if so + // attempt to delete immediately in order to recover from this scenario. + if objectMeta.DeletionGracePeriodSeconds == nil || *objectMeta.DeletionGracePeriodSeconds == 0 { return false, false, nil } // only a shorter grace period may be provided by a user diff --git a/vendor/k8s.io/kubernetes/pkg/api/rest/rest.go b/vendor/k8s.io/kubernetes/pkg/api/rest/rest.go index c4dd06e079..2098ccdbe7 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/rest/rest.go +++ b/vendor/k8s.io/kubernetes/pkg/api/rest/rest.go @@ -289,6 +289,10 @@ type StorageMetadata interface { // ProducesMIMETypes returns a list of the MIME types the specified HTTP verb (GET, POST, DELETE, // PATCH) can respond with. ProducesMIMETypes(verb string) []string + + // ProducesObject returns an object the specified HTTP verb respond with. It will overwrite storage object if + // it is not nil. Only the type of the return object matters, the value will be ignored. + ProducesObject(verb string) interface{} } // ConnectRequest is an object passed to admission control for Connect operations diff --git a/vendor/k8s.io/kubernetes/pkg/api/v1/generated.proto b/vendor/k8s.io/kubernetes/pkg/api/v1/generated.proto index 0599bb1ecb..f6fa8a4a12 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/v1/generated.proto +++ b/vendor/k8s.io/kubernetes/pkg/api/v1/generated.proto @@ -1514,7 +1514,7 @@ message NodeSpec { optional string providerID = 3; // Unschedulable controls node schedulability of new pods. By default, node is schedulable. - // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration"` + // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" // +optional optional bool unschedulable = 4; } diff --git a/vendor/k8s.io/kubernetes/pkg/api/v1/types.go b/vendor/k8s.io/kubernetes/pkg/api/v1/types.go index 4d729bd9e8..cc8abfa958 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/v1/types.go +++ b/vendor/k8s.io/kubernetes/pkg/api/v1/types.go @@ -2818,7 +2818,7 @@ type NodeSpec struct { // +optional ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"` // Unschedulable controls node schedulability of new pods. By default, node is schedulable. - // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration"` + // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" // +optional Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"` } diff --git a/vendor/k8s.io/kubernetes/pkg/api/v1/types_swagger_doc_generated.go b/vendor/k8s.io/kubernetes/pkg/api/v1/types_swagger_doc_generated.go index 5620489b30..7322cea87e 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/v1/types_swagger_doc_generated.go +++ b/vendor/k8s.io/kubernetes/pkg/api/v1/types_swagger_doc_generated.go @@ -901,7 +901,7 @@ var map_NodeSpec = map[string]string{ "podCIDR": "PodCIDR represents the pod IP range assigned to the node.", "externalID": "External ID of the node assigned by some machine database (e.g. a cloud provider). Deprecated.", "providerID": "ID of the node assigned by the cloud provider in the format: ://", - "unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"`", + "unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"", } func (NodeSpec) SwaggerDoc() map[string]string { diff --git a/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go index ea84cb1b0f..1c24a0d8c7 100644 --- a/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/api/validation/validation.go @@ -2665,9 +2665,6 @@ func ValidateServiceUpdate(service, oldService *api.Service) field.ErrorList { } } - // TODO(freehan): allow user to update loadbalancerSourceRanges - allErrs = append(allErrs, ValidateImmutableField(service.Spec.LoadBalancerSourceRanges, oldService.Spec.LoadBalancerSourceRanges, field.NewPath("spec", "loadBalancerSourceRanges"))...) - allErrs = append(allErrs, validateServiceFields(service)...) allErrs = append(allErrs, validateServiceAnnotations(service, oldService)...) return allErrs diff --git a/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/register.go b/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/register.go index 0eed5d2c33..0319dad2e6 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/register.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/register.go @@ -50,6 +50,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &HorizontalPodAutoscaler{}, &HorizontalPodAutoscalerList{}, &api.ListOptions{}, + &api.DeleteOptions{}, ) return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/v1/BUILD b/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/v1/BUILD index baad5554dd..04ef35ab65 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/v1/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/apis/autoscaling/v1/BUILD @@ -37,3 +37,16 @@ go_library( "//vendor:github.com/ugorji/go/codec", ], ) + +go_test( + name = "go_default_xtest", + srcs = ["defaults_test.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/install:go_default_library", + "//pkg/apis/autoscaling/install:go_default_library", + "//pkg/apis/autoscaling/v1:go_default_library", + "//pkg/runtime:go_default_library", + ], +) diff --git a/vendor/k8s.io/kubernetes/pkg/apis/batch/register.go b/vendor/k8s.io/kubernetes/pkg/apis/batch/register.go index 3654268f39..56cc0ec99a 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/batch/register.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/batch/register.go @@ -52,6 +52,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CronJob{}, &CronJobList{}, &api.ListOptions{}, + &api.DeleteOptions{}, ) scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJob"), &CronJob{}) scheme.AddKnownTypeWithName(SchemeGroupVersion.WithKind("ScheduledJobList"), &CronJobList{}) 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 e11812acce..c872496ea7 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.generated.go @@ -1393,7 +1393,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep153 := !z.EncBinary() yy2arr153 := z.EncBasicHandle().StructToArray - var yyq153 [113]bool + var yyq153 [114]bool _, _, _ = yysep153, yyq153, yy2arr153 const yyr153 bool = false yyq153[0] = x.Kind != "" @@ -1419,15 +1419,15 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yyq153[97] = true yyq153[98] = x.EvictionMaxPodGracePeriod != 0 yyq153[99] = x.EvictionMinimumReclaim != "" - yyq153[108] = len(x.AllowedUnsafeSysctls) != 0 - yyq153[110] = x.EnableCRI != false - yyq153[111] = x.ExperimentalFailSwapOn != false - yyq153[112] = x.ExperimentalCheckNodeCapabilitiesBeforeMount != false + yyq153[109] = len(x.AllowedUnsafeSysctls) != 0 + yyq153[111] = x.EnableCRI != false + yyq153[112] = x.ExperimentalFailSwapOn != false + yyq153[113] = x.ExperimentalCheckNodeCapabilitiesBeforeMount != false var yynn153 int if yyr153 || yy2arr153 { - r.EncodeArrayStart(113) + r.EncodeArrayStart(114) } else { - yynn153 = 86 + yynn153 = 87 for _, b := range yyq153 { if b { yynn153++ @@ -3584,17 +3584,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym477 if false { } else { - r.EncodeInt(int64(x.PodsPerCore)) + r.EncodeBool(bool(x.ExperimentalKernelMemcgNotification)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podsPerCore")) + r.EncodeString(codecSelferC_UTF81234, string("experimentalKernelMemcgNotification")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym478 := z.EncBinary() _ = yym478 if false { } else { - r.EncodeInt(int64(x.PodsPerCore)) + r.EncodeBool(bool(x.ExperimentalKernelMemcgNotification)) } } if yyr153 || yy2arr153 { @@ -3602,6 +3602,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym480 := z.EncBinary() _ = yym480 if false { + } else { + r.EncodeInt(int64(x.PodsPerCore)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("podsPerCore")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym481 := z.EncBinary() + _ = yym481 + if false { + } else { + r.EncodeInt(int64(x.PodsPerCore)) + } + } + if yyr153 || yy2arr153 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym483 := z.EncBinary() + _ = yym483 + if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) } @@ -3609,8 +3628,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableControllerAttachDetach")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym481 := z.EncBinary() - _ = yym481 + yym484 := z.EncBinary() + _ = yym484 if false { } else { r.EncodeBool(bool(x.EnableControllerAttachDetach)) @@ -3621,8 +3640,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.SystemReserved == nil { r.EncodeNil() } else { - yym483 := z.EncBinary() - _ = yym483 + yym486 := z.EncBinary() + _ = yym486 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3636,8 +3655,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.SystemReserved == nil { r.EncodeNil() } else { - yym484 := z.EncBinary() - _ = yym484 + yym487 := z.EncBinary() + _ = yym487 if false { } else if z.HasExtensions() && z.EncExt(x.SystemReserved) { } else { @@ -3650,8 +3669,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.KubeReserved == nil { r.EncodeNil() } else { - yym486 := z.EncBinary() - _ = yym486 + yym489 := z.EncBinary() + _ = yym489 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3665,8 +3684,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x.KubeReserved == nil { r.EncodeNil() } else { - yym487 := z.EncBinary() - _ = yym487 + yym490 := z.EncBinary() + _ = yym490 if false { } else if z.HasExtensions() && z.EncExt(x.KubeReserved) { } else { @@ -3676,8 +3695,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr153 || yy2arr153 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym489 := z.EncBinary() - _ = yym489 + yym492 := z.EncBinary() + _ = yym492 if false { } else { r.EncodeBool(bool(x.ProtectKernelDefaults)) @@ -3686,30 +3705,11 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("protectKernelDefaults")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym490 := z.EncBinary() - _ = yym490 - if false { - } else { - r.EncodeBool(bool(x.ProtectKernelDefaults)) - } - } - if yyr153 || yy2arr153 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym492 := z.EncBinary() - _ = yym492 - if false { - } else { - r.EncodeBool(bool(x.MakeIPTablesUtilChains)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("makeIPTablesUtilChains")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) yym493 := z.EncBinary() _ = yym493 if false { } else { - r.EncodeBool(bool(x.MakeIPTablesUtilChains)) + r.EncodeBool(bool(x.ProtectKernelDefaults)) } } if yyr153 || yy2arr153 { @@ -3718,17 +3718,17 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym495 if false { } else { - r.EncodeInt(int64(x.IPTablesMasqueradeBit)) + r.EncodeBool(bool(x.MakeIPTablesUtilChains)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) + r.EncodeString(codecSelferC_UTF81234, string("makeIPTablesUtilChains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym496 := z.EncBinary() _ = yym496 if false { } else { - r.EncodeInt(int64(x.IPTablesMasqueradeBit)) + r.EncodeBool(bool(x.MakeIPTablesUtilChains)) } } if yyr153 || yy2arr153 { @@ -3736,6 +3736,25 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym498 := z.EncBinary() _ = yym498 if false { + } else { + r.EncodeInt(int64(x.IPTablesMasqueradeBit)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("iptablesMasqueradeBit")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym499 := z.EncBinary() + _ = yym499 + if false { + } else { + r.EncodeInt(int64(x.IPTablesMasqueradeBit)) + } + } + if yyr153 || yy2arr153 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym501 := z.EncBinary() + _ = yym501 + if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) } @@ -3743,8 +3762,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("iptablesDropBit")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym499 := z.EncBinary() - _ = yym499 + yym502 := z.EncBinary() + _ = yym502 if false { } else { r.EncodeInt(int64(x.IPTablesDropBit)) @@ -3752,12 +3771,12 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr153 || yy2arr153 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq153[108] { + if yyq153[109] { if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym501 := z.EncBinary() - _ = yym501 + yym504 := z.EncBinary() + _ = yym504 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3767,15 +3786,15 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq153[108] { + if yyq153[109] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("experimentalAllowedUnsafeSysctls")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.AllowedUnsafeSysctls == nil { r.EncodeNil() } else { - yym502 := z.EncBinary() - _ = yym502 + yym505 := z.EncBinary() + _ = yym505 if false { } else { z.F.EncSliceStringV(x.AllowedUnsafeSysctls, false, e) @@ -3785,8 +3804,8 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr153 || yy2arr153 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym504 := z.EncBinary() - _ = yym504 + yym507 := z.EncBinary() + _ = yym507 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FeatureGates)) @@ -3795,38 +3814,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("featureGates")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym505 := z.EncBinary() - _ = yym505 + yym508 := z.EncBinary() + _ = yym508 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FeatureGates)) } } - if yyr153 || yy2arr153 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq153[110] { - yym507 := z.EncBinary() - _ = yym507 - if false { - } else { - r.EncodeBool(bool(x.EnableCRI)) - } - } else { - r.EncodeBool(false) - } - } else { - if yyq153[110] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("enableCRI")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym508 := z.EncBinary() - _ = yym508 - if false { - } else { - r.EncodeBool(bool(x.EnableCRI)) - } - } - } if yyr153 || yy2arr153 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq153[111] { @@ -3834,7 +3828,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym510 if false { } else { - r.EncodeBool(bool(x.ExperimentalFailSwapOn)) + r.EncodeBool(bool(x.EnableCRI)) } } else { r.EncodeBool(false) @@ -3842,13 +3836,13 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq153[111] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("experimentalFailSwapOn")) + r.EncodeString(codecSelferC_UTF81234, string("enableCRI")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym511 := z.EncBinary() _ = yym511 if false { } else { - r.EncodeBool(bool(x.ExperimentalFailSwapOn)) + r.EncodeBool(bool(x.EnableCRI)) } } } @@ -3859,7 +3853,7 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym513 if false { } else { - r.EncodeBool(bool(x.ExperimentalCheckNodeCapabilitiesBeforeMount)) + r.EncodeBool(bool(x.ExperimentalFailSwapOn)) } } else { r.EncodeBool(false) @@ -3867,11 +3861,36 @@ func (x *KubeletConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { if yyq153[112] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("ExperimentalCheckNodeCapabilitiesBeforeMount")) + r.EncodeString(codecSelferC_UTF81234, string("experimentalFailSwapOn")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym514 := z.EncBinary() _ = yym514 if false { + } else { + r.EncodeBool(bool(x.ExperimentalFailSwapOn)) + } + } + } + if yyr153 || yy2arr153 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq153[113] { + yym516 := z.EncBinary() + _ = yym516 + if false { + } else { + r.EncodeBool(bool(x.ExperimentalCheckNodeCapabilitiesBeforeMount)) + } + } else { + r.EncodeBool(false) + } + } else { + if yyq153[113] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("ExperimentalCheckNodeCapabilitiesBeforeMount")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym517 := z.EncBinary() + _ = yym517 + if false { } else { r.EncodeBool(bool(x.ExperimentalCheckNodeCapabilitiesBeforeMount)) } @@ -3890,25 +3909,25 @@ func (x *KubeletConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym515 := z.DecBinary() - _ = yym515 + yym518 := z.DecBinary() + _ = yym518 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct516 := r.ContainerType() - if yyct516 == codecSelferValueTypeMap1234 { - yyl516 := r.ReadMapStart() - if yyl516 == 0 { + yyct519 := r.ContainerType() + if yyct519 == codecSelferValueTypeMap1234 { + yyl519 := r.ReadMapStart() + if yyl519 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl516, d) + x.codecDecodeSelfFromMap(yyl519, d) } - } else if yyct516 == codecSelferValueTypeArray1234 { - yyl516 := r.ReadArrayStart() - if yyl516 == 0 { + } else if yyct519 == codecSelferValueTypeArray1234 { + yyl519 := r.ReadArrayStart() + if yyl519 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl516, d) + x.codecDecodeSelfFromArray(yyl519, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -3920,12 +3939,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys517Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys517Slc - var yyhl517 bool = l >= 0 - for yyj517 := 0; ; yyj517++ { - if yyhl517 { - if yyj517 >= l { + var yys520Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys520Slc + var yyhl520 bool = l >= 0 + for yyj520 := 0; ; yyj520++ { + if yyhl520 { + if yyj520 >= l { break } } else { @@ -3934,10 +3953,10 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys517Slc = r.DecodeBytes(yys517Slc, true, true) - yys517 := string(yys517Slc) + yys520Slc = r.DecodeBytes(yys520Slc, true, true) + yys520 := string(yys520Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys517 { + switch yys520 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -3960,45 +3979,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv521 := &x.SyncFrequency - yym522 := z.DecBinary() - _ = yym522 + yyv524 := &x.SyncFrequency + yym525 := z.DecBinary() + _ = yym525 if false { - } else if z.HasExtensions() && z.DecExt(yyv521) { - } else if !yym522 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv521) + } else if z.HasExtensions() && z.DecExt(yyv524) { + } else if !yym525 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv524) } else { - z.DecFallback(yyv521, false) + z.DecFallback(yyv524, false) } } case "fileCheckFrequency": if r.TryDecodeAsNil() { x.FileCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv523 := &x.FileCheckFrequency - yym524 := z.DecBinary() - _ = yym524 + yyv526 := &x.FileCheckFrequency + yym527 := z.DecBinary() + _ = yym527 if false { - } else if z.HasExtensions() && z.DecExt(yyv523) { - } else if !yym524 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv523) + } else if z.HasExtensions() && z.DecExt(yyv526) { + } else if !yym527 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv526) } else { - z.DecFallback(yyv523, false) + z.DecFallback(yyv526, false) } } case "httpCheckFrequency": if r.TryDecodeAsNil() { x.HTTPCheckFrequency = pkg1_unversioned.Duration{} } else { - yyv525 := &x.HTTPCheckFrequency - yym526 := z.DecBinary() - _ = yym526 + yyv528 := &x.HTTPCheckFrequency + yym529 := z.DecBinary() + _ = yym529 if false { - } else if z.HasExtensions() && z.DecExt(yyv525) { - } else if !yym526 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv525) + } else if z.HasExtensions() && z.DecExt(yyv528) { + } else if !yym529 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv528) } else { - z.DecFallback(yyv525, false) + z.DecFallback(yyv528, false) } } case "manifestURL": @@ -4059,15 +4078,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.Authentication = KubeletAuthentication{} } else { - yyv536 := &x.Authentication - yyv536.CodecDecodeSelf(d) + yyv539 := &x.Authentication + yyv539.CodecDecodeSelf(d) } case "authorization": if r.TryDecodeAsNil() { x.Authorization = KubeletAuthorization{} } else { - yyv537 := &x.Authorization - yyv537.CodecDecodeSelf(d) + yyv540 := &x.Authorization + yyv540.CodecDecodeSelf(d) } case "hostnameOverride": if r.TryDecodeAsNil() { @@ -4109,36 +4128,36 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv544 := &x.HostNetworkSources - yym545 := z.DecBinary() - _ = yym545 + yyv547 := &x.HostNetworkSources + yym548 := z.DecBinary() + _ = yym548 if false { } else { - z.F.DecSliceStringX(yyv544, false, d) + z.F.DecSliceStringX(yyv547, false, d) } } case "hostPIDSources": if r.TryDecodeAsNil() { x.HostPIDSources = nil } else { - yyv546 := &x.HostPIDSources - yym547 := z.DecBinary() - _ = yym547 + yyv549 := &x.HostPIDSources + yym550 := z.DecBinary() + _ = yym550 if false { } else { - z.F.DecSliceStringX(yyv546, false, d) + z.F.DecSliceStringX(yyv549, false, d) } } case "hostIPCSources": if r.TryDecodeAsNil() { x.HostIPCSources = nil } else { - yyv548 := &x.HostIPCSources - yym549 := z.DecBinary() - _ = yym549 + yyv551 := &x.HostIPCSources + yym552 := z.DecBinary() + _ = yym552 if false { } else { - z.F.DecSliceStringX(yyv548, false, d) + z.F.DecSliceStringX(yyv551, false, d) } } case "registryPullQPS": @@ -4175,15 +4194,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv555 := &x.MinimumGCAge - yym556 := z.DecBinary() - _ = yym556 + yyv558 := &x.MinimumGCAge + yym559 := z.DecBinary() + _ = yym559 if false { - } else if z.HasExtensions() && z.DecExt(yyv555) { - } else if !yym556 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv555) + } else if z.HasExtensions() && z.DecExt(yyv558) { + } else if !yym559 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv558) } else { - z.DecFallback(yyv555, false) + z.DecFallback(yyv558, false) } } case "maxPerPodContainerCount": @@ -4250,45 +4269,45 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv567 := &x.StreamingConnectionIdleTimeout - yym568 := z.DecBinary() - _ = yym568 + yyv570 := &x.StreamingConnectionIdleTimeout + yym571 := z.DecBinary() + _ = yym571 if false { - } else if z.HasExtensions() && z.DecExt(yyv567) { - } else if !yym568 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv567) + } else if z.HasExtensions() && z.DecExt(yyv570) { + } else if !yym571 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv570) } else { - z.DecFallback(yyv567, false) + z.DecFallback(yyv570, false) } } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} } else { - yyv569 := &x.NodeStatusUpdateFrequency - yym570 := z.DecBinary() - _ = yym570 + yyv572 := &x.NodeStatusUpdateFrequency + yym573 := z.DecBinary() + _ = yym573 if false { - } else if z.HasExtensions() && z.DecExt(yyv569) { - } else if !yym570 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv569) + } else if z.HasExtensions() && z.DecExt(yyv572) { + } else if !yym573 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv572) } else { - z.DecFallback(yyv569, false) + z.DecFallback(yyv572, false) } } case "imageMinimumGCAge": if r.TryDecodeAsNil() { x.ImageMinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv571 := &x.ImageMinimumGCAge - yym572 := z.DecBinary() - _ = yym572 + yyv574 := &x.ImageMinimumGCAge + yym575 := z.DecBinary() + _ = yym575 if false { - } else if z.HasExtensions() && z.DecExt(yyv571) { - } else if !yym572 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv571) + } else if z.HasExtensions() && z.DecExt(yyv574) { + } else if !yym575 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv574) } else { - z.DecFallback(yyv571, false) + z.DecFallback(yyv574, false) } } case "imageGCHighThresholdPercent": @@ -4313,15 +4332,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv576 := &x.VolumeStatsAggPeriod - yym577 := z.DecBinary() - _ = yym577 + yyv579 := &x.VolumeStatsAggPeriod + yym580 := z.DecBinary() + _ = yym580 if false { - } else if z.HasExtensions() && z.DecExt(yyv576) { - } else if !yym577 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv576) + } else if z.HasExtensions() && z.DecExt(yyv579) { + } else if !yym580 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv579) } else { - z.DecFallback(yyv576, false) + z.DecFallback(yyv579, false) } } case "networkPluginName": @@ -4430,15 +4449,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv595 := &x.RuntimeRequestTimeout - yym596 := z.DecBinary() - _ = yym596 + yyv598 := &x.RuntimeRequestTimeout + yym599 := z.DecBinary() + _ = yym599 if false { - } else if z.HasExtensions() && z.DecExt(yyv595) { - } else if !yym596 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv595) + } else if z.HasExtensions() && z.DecExt(yyv598) { + } else if !yym599 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv598) } else { - z.DecFallback(yyv595, false) + z.DecFallback(yyv598, false) } } case "rktPath": @@ -4577,15 +4596,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv619 := &x.OutOfDiskTransitionFrequency - yym620 := z.DecBinary() - _ = yym620 + yyv622 := &x.OutOfDiskTransitionFrequency + yym623 := z.DecBinary() + _ = yym623 if false { - } else if z.HasExtensions() && z.DecExt(yyv619) { - } else if !yym620 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv619) + } else if z.HasExtensions() && z.DecExt(yyv622) { + } else if !yym623 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv622) } else { - z.DecFallback(yyv619, false) + z.DecFallback(yyv622, false) } } case "nodeIP": @@ -4598,12 +4617,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv622 := &x.NodeLabels - yym623 := z.DecBinary() - _ = yym623 + yyv625 := &x.NodeLabels + yym626 := z.DecBinary() + _ = yym626 if false { } else { - z.F.DecMapStringStringX(yyv622, false, d) + z.F.DecMapStringStringX(yyv625, false, d) } } case "nonMasqueradeCIDR": @@ -4640,15 +4659,15 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv629 := &x.EvictionPressureTransitionPeriod - yym630 := z.DecBinary() - _ = yym630 + yyv632 := &x.EvictionPressureTransitionPeriod + yym633 := z.DecBinary() + _ = yym633 if false { - } else if z.HasExtensions() && z.DecExt(yyv629) { - } else if !yym630 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv629) + } else if z.HasExtensions() && z.DecExt(yyv632) { + } else if !yym633 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv632) } else { - z.DecFallback(yyv629, false) + z.DecFallback(yyv632, false) } } case "evictionMaxPodGracePeriod": @@ -4663,6 +4682,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } else { x.EvictionMinimumReclaim = string(r.DecodeString()) } + case "experimentalKernelMemcgNotification": + if r.TryDecodeAsNil() { + x.ExperimentalKernelMemcgNotification = false + } else { + x.ExperimentalKernelMemcgNotification = bool(r.DecodeBool()) + } case "podsPerCore": if r.TryDecodeAsNil() { x.PodsPerCore = 0 @@ -4679,26 +4704,26 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv635 := &x.SystemReserved - yym636 := z.DecBinary() - _ = yym636 + yyv639 := &x.SystemReserved + yym640 := z.DecBinary() + _ = yym640 if false { - } else if z.HasExtensions() && z.DecExt(yyv635) { + } else if z.HasExtensions() && z.DecExt(yyv639) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv635), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv639), d) } } case "kubeReserved": if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv637 := &x.KubeReserved - yym638 := z.DecBinary() - _ = yym638 + yyv641 := &x.KubeReserved + yym642 := z.DecBinary() + _ = yym642 if false { - } else if z.HasExtensions() && z.DecExt(yyv637) { + } else if z.HasExtensions() && z.DecExt(yyv641) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv637), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv641), d) } } case "protectKernelDefaults": @@ -4729,12 +4754,12 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv643 := &x.AllowedUnsafeSysctls - yym644 := z.DecBinary() - _ = yym644 + yyv647 := &x.AllowedUnsafeSysctls + yym648 := z.DecBinary() + _ = yym648 if false { } else { - z.F.DecSliceStringX(yyv643, false, d) + z.F.DecSliceStringX(yyv647, false, d) } } case "featureGates": @@ -4762,9 +4787,9 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.ExperimentalCheckNodeCapabilitiesBeforeMount = bool(r.DecodeBool()) } default: - z.DecStructFieldNotFound(-1, yys517) - } // end switch yys517 - } // end for yyj517 + z.DecStructFieldNotFound(-1, yys520) + } // end switch yys520 + } // end for yyj520 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -4772,16 +4797,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj649 int - var yyb649 bool - var yyhl649 bool = l >= 0 - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + var yyj653 int + var yyb653 bool + var yyhl653 bool = l >= 0 + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4791,13 +4816,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Kind = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4807,13 +4832,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.APIVersion = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4823,13 +4848,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodManifestPath = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4837,57 +4862,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SyncFrequency = pkg1_unversioned.Duration{} } else { - yyv653 := &x.SyncFrequency - yym654 := z.DecBinary() - _ = yym654 - if false { - } else if z.HasExtensions() && z.DecExt(yyv653) { - } else if !yym654 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv653) - } else { - z.DecFallback(yyv653, false) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} - } else { - yyv655 := &x.FileCheckFrequency - yym656 := z.DecBinary() - _ = yym656 - if false { - } else if z.HasExtensions() && z.DecExt(yyv655) { - } else if !yym656 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv655) - } else { - z.DecFallback(yyv655, false) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} - } else { - yyv657 := &x.HTTPCheckFrequency + yyv657 := &x.SyncFrequency yym658 := z.DecBinary() _ = yym658 if false { @@ -4898,13 +4873,63 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv657, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.FileCheckFrequency = pkg1_unversioned.Duration{} + } else { + yyv659 := &x.FileCheckFrequency + yym660 := z.DecBinary() + _ = yym660 + if false { + } else if z.HasExtensions() && z.DecExt(yyv659) { + } else if !yym660 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv659) + } else { + z.DecFallback(yyv659, false) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + } else { + yyv661 := &x.HTTPCheckFrequency + yym662 := z.DecBinary() + _ = yym662 + if false { + } else if z.HasExtensions() && z.DecExt(yyv661) { + } else if !yym662 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv661) + } else { + z.DecFallback(yyv661, false) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4914,13 +4939,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURL = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4930,13 +4955,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ManifestURLHeader = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4946,13 +4971,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableServer = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4962,13 +4987,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Address = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4978,13 +5003,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Port = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -4994,13 +5019,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReadOnlyPort = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5010,13 +5035,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSCertFile = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5026,13 +5051,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.TLSPrivateKeyFile = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5042,13 +5067,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CertDirectory = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5056,16 +5081,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.Authentication = KubeletAuthentication{} } else { - yyv668 := &x.Authentication - yyv668.CodecDecodeSelf(d) + yyv672 := &x.Authentication + yyv672.CodecDecodeSelf(d) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5073,16 +5098,16 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.Authorization = KubeletAuthorization{} } else { - yyv669 := &x.Authorization - yyv669.CodecDecodeSelf(d) + yyv673 := &x.Authorization + yyv673.CodecDecodeSelf(d) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5092,13 +5117,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HostnameOverride = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5108,13 +5133,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodInfraContainerImage = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5124,13 +5149,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerEndpoint = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5140,13 +5165,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RootDirectory = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5156,13 +5181,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SeccompProfileRoot = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5172,13 +5197,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.AllowPrivileged = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5186,51 +5211,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.HostNetworkSources = nil } else { - yyv676 := &x.HostNetworkSources - yym677 := z.DecBinary() - _ = yym677 - if false { - } else { - z.F.DecSliceStringX(yyv676, false, d) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HostPIDSources = nil - } else { - yyv678 := &x.HostPIDSources - yym679 := z.DecBinary() - _ = yym679 - if false { - } else { - z.F.DecSliceStringX(yyv678, false, d) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HostIPCSources = nil - } else { - yyv680 := &x.HostIPCSources + yyv680 := &x.HostNetworkSources yym681 := z.DecBinary() _ = yym681 if false { @@ -5238,13 +5219,57 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.F.DecSliceStringX(yyv680, false, d) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HostPIDSources = nil + } else { + yyv682 := &x.HostPIDSources + yym683 := z.DecBinary() + _ = yym683 + if false { + } else { + z.F.DecSliceStringX(yyv682, false, d) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HostIPCSources = nil + } else { + yyv684 := &x.HostIPCSources + yym685 := z.DecBinary() + _ = yym685 + if false { + } else { + z.F.DecSliceStringX(yyv684, false, d) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5254,13 +5279,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryPullQPS = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5270,13 +5295,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegistryBurst = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5286,13 +5311,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventRecordQPS = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5302,13 +5327,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EventBurst = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5318,13 +5343,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableDebuggingHandlers = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5332,24 +5357,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.MinimumGCAge = pkg1_unversioned.Duration{} } else { - yyv687 := &x.MinimumGCAge - yym688 := z.DecBinary() - _ = yym688 + yyv691 := &x.MinimumGCAge + yym692 := z.DecBinary() + _ = yym692 if false { - } else if z.HasExtensions() && z.DecExt(yyv687) { - } else if !yym688 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv687) + } else if z.HasExtensions() && z.DecExt(yyv691) { + } else if !yym692 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv691) } else { - z.DecFallback(yyv687, false) + z.DecFallback(yyv691, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5359,13 +5384,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPerPodContainerCount = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5375,13 +5400,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxContainerCount = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5391,13 +5416,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CAdvisorPort = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5407,13 +5432,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzPort = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5423,13 +5448,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HealthzBindAddress = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5439,13 +5464,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.OOMScoreAdj = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5455,13 +5480,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterNode = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5471,13 +5496,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDomain = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5487,13 +5512,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MasterServiceNamespace = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5503,13 +5528,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ClusterDNS = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5517,57 +5542,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} } else { - yyv699 := &x.StreamingConnectionIdleTimeout - yym700 := z.DecBinary() - _ = yym700 - if false { - } else if z.HasExtensions() && z.DecExt(yyv699) { - } else if !yym700 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv699) - } else { - z.DecFallback(yyv699, false) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} - } else { - yyv701 := &x.NodeStatusUpdateFrequency - yym702 := z.DecBinary() - _ = yym702 - if false { - } else if z.HasExtensions() && z.DecExt(yyv701) { - } else if !yym702 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv701) - } else { - z.DecFallback(yyv701, false) - } - } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l - } else { - yyb649 = r.CheckBreak() - } - if yyb649 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} - } else { - yyv703 := &x.ImageMinimumGCAge + yyv703 := &x.StreamingConnectionIdleTimeout yym704 := z.DecBinary() _ = yym704 if false { @@ -5578,13 +5553,63 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco z.DecFallback(yyv703, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + } else { + yyv705 := &x.NodeStatusUpdateFrequency + yym706 := z.DecBinary() + _ = yym706 + if false { + } else if z.HasExtensions() && z.DecExt(yyv705) { + } else if !yym706 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv705) + } else { + z.DecFallback(yyv705, false) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + } else { + yyv707 := &x.ImageMinimumGCAge + yym708 := z.DecBinary() + _ = yym708 + if false { + } else if z.HasExtensions() && z.DecExt(yyv707) { + } else if !yym708 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv707) + } else { + z.DecFallback(yyv707, false) + } + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5594,13 +5619,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCHighThresholdPercent = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5610,13 +5635,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ImageGCLowThresholdPercent = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5626,13 +5651,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LowDiskSpaceThresholdMB = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5640,24 +5665,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} } else { - yyv708 := &x.VolumeStatsAggPeriod - yym709 := z.DecBinary() - _ = yym709 + yyv712 := &x.VolumeStatsAggPeriod + yym713 := z.DecBinary() + _ = yym713 if false { - } else if z.HasExtensions() && z.DecExt(yyv708) { - } else if !yym709 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv708) + } else if z.HasExtensions() && z.DecExt(yyv712) { + } else if !yym713 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv712) } else { - z.DecFallback(yyv708, false) + z.DecFallback(yyv712, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5667,13 +5692,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginName = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5683,13 +5708,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginMTU = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5699,13 +5724,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NetworkPluginDir = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5715,13 +5740,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIConfDir = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5731,13 +5756,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CNIBinDir = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5747,13 +5772,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.VolumePluginDir = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5763,13 +5788,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudProvider = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5779,13 +5804,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5795,13 +5820,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeletCgroups = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5811,13 +5836,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalCgroupsPerQOS = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5827,13 +5852,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupDriver = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5843,13 +5868,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RuntimeCgroups = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5859,13 +5884,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SystemCgroups = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5875,13 +5900,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CgroupRoot = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5891,13 +5916,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContainerRuntime = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5907,13 +5932,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteRuntimeEndpoint = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5923,13 +5948,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RemoteImageEndpoint = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5937,24 +5962,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} } else { - yyv727 := &x.RuntimeRequestTimeout - yym728 := z.DecBinary() - _ = yym728 + yyv731 := &x.RuntimeRequestTimeout + yym732 := z.DecBinary() + _ = yym732 if false { - } else if z.HasExtensions() && z.DecExt(yyv727) { - } else if !yym728 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv727) + } else if z.HasExtensions() && z.DecExt(yyv731) { + } else if !yym732 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv731) } else { - z.DecFallback(yyv727, false) + z.DecFallback(yyv731, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5964,13 +5989,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktPath = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5980,13 +6005,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalMounterPath = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -5996,13 +6021,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktAPIEndpoint = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6012,13 +6037,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RktStage1Image = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6028,13 +6053,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.LockFilePath = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6044,13 +6069,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExitOnLockContention = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6060,13 +6085,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.HairpinMode = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6076,13 +6101,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.BabysitDaemons = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6092,13 +6117,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxPods = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6108,13 +6133,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NvidiaGPUs = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6124,13 +6149,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.DockerExecHandlerName = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6140,13 +6165,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodCIDR = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6156,13 +6181,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ResolverConfig = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6172,13 +6197,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.CPUCFSQuota = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6188,13 +6213,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Containerized = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6204,13 +6229,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MaxOpenFiles = int64(r.DecodeInt(64)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6220,13 +6245,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ReconcileCIDR = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6236,13 +6261,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.RegisterSchedulable = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6252,13 +6277,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ContentType = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6268,13 +6293,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIQPS = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6284,13 +6309,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6300,13 +6325,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.SerializeImagePulls = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6314,24 +6339,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} } else { - yyv751 := &x.OutOfDiskTransitionFrequency - yym752 := z.DecBinary() - _ = yym752 + yyv755 := &x.OutOfDiskTransitionFrequency + yym756 := z.DecBinary() + _ = yym756 if false { - } else if z.HasExtensions() && z.DecExt(yyv751) { - } else if !yym752 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv751) + } else if z.HasExtensions() && z.DecExt(yyv755) { + } else if !yym756 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv755) } else { - z.DecFallback(yyv751, false) + z.DecFallback(yyv755, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6341,13 +6366,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NodeIP = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6355,21 +6380,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.NodeLabels = nil } else { - yyv754 := &x.NodeLabels - yym755 := z.DecBinary() - _ = yym755 + yyv758 := &x.NodeLabels + yym759 := z.DecBinary() + _ = yym759 if false { } else { - z.F.DecMapStringStringX(yyv754, false, d) + z.F.DecMapStringStringX(yyv758, false, d) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6379,13 +6404,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.NonMasqueradeCIDR = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6395,13 +6420,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableCustomMetrics = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6411,13 +6436,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionHard = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6427,13 +6452,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoft = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6443,13 +6468,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionSoftGracePeriod = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6457,24 +6482,24 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} } else { - yyv761 := &x.EvictionPressureTransitionPeriod - yym762 := z.DecBinary() - _ = yym762 + yyv765 := &x.EvictionPressureTransitionPeriod + yym766 := z.DecBinary() + _ = yym766 if false { - } else if z.HasExtensions() && z.DecExt(yyv761) { - } else if !yym762 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv761) + } else if z.HasExtensions() && z.DecExt(yyv765) { + } else if !yym766 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv765) } else { - z.DecFallback(yyv761, false) + z.DecFallback(yyv765, false) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6484,13 +6509,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMaxPodGracePeriod = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6500,13 +6525,29 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EvictionMinimumReclaim = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ExperimentalKernelMemcgNotification = false + } else { + x.ExperimentalKernelMemcgNotification = bool(r.DecodeBool()) + } + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l + } else { + yyb653 = r.CheckBreak() + } + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6516,13 +6557,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.PodsPerCore = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6532,13 +6573,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableControllerAttachDetach = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6546,22 +6587,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.SystemReserved = nil } else { - yyv767 := &x.SystemReserved - yym768 := z.DecBinary() - _ = yym768 + yyv772 := &x.SystemReserved + yym773 := z.DecBinary() + _ = yym773 if false { - } else if z.HasExtensions() && z.DecExt(yyv767) { + } else if z.HasExtensions() && z.DecExt(yyv772) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv767), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv772), d) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6569,22 +6610,22 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.KubeReserved = nil } else { - yyv769 := &x.KubeReserved - yym770 := z.DecBinary() - _ = yym770 + yyv774 := &x.KubeReserved + yym775 := z.DecBinary() + _ = yym775 if false { - } else if z.HasExtensions() && z.DecExt(yyv769) { + } else if z.HasExtensions() && z.DecExt(yyv774) { } else { - h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv769), d) + h.decconfig_ConfigurationMap((*pkg2_config.ConfigurationMap)(yyv774), d) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6594,13 +6635,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ProtectKernelDefaults = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6610,13 +6651,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.MakeIPTablesUtilChains = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6626,13 +6667,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesMasqueradeBit = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6642,13 +6683,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.IPTablesDropBit = int32(r.DecodeInt(32)) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6656,21 +6697,21 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.AllowedUnsafeSysctls = nil } else { - yyv775 := &x.AllowedUnsafeSysctls - yym776 := z.DecBinary() - _ = yym776 + yyv780 := &x.AllowedUnsafeSysctls + yym781 := z.DecBinary() + _ = yym781 if false { } else { - z.F.DecSliceStringX(yyv775, false, d) + z.F.DecSliceStringX(yyv780, false, d) } } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6680,13 +6721,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.FeatureGates = string(r.DecodeString()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6696,13 +6737,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.EnableCRI = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6712,13 +6753,13 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.ExperimentalFailSwapOn = bool(r.DecodeBool()) } - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6729,17 +6770,17 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.ExperimentalCheckNodeCapabilitiesBeforeMount = bool(r.DecodeBool()) } for { - yyj649++ - if yyhl649 { - yyb649 = yyj649 > l + yyj653++ + if yyhl653 { + yyb653 = yyj653 > l } else { - yyb649 = r.CheckBreak() + yyb653 = r.CheckBreak() } - if yyb649 { + if yyb653 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj649-1, "") + z.DecStructFieldNotFound(yyj653-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -6748,8 +6789,8 @@ func (x KubeletAuthorizationMode) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym781 := z.EncBinary() - _ = yym781 + yym786 := z.EncBinary() + _ = yym786 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -6761,8 +6802,8 @@ func (x *KubeletAuthorizationMode) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym782 := z.DecBinary() - _ = yym782 + yym787 := z.DecBinary() + _ = yym787 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -6777,30 +6818,30 @@ func (x *KubeletAuthorization) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym783 := z.EncBinary() - _ = yym783 + yym788 := z.EncBinary() + _ = yym788 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep784 := !z.EncBinary() - yy2arr784 := z.EncBasicHandle().StructToArray - var yyq784 [2]bool - _, _, _ = yysep784, yyq784, yy2arr784 - const yyr784 bool = false - var yynn784 int - if yyr784 || yy2arr784 { + yysep789 := !z.EncBinary() + yy2arr789 := z.EncBasicHandle().StructToArray + var yyq789 [2]bool + _, _, _ = yysep789, yyq789, yy2arr789 + const yyr789 bool = false + var yynn789 int + if yyr789 || yy2arr789 { r.EncodeArrayStart(2) } else { - yynn784 = 2 - for _, b := range yyq784 { + yynn789 = 2 + for _, b := range yyq789 { if b { - yynn784++ + yynn789++ } } - r.EncodeMapStart(yynn784) - yynn784 = 0 + r.EncodeMapStart(yynn789) + yynn789 = 0 } - if yyr784 || yy2arr784 { + if yyr789 || yy2arr789 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Mode.CodecEncodeSelf(e) } else { @@ -6809,18 +6850,18 @@ func (x *KubeletAuthorization) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Mode.CodecEncodeSelf(e) } - if yyr784 || yy2arr784 { + if yyr789 || yy2arr789 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy787 := &x.Webhook - yy787.CodecEncodeSelf(e) + yy792 := &x.Webhook + yy792.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("webhook")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy788 := &x.Webhook - yy788.CodecEncodeSelf(e) + yy793 := &x.Webhook + yy793.CodecEncodeSelf(e) } - if yyr784 || yy2arr784 { + if yyr789 || yy2arr789 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -6833,25 +6874,25 @@ func (x *KubeletAuthorization) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym789 := z.DecBinary() - _ = yym789 + yym794 := z.DecBinary() + _ = yym794 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct790 := r.ContainerType() - if yyct790 == codecSelferValueTypeMap1234 { - yyl790 := r.ReadMapStart() - if yyl790 == 0 { + yyct795 := r.ContainerType() + if yyct795 == codecSelferValueTypeMap1234 { + yyl795 := r.ReadMapStart() + if yyl795 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl790, d) + x.codecDecodeSelfFromMap(yyl795, d) } - } else if yyct790 == codecSelferValueTypeArray1234 { - yyl790 := r.ReadArrayStart() - if yyl790 == 0 { + } else if yyct795 == codecSelferValueTypeArray1234 { + yyl795 := r.ReadArrayStart() + if yyl795 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl790, d) + x.codecDecodeSelfFromArray(yyl795, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -6863,12 +6904,12 @@ func (x *KubeletAuthorization) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys791Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys791Slc - var yyhl791 bool = l >= 0 - for yyj791 := 0; ; yyj791++ { - if yyhl791 { - if yyj791 >= l { + var yys796Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys796Slc + var yyhl796 bool = l >= 0 + for yyj796 := 0; ; yyj796++ { + if yyhl796 { + if yyj796 >= l { break } } else { @@ -6877,10 +6918,10 @@ func (x *KubeletAuthorization) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys791Slc = r.DecodeBytes(yys791Slc, true, true) - yys791 := string(yys791Slc) + yys796Slc = r.DecodeBytes(yys796Slc, true, true) + yys796 := string(yys796Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys791 { + switch yys796 { case "mode": if r.TryDecodeAsNil() { x.Mode = "" @@ -6891,13 +6932,13 @@ func (x *KubeletAuthorization) codecDecodeSelfFromMap(l int, d *codec1978.Decode if r.TryDecodeAsNil() { x.Webhook = KubeletWebhookAuthorization{} } else { - yyv793 := &x.Webhook - yyv793.CodecDecodeSelf(d) + yyv798 := &x.Webhook + yyv798.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys791) - } // end switch yys791 - } // end for yyj791 + z.DecStructFieldNotFound(-1, yys796) + } // end switch yys796 + } // end for yyj796 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -6905,16 +6946,16 @@ func (x *KubeletAuthorization) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj794 int - var yyb794 bool - var yyhl794 bool = l >= 0 - yyj794++ - if yyhl794 { - yyb794 = yyj794 > l + var yyj799 int + var yyb799 bool + var yyhl799 bool = l >= 0 + yyj799++ + if yyhl799 { + yyb799 = yyj799 > l } else { - yyb794 = r.CheckBreak() + yyb799 = r.CheckBreak() } - if yyb794 { + if yyb799 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6924,13 +6965,13 @@ func (x *KubeletAuthorization) codecDecodeSelfFromArray(l int, d *codec1978.Deco } else { x.Mode = KubeletAuthorizationMode(r.DecodeString()) } - yyj794++ - if yyhl794 { - yyb794 = yyj794 > l + yyj799++ + if yyhl799 { + yyb799 = yyj799 > l } else { - yyb794 = r.CheckBreak() + yyb799 = r.CheckBreak() } - if yyb794 { + if yyb799 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -6938,21 +6979,21 @@ func (x *KubeletAuthorization) codecDecodeSelfFromArray(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.Webhook = KubeletWebhookAuthorization{} } else { - yyv796 := &x.Webhook - yyv796.CodecDecodeSelf(d) + yyv801 := &x.Webhook + yyv801.CodecDecodeSelf(d) } for { - yyj794++ - if yyhl794 { - yyb794 = yyj794 > l + yyj799++ + if yyhl799 { + yyb799 = yyj799 > l } else { - yyb794 = r.CheckBreak() + yyb799 = r.CheckBreak() } - if yyb794 { + if yyb799 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj794-1, "") + z.DecStructFieldNotFound(yyj799-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -6964,59 +7005,32 @@ func (x *KubeletWebhookAuthorization) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym797 := z.EncBinary() - _ = yym797 + yym802 := z.EncBinary() + _ = yym802 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep798 := !z.EncBinary() - yy2arr798 := z.EncBasicHandle().StructToArray - var yyq798 [2]bool - _, _, _ = yysep798, yyq798, yy2arr798 - const yyr798 bool = false - var yynn798 int - if yyr798 || yy2arr798 { + yysep803 := !z.EncBinary() + yy2arr803 := z.EncBasicHandle().StructToArray + var yyq803 [2]bool + _, _, _ = yysep803, yyq803, yy2arr803 + const yyr803 bool = false + var yynn803 int + if yyr803 || yy2arr803 { r.EncodeArrayStart(2) } else { - yynn798 = 2 - for _, b := range yyq798 { + yynn803 = 2 + for _, b := range yyq803 { if b { - yynn798++ + yynn803++ } } - r.EncodeMapStart(yynn798) - yynn798 = 0 + r.EncodeMapStart(yynn803) + yynn803 = 0 } - if yyr798 || yy2arr798 { + if yyr803 || yy2arr803 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy800 := &x.CacheAuthorizedTTL - yym801 := z.EncBinary() - _ = yym801 - if false { - } else if z.HasExtensions() && z.EncExt(yy800) { - } else if !yym801 && z.IsJSONHandle() { - z.EncJSONMarshal(yy800) - } else { - z.EncFallback(yy800) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cacheAuthorizedTTL")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy802 := &x.CacheAuthorizedTTL - yym803 := z.EncBinary() - _ = yym803 - if false { - } else if z.HasExtensions() && z.EncExt(yy802) { - } else if !yym803 && z.IsJSONHandle() { - z.EncJSONMarshal(yy802) - } else { - z.EncFallback(yy802) - } - } - if yyr798 || yy2arr798 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy805 := &x.CacheUnauthorizedTTL + yy805 := &x.CacheAuthorizedTTL yym806 := z.EncBinary() _ = yym806 if false { @@ -7028,9 +7042,9 @@ func (x *KubeletWebhookAuthorization) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("cacheUnauthorizedTTL")) + r.EncodeString(codecSelferC_UTF81234, string("cacheAuthorizedTTL")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy807 := &x.CacheUnauthorizedTTL + yy807 := &x.CacheAuthorizedTTL yym808 := z.EncBinary() _ = yym808 if false { @@ -7041,7 +7055,34 @@ func (x *KubeletWebhookAuthorization) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy807) } } - if yyr798 || yy2arr798 { + if yyr803 || yy2arr803 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy810 := &x.CacheUnauthorizedTTL + 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("cacheUnauthorizedTTL")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy812 := &x.CacheUnauthorizedTTL + 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 yyr803 || yy2arr803 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7054,25 +7095,25 @@ func (x *KubeletWebhookAuthorization) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym809 := z.DecBinary() - _ = yym809 + yym814 := z.DecBinary() + _ = yym814 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct810 := r.ContainerType() - if yyct810 == codecSelferValueTypeMap1234 { - yyl810 := r.ReadMapStart() - if yyl810 == 0 { + yyct815 := r.ContainerType() + if yyct815 == codecSelferValueTypeMap1234 { + yyl815 := r.ReadMapStart() + if yyl815 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl810, d) + x.codecDecodeSelfFromMap(yyl815, d) } - } else if yyct810 == codecSelferValueTypeArray1234 { - yyl810 := r.ReadArrayStart() - if yyl810 == 0 { + } else if yyct815 == codecSelferValueTypeArray1234 { + yyl815 := r.ReadArrayStart() + if yyl815 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl810, d) + x.codecDecodeSelfFromArray(yyl815, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7084,12 +7125,12 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys811Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys811Slc - var yyhl811 bool = l >= 0 - for yyj811 := 0; ; yyj811++ { - if yyhl811 { - if yyj811 >= l { + var yys816Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys816Slc + var yyhl816 bool = l >= 0 + for yyj816 := 0; ; yyj816++ { + if yyhl816 { + if yyj816 >= l { break } } else { @@ -7098,44 +7139,44 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys811Slc = r.DecodeBytes(yys811Slc, true, true) - yys811 := string(yys811Slc) + yys816Slc = r.DecodeBytes(yys816Slc, true, true) + yys816 := string(yys816Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys811 { + switch yys816 { case "cacheAuthorizedTTL": if r.TryDecodeAsNil() { x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} } else { - yyv812 := &x.CacheAuthorizedTTL - yym813 := z.DecBinary() - _ = yym813 + yyv817 := &x.CacheAuthorizedTTL + yym818 := z.DecBinary() + _ = yym818 if false { - } else if z.HasExtensions() && z.DecExt(yyv812) { - } else if !yym813 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv812) + } else if z.HasExtensions() && z.DecExt(yyv817) { + } else if !yym818 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv817) } else { - z.DecFallback(yyv812, false) + z.DecFallback(yyv817, false) } } case "cacheUnauthorizedTTL": if r.TryDecodeAsNil() { x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} } else { - yyv814 := &x.CacheUnauthorizedTTL - yym815 := z.DecBinary() - _ = yym815 + yyv819 := &x.CacheUnauthorizedTTL + yym820 := z.DecBinary() + _ = yym820 if false { - } else if z.HasExtensions() && z.DecExt(yyv814) { - } else if !yym815 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv814) + } else if z.HasExtensions() && z.DecExt(yyv819) { + } else if !yym820 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv819) } else { - z.DecFallback(yyv814, false) + z.DecFallback(yyv819, false) } } default: - z.DecStructFieldNotFound(-1, yys811) - } // end switch yys811 - } // end for yyj811 + z.DecStructFieldNotFound(-1, yys816) + } // end switch yys816 + } // end for yyj816 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7143,16 +7184,16 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj816 int - var yyb816 bool - var yyhl816 bool = l >= 0 - yyj816++ - if yyhl816 { - yyb816 = yyj816 > l + var yyj821 int + var yyb821 bool + var yyhl821 bool = l >= 0 + yyj821++ + if yyhl821 { + yyb821 = yyj821 > l } else { - yyb816 = r.CheckBreak() + yyb821 = r.CheckBreak() } - if yyb816 { + if yyb821 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7160,24 +7201,24 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} } else { - yyv817 := &x.CacheAuthorizedTTL - yym818 := z.DecBinary() - _ = yym818 + yyv822 := &x.CacheAuthorizedTTL + yym823 := z.DecBinary() + _ = yym823 if false { - } else if z.HasExtensions() && z.DecExt(yyv817) { - } else if !yym818 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv817) + } else if z.HasExtensions() && z.DecExt(yyv822) { + } else if !yym823 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv822) } else { - z.DecFallback(yyv817, false) + z.DecFallback(yyv822, false) } } - yyj816++ - if yyhl816 { - yyb816 = yyj816 > l + yyj821++ + if yyhl821 { + yyb821 = yyj821 > l } else { - yyb816 = r.CheckBreak() + yyb821 = r.CheckBreak() } - if yyb816 { + if yyb821 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7185,29 +7226,29 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} } else { - yyv819 := &x.CacheUnauthorizedTTL - yym820 := z.DecBinary() - _ = yym820 + yyv824 := &x.CacheUnauthorizedTTL + yym825 := z.DecBinary() + _ = yym825 if false { - } else if z.HasExtensions() && z.DecExt(yyv819) { - } else if !yym820 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv819) + } else if z.HasExtensions() && z.DecExt(yyv824) { + } else if !yym825 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv824) } else { - z.DecFallback(yyv819, false) + z.DecFallback(yyv824, false) } } for { - yyj816++ - if yyhl816 { - yyb816 = yyj816 > l + yyj821++ + if yyhl821 { + yyb821 = yyj821 > l } else { - yyb816 = r.CheckBreak() + yyb821 = r.CheckBreak() } - if yyb816 { + if yyb821 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj816-1, "") + z.DecStructFieldNotFound(yyj821-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7219,63 +7260,63 @@ func (x *KubeletAuthentication) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym821 := z.EncBinary() - _ = yym821 + yym826 := z.EncBinary() + _ = yym826 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep822 := !z.EncBinary() - yy2arr822 := z.EncBasicHandle().StructToArray - var yyq822 [3]bool - _, _, _ = yysep822, yyq822, yy2arr822 - const yyr822 bool = false - var yynn822 int - if yyr822 || yy2arr822 { + yysep827 := !z.EncBinary() + yy2arr827 := z.EncBasicHandle().StructToArray + var yyq827 [3]bool + _, _, _ = yysep827, yyq827, yy2arr827 + const yyr827 bool = false + var yynn827 int + if yyr827 || yy2arr827 { r.EncodeArrayStart(3) } else { - yynn822 = 3 - for _, b := range yyq822 { + yynn827 = 3 + for _, b := range yyq827 { if b { - yynn822++ + yynn827++ } } - r.EncodeMapStart(yynn822) - yynn822 = 0 + r.EncodeMapStart(yynn827) + yynn827 = 0 } - if yyr822 || yy2arr822 { + if yyr827 || yy2arr827 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy824 := &x.X509 - yy824.CodecEncodeSelf(e) + yy829 := &x.X509 + yy829.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("x509")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy825 := &x.X509 - yy825.CodecEncodeSelf(e) + yy830 := &x.X509 + yy830.CodecEncodeSelf(e) } - if yyr822 || yy2arr822 { + if yyr827 || yy2arr827 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy827 := &x.Webhook - yy827.CodecEncodeSelf(e) + yy832 := &x.Webhook + yy832.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("webhook")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy828 := &x.Webhook - yy828.CodecEncodeSelf(e) + yy833 := &x.Webhook + yy833.CodecEncodeSelf(e) } - if yyr822 || yy2arr822 { + if yyr827 || yy2arr827 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy830 := &x.Anonymous - yy830.CodecEncodeSelf(e) + yy835 := &x.Anonymous + yy835.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("anonymous")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy831 := &x.Anonymous - yy831.CodecEncodeSelf(e) + yy836 := &x.Anonymous + yy836.CodecEncodeSelf(e) } - if yyr822 || yy2arr822 { + if yyr827 || yy2arr827 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7288,25 +7329,25 @@ func (x *KubeletAuthentication) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym832 := z.DecBinary() - _ = yym832 + yym837 := z.DecBinary() + _ = yym837 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct833 := r.ContainerType() - if yyct833 == codecSelferValueTypeMap1234 { - yyl833 := r.ReadMapStart() - if yyl833 == 0 { + yyct838 := r.ContainerType() + if yyct838 == codecSelferValueTypeMap1234 { + yyl838 := r.ReadMapStart() + if yyl838 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl833, d) + x.codecDecodeSelfFromMap(yyl838, d) } - } else if yyct833 == codecSelferValueTypeArray1234 { - yyl833 := r.ReadArrayStart() - if yyl833 == 0 { + } else if yyct838 == codecSelferValueTypeArray1234 { + yyl838 := r.ReadArrayStart() + if yyl838 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl833, d) + x.codecDecodeSelfFromArray(yyl838, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7318,12 +7359,12 @@ func (x *KubeletAuthentication) codecDecodeSelfFromMap(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys834Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys834Slc - var yyhl834 bool = l >= 0 - for yyj834 := 0; ; yyj834++ { - if yyhl834 { - if yyj834 >= l { + var yys839Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys839Slc + var yyhl839 bool = l >= 0 + for yyj839 := 0; ; yyj839++ { + if yyhl839 { + if yyj839 >= l { break } } else { @@ -7332,35 +7373,35 @@ func (x *KubeletAuthentication) codecDecodeSelfFromMap(l int, d *codec1978.Decod } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys834Slc = r.DecodeBytes(yys834Slc, true, true) - yys834 := string(yys834Slc) + yys839Slc = r.DecodeBytes(yys839Slc, true, true) + yys839 := string(yys839Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys834 { + switch yys839 { case "x509": if r.TryDecodeAsNil() { x.X509 = KubeletX509Authentication{} } else { - yyv835 := &x.X509 - yyv835.CodecDecodeSelf(d) + yyv840 := &x.X509 + yyv840.CodecDecodeSelf(d) } case "webhook": if r.TryDecodeAsNil() { x.Webhook = KubeletWebhookAuthentication{} } else { - yyv836 := &x.Webhook - yyv836.CodecDecodeSelf(d) + yyv841 := &x.Webhook + yyv841.CodecDecodeSelf(d) } case "anonymous": if r.TryDecodeAsNil() { x.Anonymous = KubeletAnonymousAuthentication{} } else { - yyv837 := &x.Anonymous - yyv837.CodecDecodeSelf(d) + yyv842 := &x.Anonymous + yyv842.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys834) - } // end switch yys834 - } // end for yyj834 + z.DecStructFieldNotFound(-1, yys839) + } // end switch yys839 + } // end for yyj839 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7368,16 +7409,16 @@ func (x *KubeletAuthentication) codecDecodeSelfFromArray(l int, d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj838 int - var yyb838 bool - var yyhl838 bool = l >= 0 - yyj838++ - if yyhl838 { - yyb838 = yyj838 > l + var yyj843 int + var yyb843 bool + var yyhl843 bool = l >= 0 + yyj843++ + if yyhl843 { + yyb843 = yyj843 > l } else { - yyb838 = r.CheckBreak() + yyb843 = r.CheckBreak() } - if yyb838 { + if yyb843 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7385,16 +7426,16 @@ func (x *KubeletAuthentication) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.X509 = KubeletX509Authentication{} } else { - yyv839 := &x.X509 - yyv839.CodecDecodeSelf(d) + yyv844 := &x.X509 + yyv844.CodecDecodeSelf(d) } - yyj838++ - if yyhl838 { - yyb838 = yyj838 > l + yyj843++ + if yyhl843 { + yyb843 = yyj843 > l } else { - yyb838 = r.CheckBreak() + yyb843 = r.CheckBreak() } - if yyb838 { + if yyb843 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7402,16 +7443,16 @@ func (x *KubeletAuthentication) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.Webhook = KubeletWebhookAuthentication{} } else { - yyv840 := &x.Webhook - yyv840.CodecDecodeSelf(d) + yyv845 := &x.Webhook + yyv845.CodecDecodeSelf(d) } - yyj838++ - if yyhl838 { - yyb838 = yyj838 > l + yyj843++ + if yyhl843 { + yyb843 = yyj843 > l } else { - yyb838 = r.CheckBreak() + yyb843 = r.CheckBreak() } - if yyb838 { + if yyb843 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7419,21 +7460,21 @@ func (x *KubeletAuthentication) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.Anonymous = KubeletAnonymousAuthentication{} } else { - yyv841 := &x.Anonymous - yyv841.CodecDecodeSelf(d) + yyv846 := &x.Anonymous + yyv846.CodecDecodeSelf(d) } for { - yyj838++ - if yyhl838 { - yyb838 = yyj838 > l + yyj843++ + if yyhl843 { + yyb843 = yyj843 > l } else { - yyb838 = r.CheckBreak() + yyb843 = r.CheckBreak() } - if yyb838 { + if yyb843 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj838-1, "") + z.DecStructFieldNotFound(yyj843-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7445,33 +7486,33 @@ func (x *KubeletX509Authentication) CodecEncodeSelf(e *codec1978.Encoder) { 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 [1]bool - _, _, _ = yysep843, yyq843, yy2arr843 - const yyr843 bool = false - var yynn843 int - if yyr843 || yy2arr843 { + yysep848 := !z.EncBinary() + yy2arr848 := z.EncBasicHandle().StructToArray + var yyq848 [1]bool + _, _, _ = yysep848, yyq848, yy2arr848 + const yyr848 bool = false + var yynn848 int + if yyr848 || yy2arr848 { r.EncodeArrayStart(1) } else { - yynn843 = 1 - for _, b := range yyq843 { + yynn848 = 1 + 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) - yym845 := z.EncBinary() - _ = yym845 + yym850 := z.EncBinary() + _ = yym850 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClientCAFile)) @@ -7480,14 +7521,14 @@ func (x *KubeletX509Authentication) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clientCAFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym846 := z.EncBinary() - _ = yym846 + yym851 := z.EncBinary() + _ = yym851 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClientCAFile)) } } - if yyr843 || yy2arr843 { + if yyr848 || yy2arr848 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7500,25 +7541,25 @@ func (x *KubeletX509Authentication) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym847 := z.DecBinary() - _ = yym847 + yym852 := z.DecBinary() + _ = yym852 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct848 := r.ContainerType() - if yyct848 == codecSelferValueTypeMap1234 { - yyl848 := r.ReadMapStart() - if yyl848 == 0 { + yyct853 := r.ContainerType() + if yyct853 == codecSelferValueTypeMap1234 { + yyl853 := r.ReadMapStart() + if yyl853 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl848, d) + x.codecDecodeSelfFromMap(yyl853, d) } - } else if yyct848 == codecSelferValueTypeArray1234 { - yyl848 := r.ReadArrayStart() - if yyl848 == 0 { + } else if yyct853 == codecSelferValueTypeArray1234 { + yyl853 := r.ReadArrayStart() + if yyl853 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl848, d) + x.codecDecodeSelfFromArray(yyl853, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7530,12 +7571,12 @@ func (x *KubeletX509Authentication) codecDecodeSelfFromMap(l int, d *codec1978.D var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys849Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys849Slc - var yyhl849 bool = l >= 0 - for yyj849 := 0; ; yyj849++ { - if yyhl849 { - if yyj849 >= l { + var yys854Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys854Slc + var yyhl854 bool = l >= 0 + for yyj854 := 0; ; yyj854++ { + if yyhl854 { + if yyj854 >= l { break } } else { @@ -7544,10 +7585,10 @@ func (x *KubeletX509Authentication) codecDecodeSelfFromMap(l int, d *codec1978.D } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys849Slc = r.DecodeBytes(yys849Slc, true, true) - yys849 := string(yys849Slc) + yys854Slc = r.DecodeBytes(yys854Slc, true, true) + yys854 := string(yys854Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys849 { + switch yys854 { case "clientCAFile": if r.TryDecodeAsNil() { x.ClientCAFile = "" @@ -7555,9 +7596,9 @@ func (x *KubeletX509Authentication) codecDecodeSelfFromMap(l int, d *codec1978.D x.ClientCAFile = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys849) - } // end switch yys849 - } // end for yyj849 + z.DecStructFieldNotFound(-1, yys854) + } // end switch yys854 + } // end for yyj854 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7565,16 +7606,16 @@ func (x *KubeletX509Authentication) codecDecodeSelfFromArray(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj851 int - var yyb851 bool - var yyhl851 bool = l >= 0 - yyj851++ - if yyhl851 { - yyb851 = yyj851 > l + var yyj856 int + var yyb856 bool + var yyhl856 bool = l >= 0 + yyj856++ + if yyhl856 { + yyb856 = yyj856 > l } else { - yyb851 = r.CheckBreak() + yyb856 = r.CheckBreak() } - if yyb851 { + if yyb856 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7585,17 +7626,17 @@ func (x *KubeletX509Authentication) codecDecodeSelfFromArray(l int, d *codec1978 x.ClientCAFile = string(r.DecodeString()) } for { - yyj851++ - if yyhl851 { - yyb851 = yyj851 > l + yyj856++ + if yyhl856 { + yyb856 = yyj856 > l } else { - yyb851 = r.CheckBreak() + yyb856 = r.CheckBreak() } - if yyb851 { + if yyb856 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj851-1, "") + z.DecStructFieldNotFound(yyj856-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7607,33 +7648,33 @@ func (x *KubeletWebhookAuthentication) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym853 := z.EncBinary() - _ = yym853 + yym858 := z.EncBinary() + _ = yym858 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep854 := !z.EncBinary() - yy2arr854 := z.EncBasicHandle().StructToArray - var yyq854 [2]bool - _, _, _ = yysep854, yyq854, yy2arr854 - const yyr854 bool = false - var yynn854 int - if yyr854 || yy2arr854 { + yysep859 := !z.EncBinary() + yy2arr859 := z.EncBasicHandle().StructToArray + var yyq859 [2]bool + _, _, _ = yysep859, yyq859, yy2arr859 + const yyr859 bool = false + var yynn859 int + if yyr859 || yy2arr859 { r.EncodeArrayStart(2) } else { - yynn854 = 2 - for _, b := range yyq854 { + yynn859 = 2 + for _, b := range yyq859 { if b { - yynn854++ + yynn859++ } } - r.EncodeMapStart(yynn854) - yynn854 = 0 + r.EncodeMapStart(yynn859) + yynn859 = 0 } - if yyr854 || yy2arr854 { + if yyr859 || yy2arr859 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym856 := z.EncBinary() - _ = yym856 + yym861 := z.EncBinary() + _ = yym861 if false { } else { r.EncodeBool(bool(x.Enabled)) @@ -7642,41 +7683,41 @@ func (x *KubeletWebhookAuthentication) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enabled")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym857 := z.EncBinary() - _ = yym857 + yym862 := z.EncBinary() + _ = yym862 if false { } else { r.EncodeBool(bool(x.Enabled)) } } - if yyr854 || yy2arr854 { + if yyr859 || yy2arr859 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy859 := &x.CacheTTL - yym860 := z.EncBinary() - _ = yym860 + yy864 := &x.CacheTTL + yym865 := z.EncBinary() + _ = yym865 if false { - } else if z.HasExtensions() && z.EncExt(yy859) { - } else if !yym860 && z.IsJSONHandle() { - z.EncJSONMarshal(yy859) + } else if z.HasExtensions() && z.EncExt(yy864) { + } else if !yym865 && z.IsJSONHandle() { + z.EncJSONMarshal(yy864) } else { - z.EncFallback(yy859) + z.EncFallback(yy864) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cacheTTL")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy861 := &x.CacheTTL - yym862 := z.EncBinary() - _ = yym862 + yy866 := &x.CacheTTL + yym867 := z.EncBinary() + _ = yym867 if false { - } else if z.HasExtensions() && z.EncExt(yy861) { - } else if !yym862 && z.IsJSONHandle() { - z.EncJSONMarshal(yy861) + } else if z.HasExtensions() && z.EncExt(yy866) { + } else if !yym867 && z.IsJSONHandle() { + z.EncJSONMarshal(yy866) } else { - z.EncFallback(yy861) + z.EncFallback(yy866) } } - if yyr854 || yy2arr854 { + if yyr859 || yy2arr859 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7689,25 +7730,25 @@ func (x *KubeletWebhookAuthentication) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym863 := z.DecBinary() - _ = yym863 + yym868 := z.DecBinary() + _ = yym868 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct864 := r.ContainerType() - if yyct864 == codecSelferValueTypeMap1234 { - yyl864 := r.ReadMapStart() - if yyl864 == 0 { + yyct869 := r.ContainerType() + if yyct869 == codecSelferValueTypeMap1234 { + yyl869 := r.ReadMapStart() + if yyl869 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl864, d) + x.codecDecodeSelfFromMap(yyl869, d) } - } else if yyct864 == codecSelferValueTypeArray1234 { - yyl864 := r.ReadArrayStart() - if yyl864 == 0 { + } else if yyct869 == codecSelferValueTypeArray1234 { + yyl869 := r.ReadArrayStart() + if yyl869 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl864, d) + x.codecDecodeSelfFromArray(yyl869, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7719,12 +7760,12 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys865Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys865Slc - var yyhl865 bool = l >= 0 - for yyj865 := 0; ; yyj865++ { - if yyhl865 { - if yyj865 >= l { + var yys870Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys870Slc + var yyhl870 bool = l >= 0 + for yyj870 := 0; ; yyj870++ { + if yyhl870 { + if yyj870 >= l { break } } else { @@ -7733,10 +7774,10 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys865Slc = r.DecodeBytes(yys865Slc, true, true) - yys865 := string(yys865Slc) + yys870Slc = r.DecodeBytes(yys870Slc, true, true) + yys870 := string(yys870Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys865 { + switch yys870 { case "enabled": if r.TryDecodeAsNil() { x.Enabled = false @@ -7747,21 +7788,21 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 if r.TryDecodeAsNil() { x.CacheTTL = pkg1_unversioned.Duration{} } else { - yyv867 := &x.CacheTTL - yym868 := z.DecBinary() - _ = yym868 + yyv872 := &x.CacheTTL + yym873 := z.DecBinary() + _ = yym873 if false { - } else if z.HasExtensions() && z.DecExt(yyv867) { - } else if !yym868 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv867) + } else if z.HasExtensions() && z.DecExt(yyv872) { + } else if !yym873 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv872) } else { - z.DecFallback(yyv867, false) + z.DecFallback(yyv872, false) } } default: - z.DecStructFieldNotFound(-1, yys865) - } // end switch yys865 - } // end for yyj865 + z.DecStructFieldNotFound(-1, yys870) + } // end switch yys870 + } // end for yyj870 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7769,16 +7810,16 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj869 int - var yyb869 bool - var yyhl869 bool = l >= 0 - yyj869++ - if yyhl869 { - yyb869 = yyj869 > l + var yyj874 int + var yyb874 bool + var yyhl874 bool = l >= 0 + yyj874++ + if yyhl874 { + yyb874 = yyj874 > l } else { - yyb869 = r.CheckBreak() + yyb874 = r.CheckBreak() } - if yyb869 { + if yyb874 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7788,13 +7829,13 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 } else { x.Enabled = bool(r.DecodeBool()) } - yyj869++ - if yyhl869 { - yyb869 = yyj869 > l + yyj874++ + if yyhl874 { + yyb874 = yyj874 > l } else { - yyb869 = r.CheckBreak() + yyb874 = r.CheckBreak() } - if yyb869 { + if yyb874 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7802,29 +7843,29 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 if r.TryDecodeAsNil() { x.CacheTTL = pkg1_unversioned.Duration{} } else { - yyv871 := &x.CacheTTL - yym872 := z.DecBinary() - _ = yym872 + yyv876 := &x.CacheTTL + yym877 := z.DecBinary() + _ = yym877 if false { - } else if z.HasExtensions() && z.DecExt(yyv871) { - } else if !yym872 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv871) + } else if z.HasExtensions() && z.DecExt(yyv876) { + } else if !yym877 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv876) } else { - z.DecFallback(yyv871, false) + z.DecFallback(yyv876, false) } } for { - yyj869++ - if yyhl869 { - yyb869 = yyj869 > l + yyj874++ + if yyhl874 { + yyb874 = yyj874 > l } else { - yyb869 = r.CheckBreak() + yyb874 = r.CheckBreak() } - if yyb869 { + if yyb874 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj869-1, "") + z.DecStructFieldNotFound(yyj874-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7836,33 +7877,33 @@ func (x *KubeletAnonymousAuthentication) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym873 := z.EncBinary() - _ = yym873 + yym878 := z.EncBinary() + _ = yym878 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep874 := !z.EncBinary() - yy2arr874 := z.EncBasicHandle().StructToArray - var yyq874 [1]bool - _, _, _ = yysep874, yyq874, yy2arr874 - const yyr874 bool = false - var yynn874 int - if yyr874 || yy2arr874 { + yysep879 := !z.EncBinary() + yy2arr879 := z.EncBasicHandle().StructToArray + var yyq879 [1]bool + _, _, _ = yysep879, yyq879, yy2arr879 + const yyr879 bool = false + var yynn879 int + if yyr879 || yy2arr879 { r.EncodeArrayStart(1) } else { - yynn874 = 1 - for _, b := range yyq874 { + yynn879 = 1 + for _, b := range yyq879 { if b { - yynn874++ + yynn879++ } } - r.EncodeMapStart(yynn874) - yynn874 = 0 + r.EncodeMapStart(yynn879) + yynn879 = 0 } - if yyr874 || yy2arr874 { + if yyr879 || yy2arr879 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym876 := z.EncBinary() - _ = yym876 + yym881 := z.EncBinary() + _ = yym881 if false { } else { r.EncodeBool(bool(x.Enabled)) @@ -7871,14 +7912,14 @@ func (x *KubeletAnonymousAuthentication) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enabled")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym877 := z.EncBinary() - _ = yym877 + yym882 := z.EncBinary() + _ = yym882 if false { } else { r.EncodeBool(bool(x.Enabled)) } } - if yyr874 || yy2arr874 { + if yyr879 || yy2arr879 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -7891,25 +7932,25 @@ func (x *KubeletAnonymousAuthentication) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym878 := z.DecBinary() - _ = yym878 + yym883 := z.DecBinary() + _ = yym883 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct879 := r.ContainerType() - if yyct879 == codecSelferValueTypeMap1234 { - yyl879 := r.ReadMapStart() - if yyl879 == 0 { + yyct884 := r.ContainerType() + if yyct884 == codecSelferValueTypeMap1234 { + yyl884 := r.ReadMapStart() + if yyl884 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl879, d) + x.codecDecodeSelfFromMap(yyl884, d) } - } else if yyct879 == codecSelferValueTypeArray1234 { - yyl879 := r.ReadArrayStart() - if yyl879 == 0 { + } else if yyct884 == codecSelferValueTypeArray1234 { + yyl884 := r.ReadArrayStart() + if yyl884 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl879, d) + x.codecDecodeSelfFromArray(yyl884, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -7921,12 +7962,12 @@ func (x *KubeletAnonymousAuthentication) codecDecodeSelfFromMap(l int, d *codec1 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys880Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys880Slc - var yyhl880 bool = l >= 0 - for yyj880 := 0; ; yyj880++ { - if yyhl880 { - if yyj880 >= l { + var yys885Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys885Slc + var yyhl885 bool = l >= 0 + for yyj885 := 0; ; yyj885++ { + if yyhl885 { + if yyj885 >= l { break } } else { @@ -7935,10 +7976,10 @@ func (x *KubeletAnonymousAuthentication) codecDecodeSelfFromMap(l int, d *codec1 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys880Slc = r.DecodeBytes(yys880Slc, true, true) - yys880 := string(yys880Slc) + yys885Slc = r.DecodeBytes(yys885Slc, true, true) + yys885 := string(yys885Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys880 { + switch yys885 { case "enabled": if r.TryDecodeAsNil() { x.Enabled = false @@ -7946,9 +7987,9 @@ func (x *KubeletAnonymousAuthentication) codecDecodeSelfFromMap(l int, d *codec1 x.Enabled = bool(r.DecodeBool()) } default: - z.DecStructFieldNotFound(-1, yys880) - } // end switch yys880 - } // end for yyj880 + z.DecStructFieldNotFound(-1, yys885) + } // end switch yys885 + } // end for yyj885 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -7956,16 +7997,16 @@ func (x *KubeletAnonymousAuthentication) codecDecodeSelfFromArray(l int, d *code var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj882 int - var yyb882 bool - var yyhl882 bool = l >= 0 - yyj882++ - if yyhl882 { - yyb882 = yyj882 > l + var yyj887 int + var yyb887 bool + var yyhl887 bool = l >= 0 + yyj887++ + if yyhl887 { + yyb887 = yyj887 > l } else { - yyb882 = r.CheckBreak() + yyb887 = r.CheckBreak() } - if yyb882 { + if yyb887 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -7976,17 +8017,17 @@ func (x *KubeletAnonymousAuthentication) codecDecodeSelfFromArray(l int, d *code x.Enabled = bool(r.DecodeBool()) } for { - yyj882++ - if yyhl882 { - yyb882 = yyj882 > l + yyj887++ + if yyhl887 { + yyb887 = yyj887 > l } else { - yyb882 = r.CheckBreak() + yyb887 = r.CheckBreak() } - if yyb882 { + if yyb887 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj882-1, "") + z.DecStructFieldNotFound(yyj887-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -7998,36 +8039,36 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym884 := z.EncBinary() - _ = yym884 + yym889 := z.EncBinary() + _ = yym889 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep885 := !z.EncBinary() - yy2arr885 := z.EncBasicHandle().StructToArray - var yyq885 [14]bool - _, _, _ = yysep885, yyq885, yy2arr885 - const yyr885 bool = false - yyq885[0] = x.Kind != "" - yyq885[1] = x.APIVersion != "" - var yynn885 int - if yyr885 || yy2arr885 { + yysep890 := !z.EncBinary() + yy2arr890 := z.EncBasicHandle().StructToArray + var yyq890 [14]bool + _, _, _ = yysep890, yyq890, yy2arr890 + const yyr890 bool = false + yyq890[0] = x.Kind != "" + yyq890[1] = x.APIVersion != "" + var yynn890 int + if yyr890 || yy2arr890 { r.EncodeArrayStart(14) } else { - yynn885 = 12 - for _, b := range yyq885 { + yynn890 = 12 + for _, b := range yyq890 { if b { - yynn885++ + yynn890++ } } - r.EncodeMapStart(yynn885) - yynn885 = 0 + r.EncodeMapStart(yynn890) + yynn890 = 0 } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq885[0] { - yym887 := z.EncBinary() - _ = yym887 + if yyq890[0] { + yym892 := z.EncBinary() + _ = yym892 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -8036,23 +8077,23 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq885[0] { + if yyq890[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym888 := z.EncBinary() - _ = yym888 + yym893 := z.EncBinary() + _ = yym893 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq885[1] { - yym890 := z.EncBinary() - _ = yym890 + if yyq890[1] { + yym895 := z.EncBinary() + _ = yym895 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -8061,22 +8102,22 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq885[1] { + if yyq890[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym891 := z.EncBinary() - _ = yym891 + yym896 := z.EncBinary() + _ = yym896 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym893 := z.EncBinary() - _ = yym893 + yym898 := z.EncBinary() + _ = yym898 if false { } else { r.EncodeInt(int64(x.Port)) @@ -8085,17 +8126,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym894 := z.EncBinary() - _ = yym894 + yym899 := z.EncBinary() + _ = yym899 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym896 := z.EncBinary() - _ = yym896 + yym901 := z.EncBinary() + _ = yym901 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -8104,17 +8145,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym897 := z.EncBinary() - _ = yym897 + yym902 := z.EncBinary() + _ = yym902 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym899 := z.EncBinary() - _ = yym899 + yym904 := z.EncBinary() + _ = yym904 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) @@ -8123,17 +8164,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("algorithmProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym900 := z.EncBinary() - _ = yym900 + yym905 := z.EncBinary() + _ = yym905 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.AlgorithmProvider)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym902 := z.EncBinary() - _ = yym902 + yym907 := z.EncBinary() + _ = yym907 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) @@ -8142,17 +8183,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("policyConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym903 := z.EncBinary() - _ = yym903 + yym908 := z.EncBinary() + _ = yym908 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PolicyConfigFile)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym905 := z.EncBinary() - _ = yym905 + yym910 := z.EncBinary() + _ = yym910 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -8161,17 +8202,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym906 := z.EncBinary() - _ = yym906 + yym911 := z.EncBinary() + _ = yym911 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym908 := z.EncBinary() - _ = yym908 + yym913 := z.EncBinary() + _ = yym913 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -8180,17 +8221,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym909 := z.EncBinary() - _ = yym909 + yym914 := z.EncBinary() + _ = yym914 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym911 := z.EncBinary() - _ = yym911 + yym916 := z.EncBinary() + _ = yym916 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -8199,17 +8240,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym912 := z.EncBinary() - _ = yym912 + yym917 := z.EncBinary() + _ = yym917 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym914 := z.EncBinary() - _ = yym914 + yym919 := z.EncBinary() + _ = yym919 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -8218,17 +8259,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym915 := z.EncBinary() - _ = yym915 + yym920 := z.EncBinary() + _ = yym920 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym917 := z.EncBinary() - _ = yym917 + yym922 := z.EncBinary() + _ = yym922 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) @@ -8237,17 +8278,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym918 := z.EncBinary() - _ = yym918 + yym923 := z.EncBinary() + _ = yym923 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym920 := z.EncBinary() - _ = yym920 + yym925 := z.EncBinary() + _ = yym925 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) @@ -8256,17 +8297,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hardPodAffinitySymmetricWeight")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym921 := z.EncBinary() - _ = yym921 + yym926 := z.EncBinary() + _ = yym926 if false { } else { r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym923 := z.EncBinary() - _ = yym923 + yym928 := z.EncBinary() + _ = yym928 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) @@ -8275,25 +8316,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("failureDomains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym924 := z.EncBinary() - _ = yym924 + yym929 := z.EncBinary() + _ = yym929 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) } } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy926 := &x.LeaderElection - yy926.CodecEncodeSelf(e) + yy931 := &x.LeaderElection + yy931.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy927 := &x.LeaderElection - yy927.CodecEncodeSelf(e) + yy932 := &x.LeaderElection + yy932.CodecEncodeSelf(e) } - if yyr885 || yy2arr885 { + if yyr890 || yy2arr890 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -8306,25 +8347,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym928 := z.DecBinary() - _ = yym928 + yym933 := z.DecBinary() + _ = yym933 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct929 := r.ContainerType() - if yyct929 == codecSelferValueTypeMap1234 { - yyl929 := r.ReadMapStart() - if yyl929 == 0 { + yyct934 := r.ContainerType() + if yyct934 == codecSelferValueTypeMap1234 { + yyl934 := r.ReadMapStart() + if yyl934 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl929, d) + x.codecDecodeSelfFromMap(yyl934, d) } - } else if yyct929 == codecSelferValueTypeArray1234 { - yyl929 := r.ReadArrayStart() - if yyl929 == 0 { + } else if yyct934 == codecSelferValueTypeArray1234 { + yyl934 := r.ReadArrayStart() + if yyl934 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl929, d) + x.codecDecodeSelfFromArray(yyl934, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8336,12 +8377,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys930Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys930Slc - var yyhl930 bool = l >= 0 - for yyj930 := 0; ; yyj930++ { - if yyhl930 { - if yyj930 >= l { + var yys935Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys935Slc + var yyhl935 bool = l >= 0 + for yyj935 := 0; ; yyj935++ { + if yyhl935 { + if yyj935 >= l { break } } else { @@ -8350,10 +8391,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys930Slc = r.DecodeBytes(yys930Slc, true, true) - yys930 := string(yys930Slc) + yys935Slc = r.DecodeBytes(yys935Slc, true, true) + yys935 := string(yys935Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys930 { + switch yys935 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -8436,13 +8477,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv944 := &x.LeaderElection - yyv944.CodecDecodeSelf(d) + yyv949 := &x.LeaderElection + yyv949.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys930) - } // end switch yys930 - } // end for yyj930 + z.DecStructFieldNotFound(-1, yys935) + } // end switch yys935 + } // end for yyj935 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -8450,16 +8491,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj945 int - var yyb945 bool - var yyhl945 bool = l >= 0 - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + var yyj950 int + var yyb950 bool + var yyhl950 bool = l >= 0 + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8469,13 +8510,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8485,13 +8526,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8501,13 +8542,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int32(r.DecodeInt(32)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8517,13 +8558,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8533,13 +8574,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8549,13 +8590,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8565,13 +8606,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8581,13 +8622,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.ContentType = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8597,13 +8638,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8613,13 +8654,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8629,13 +8670,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8645,13 +8686,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.HardPodAffinitySymmetricWeight = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8661,13 +8702,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.FailureDomains = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8675,21 +8716,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv959 := &x.LeaderElection - yyv959.CodecDecodeSelf(d) + yyv964 := &x.LeaderElection + yyv964.CodecDecodeSelf(d) } for { - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj950++ + if yyhl950 { + yyb950 = yyj950 > l } else { - yyb945 = r.CheckBreak() + yyb950 = r.CheckBreak() } - if yyb945 { + if yyb950 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj945-1, "") + z.DecStructFieldNotFound(yyj950-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -8701,33 +8742,33 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym960 := z.EncBinary() - _ = yym960 + yym965 := z.EncBinary() + _ = yym965 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep961 := !z.EncBinary() - yy2arr961 := z.EncBasicHandle().StructToArray - var yyq961 [4]bool - _, _, _ = yysep961, yyq961, yy2arr961 - const yyr961 bool = false - var yynn961 int - if yyr961 || yy2arr961 { + yysep966 := !z.EncBinary() + yy2arr966 := z.EncBasicHandle().StructToArray + var yyq966 [4]bool + _, _, _ = yysep966, yyq966, yy2arr966 + const yyr966 bool = false + var yynn966 int + if yyr966 || yy2arr966 { r.EncodeArrayStart(4) } else { - yynn961 = 4 - for _, b := range yyq961 { + yynn966 = 4 + for _, b := range yyq966 { if b { - yynn961++ + yynn966++ } } - r.EncodeMapStart(yynn961) - yynn961 = 0 + r.EncodeMapStart(yynn966) + yynn966 = 0 } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym963 := z.EncBinary() - _ = yym963 + yym968 := z.EncBinary() + _ = yym968 if false { } else { r.EncodeBool(bool(x.LeaderElect)) @@ -8736,43 +8777,16 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElect")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym964 := z.EncBinary() - _ = yym964 + yym969 := z.EncBinary() + _ = yym969 if false { } else { r.EncodeBool(bool(x.LeaderElect)) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy966 := &x.LeaseDuration - 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) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy968 := &x.LeaseDuration - yym969 := z.EncBinary() - _ = yym969 - if false { - } else if z.HasExtensions() && z.EncExt(yy968) { - } else if !yym969 && z.IsJSONHandle() { - z.EncJSONMarshal(yy968) - } else { - z.EncFallback(yy968) - } - } - if yyr961 || yy2arr961 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy971 := &x.RenewDeadline + yy971 := &x.LeaseDuration yym972 := z.EncBinary() _ = yym972 if false { @@ -8784,9 +8798,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) - yy973 := &x.RenewDeadline + yy973 := &x.LeaseDuration yym974 := z.EncBinary() _ = yym974 if false { @@ -8797,9 +8811,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy973) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy976 := &x.RetryPeriod + yy976 := &x.RenewDeadline yym977 := z.EncBinary() _ = yym977 if false { @@ -8811,9 +8825,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) - yy978 := &x.RetryPeriod + yy978 := &x.RenewDeadline yym979 := z.EncBinary() _ = yym979 if false { @@ -8824,7 +8838,34 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy978) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy981 := &x.RetryPeriod + yym982 := z.EncBinary() + _ = yym982 + if false { + } else if z.HasExtensions() && z.EncExt(yy981) { + } else if !yym982 && z.IsJSONHandle() { + z.EncJSONMarshal(yy981) + } else { + z.EncFallback(yy981) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy983 := &x.RetryPeriod + yym984 := z.EncBinary() + _ = yym984 + if false { + } else if z.HasExtensions() && z.EncExt(yy983) { + } else if !yym984 && z.IsJSONHandle() { + z.EncJSONMarshal(yy983) + } else { + z.EncFallback(yy983) + } + } + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -8837,25 +8878,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym980 := z.DecBinary() - _ = yym980 + yym985 := z.DecBinary() + _ = yym985 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct981 := r.ContainerType() - if yyct981 == codecSelferValueTypeMap1234 { - yyl981 := r.ReadMapStart() - if yyl981 == 0 { + yyct986 := r.ContainerType() + if yyct986 == codecSelferValueTypeMap1234 { + yyl986 := r.ReadMapStart() + if yyl986 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl981, d) + x.codecDecodeSelfFromMap(yyl986, d) } - } else if yyct981 == codecSelferValueTypeArray1234 { - yyl981 := r.ReadArrayStart() - if yyl981 == 0 { + } else if yyct986 == codecSelferValueTypeArray1234 { + yyl986 := r.ReadArrayStart() + if yyl986 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl981, d) + x.codecDecodeSelfFromArray(yyl986, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8867,12 +8908,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys982Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys982Slc - var yyhl982 bool = l >= 0 - for yyj982 := 0; ; yyj982++ { - if yyhl982 { - if yyj982 >= l { + var yys987Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys987Slc + var yyhl987 bool = l >= 0 + for yyj987 := 0; ; yyj987++ { + if yyhl987 { + if yyj987 >= l { break } } else { @@ -8881,10 +8922,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys982Slc = r.DecodeBytes(yys982Slc, true, true) - yys982 := string(yys982Slc) + yys987Slc = r.DecodeBytes(yys987Slc, true, true) + yys987 := string(yys987Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys982 { + switch yys987 { case "leaderElect": if r.TryDecodeAsNil() { x.LeaderElect = false @@ -8895,51 +8936,51 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv984 := &x.LeaseDuration - yym985 := z.DecBinary() - _ = yym985 + yyv989 := &x.LeaseDuration + yym990 := z.DecBinary() + _ = yym990 if false { - } else if z.HasExtensions() && z.DecExt(yyv984) { - } else if !yym985 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv984) + } else if z.HasExtensions() && z.DecExt(yyv989) { + } else if !yym990 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv989) } else { - z.DecFallback(yyv984, false) + z.DecFallback(yyv989, false) } } case "renewDeadline": if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv986 := &x.RenewDeadline - yym987 := z.DecBinary() - _ = yym987 + yyv991 := &x.RenewDeadline + yym992 := z.DecBinary() + _ = yym992 if false { - } else if z.HasExtensions() && z.DecExt(yyv986) { - } else if !yym987 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv986) + } else if z.HasExtensions() && z.DecExt(yyv991) { + } else if !yym992 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv991) } else { - z.DecFallback(yyv986, false) + z.DecFallback(yyv991, false) } } case "retryPeriod": if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv988 := &x.RetryPeriod - yym989 := z.DecBinary() - _ = yym989 + yyv993 := &x.RetryPeriod + yym994 := z.DecBinary() + _ = yym994 if false { - } else if z.HasExtensions() && z.DecExt(yyv988) { - } else if !yym989 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv988) + } else if z.HasExtensions() && z.DecExt(yyv993) { + } else if !yym994 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv993) } else { - z.DecFallback(yyv988, false) + z.DecFallback(yyv993, false) } } default: - z.DecStructFieldNotFound(-1, yys982) - } // end switch yys982 - } // end for yyj982 + z.DecStructFieldNotFound(-1, yys987) + } // end switch yys987 + } // end for yyj987 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -8947,16 +8988,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj990 int - var yyb990 bool - var yyhl990 bool = l >= 0 - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + var yyj995 int + var yyb995 bool + var yyhl995 bool = l >= 0 + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8966,13 +9007,13 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } else { x.LeaderElect = bool(r.DecodeBool()) } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8980,24 +9021,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.LeaseDuration = pkg1_unversioned.Duration{} } else { - yyv992 := &x.LeaseDuration - yym993 := z.DecBinary() - _ = yym993 + yyv997 := &x.LeaseDuration + yym998 := z.DecBinary() + _ = yym998 if false { - } else if z.HasExtensions() && z.DecExt(yyv992) { - } else if !yym993 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv992) + } else if z.HasExtensions() && z.DecExt(yyv997) { + } else if !yym998 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv997) } else { - z.DecFallback(yyv992, false) + z.DecFallback(yyv997, false) } } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9005,24 +9046,24 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RenewDeadline = pkg1_unversioned.Duration{} } else { - yyv994 := &x.RenewDeadline - yym995 := z.DecBinary() - _ = yym995 + yyv999 := &x.RenewDeadline + yym1000 := z.DecBinary() + _ = yym1000 if false { - } else if z.HasExtensions() && z.DecExt(yyv994) { - } else if !yym995 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv994) + } else if z.HasExtensions() && z.DecExt(yyv999) { + } else if !yym1000 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv999) } else { - z.DecFallback(yyv994, false) + z.DecFallback(yyv999, false) } } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -9030,29 +9071,29 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 if r.TryDecodeAsNil() { x.RetryPeriod = pkg1_unversioned.Duration{} } else { - yyv996 := &x.RetryPeriod - yym997 := z.DecBinary() - _ = yym997 + yyv1001 := &x.RetryPeriod + yym1002 := z.DecBinary() + _ = yym1002 if false { - } else if z.HasExtensions() && z.DecExt(yyv996) { - } else if !yym997 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv996) + } else if z.HasExtensions() && z.DecExt(yyv1001) { + } else if !yym1002 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1001) } else { - z.DecFallback(yyv996, false) + z.DecFallback(yyv1001, false) } } for { - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj990-1, "") + z.DecStructFieldNotFound(yyj995-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -9064,36 +9105,36 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode if x == nil { r.EncodeNil() } else { - yym998 := z.EncBinary() - _ = yym998 + yym1003 := z.EncBinary() + _ = yym1003 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep999 := !z.EncBinary() - yy2arr999 := z.EncBasicHandle().StructToArray - var yyq999 [61]bool - _, _, _ = yysep999, yyq999, yy2arr999 - const yyr999 bool = false - yyq999[0] = x.Kind != "" - yyq999[1] = x.APIVersion != "" - var yynn999 int - if yyr999 || yy2arr999 { + yysep1004 := !z.EncBinary() + yy2arr1004 := z.EncBasicHandle().StructToArray + var yyq1004 [61]bool + _, _, _ = yysep1004, yyq1004, yy2arr1004 + const yyr1004 bool = false + yyq1004[0] = x.Kind != "" + yyq1004[1] = x.APIVersion != "" + var yynn1004 int + if yyr1004 || yy2arr1004 { r.EncodeArrayStart(61) } else { - yynn999 = 59 - for _, b := range yyq999 { + yynn1004 = 59 + for _, b := range yyq1004 { if b { - yynn999++ + yynn1004++ } } - r.EncodeMapStart(yynn999) - yynn999 = 0 + r.EncodeMapStart(yynn1004) + yynn1004 = 0 } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq999[0] { - yym1001 := z.EncBinary() - _ = yym1001 + if yyq1004[0] { + yym1006 := z.EncBinary() + _ = yym1006 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -9102,23 +9143,23 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq999[0] { + if yyq1004[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1002 := z.EncBinary() - _ = yym1002 + yym1007 := z.EncBinary() + _ = yym1007 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq999[1] { - yym1004 := z.EncBinary() - _ = yym1004 + if yyq1004[1] { + yym1009 := z.EncBinary() + _ = yym1009 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -9127,22 +9168,22 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq999[1] { + if yyq1004[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1005 := z.EncBinary() - _ = yym1005 + yym1010 := z.EncBinary() + _ = yym1010 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1007 := z.EncBinary() - _ = yym1007 + yym1012 := z.EncBinary() + _ = yym1012 if false { } else { r.EncodeInt(int64(x.Port)) @@ -9151,17 +9192,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1008 := z.EncBinary() - _ = yym1008 + yym1013 := z.EncBinary() + _ = yym1013 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1010 := z.EncBinary() - _ = yym1010 + yym1015 := z.EncBinary() + _ = yym1015 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -9170,17 +9211,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1011 := z.EncBinary() - _ = yym1011 + yym1016 := z.EncBinary() + _ = yym1016 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1013 := z.EncBinary() - _ = yym1013 + yym1018 := z.EncBinary() + _ = yym1018 if false { } else { r.EncodeBool(bool(x.UseServiceAccountCredentials)) @@ -9189,17 +9230,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("useServiceAccountCredentials")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1014 := z.EncBinary() - _ = yym1014 + yym1019 := z.EncBinary() + _ = yym1019 if false { } else { r.EncodeBool(bool(x.UseServiceAccountCredentials)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1016 := z.EncBinary() - _ = yym1016 + yym1021 := z.EncBinary() + _ = yym1021 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -9208,17 +9249,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1017 := z.EncBinary() - _ = yym1017 + yym1022 := z.EncBinary() + _ = yym1022 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1019 := z.EncBinary() - _ = yym1019 + yym1024 := z.EncBinary() + _ = yym1024 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) @@ -9227,17 +9268,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1020 := z.EncBinary() - _ = yym1020 + yym1025 := z.EncBinary() + _ = yym1025 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1022 := z.EncBinary() - _ = yym1022 + yym1027 := z.EncBinary() + _ = yym1027 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) @@ -9246,17 +9287,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentEndpointSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1023 := z.EncBinary() - _ = yym1023 + yym1028 := z.EncBinary() + _ = yym1028 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1025 := z.EncBinary() - _ = yym1025 + yym1030 := z.EncBinary() + _ = yym1030 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) @@ -9265,17 +9306,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRSSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1026 := z.EncBinary() - _ = yym1026 + yym1031 := z.EncBinary() + _ = yym1031 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1028 := z.EncBinary() - _ = yym1028 + yym1033 := z.EncBinary() + _ = yym1033 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) @@ -9284,17 +9325,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1029 := z.EncBinary() - _ = yym1029 + yym1034 := z.EncBinary() + _ = yym1034 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1031 := z.EncBinary() - _ = yym1031 + yym1036 := z.EncBinary() + _ = yym1036 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) @@ -9303,17 +9344,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentServiceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1032 := z.EncBinary() - _ = yym1032 + yym1037 := z.EncBinary() + _ = yym1037 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1034 := z.EncBinary() - _ = yym1034 + yym1039 := z.EncBinary() + _ = yym1039 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) @@ -9322,17 +9363,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentResourceQuotaSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1035 := z.EncBinary() - _ = yym1035 + yym1040 := z.EncBinary() + _ = yym1040 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1037 := z.EncBinary() - _ = yym1037 + yym1042 := z.EncBinary() + _ = yym1042 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) @@ -9341,17 +9382,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDeploymentSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1038 := z.EncBinary() - _ = yym1038 + yym1043 := z.EncBinary() + _ = yym1043 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1040 := z.EncBinary() - _ = yym1040 + yym1045 := z.EncBinary() + _ = yym1045 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) @@ -9360,17 +9401,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDaemonSetSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1041 := z.EncBinary() - _ = yym1041 + yym1046 := z.EncBinary() + _ = yym1046 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1043 := z.EncBinary() - _ = yym1043 + yym1048 := z.EncBinary() + _ = yym1048 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) @@ -9379,17 +9420,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentJobSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1044 := z.EncBinary() - _ = yym1044 + yym1049 := z.EncBinary() + _ = yym1049 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1046 := z.EncBinary() - _ = yym1046 + yym1051 := z.EncBinary() + _ = yym1051 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) @@ -9398,17 +9439,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentNamespaceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1047 := z.EncBinary() - _ = yym1047 + yym1052 := z.EncBinary() + _ = yym1052 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1049 := z.EncBinary() - _ = yym1049 + yym1054 := z.EncBinary() + _ = yym1054 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) @@ -9417,17 +9458,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentSATokenSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1050 := z.EncBinary() - _ = yym1050 + yym1055 := z.EncBinary() + _ = yym1055 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1052 := z.EncBinary() - _ = yym1052 + yym1057 := z.EncBinary() + _ = yym1057 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) @@ -9436,17 +9477,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRC")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1053 := z.EncBinary() - _ = yym1053 + yym1058 := z.EncBinary() + _ = yym1058 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1055 := z.EncBinary() - _ = yym1055 + yym1060 := z.EncBinary() + _ = yym1060 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) @@ -9455,17 +9496,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1056 := z.EncBinary() - _ = yym1056 + yym1061 := z.EncBinary() + _ = yym1061 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1058 := z.EncBinary() - _ = yym1058 + yym1063 := z.EncBinary() + _ = yym1063 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) @@ -9474,43 +9515,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForDaemonSet")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1059 := z.EncBinary() - _ = yym1059 + yym1064 := z.EncBinary() + _ = yym1064 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1061 := &x.ServiceSyncPeriod - yym1062 := z.EncBinary() - _ = yym1062 - if false { - } else if z.HasExtensions() && z.EncExt(yy1061) { - } else if !yym1062 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1061) - } else { - z.EncFallback(yy1061) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1063 := &x.ServiceSyncPeriod - yym1064 := z.EncBinary() - _ = yym1064 - if false { - } else if z.HasExtensions() && z.EncExt(yy1063) { - } else if !yym1064 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1063) - } else { - z.EncFallback(yy1063) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1066 := &x.NodeSyncPeriod + yy1066 := &x.ServiceSyncPeriod yym1067 := z.EncBinary() _ = yym1067 if false { @@ -9522,9 +9536,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) - yy1068 := &x.NodeSyncPeriod + yy1068 := &x.ServiceSyncPeriod yym1069 := z.EncBinary() _ = yym1069 if false { @@ -9535,9 +9549,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1068) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1071 := &x.RouteReconciliationPeriod + yy1071 := &x.NodeSyncPeriod yym1072 := z.EncBinary() _ = yym1072 if false { @@ -9549,9 +9563,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1073 := &x.RouteReconciliationPeriod + yy1073 := &x.NodeSyncPeriod yym1074 := z.EncBinary() _ = yym1074 if false { @@ -9562,9 +9576,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1073) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1076 := &x.ResourceQuotaSyncPeriod + yy1076 := &x.RouteReconciliationPeriod yym1077 := z.EncBinary() _ = yym1077 if false { @@ -9576,9 +9590,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1078 := &x.ResourceQuotaSyncPeriod + yy1078 := &x.RouteReconciliationPeriod yym1079 := z.EncBinary() _ = yym1079 if false { @@ -9589,9 +9603,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1078) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1081 := &x.NamespaceSyncPeriod + yy1081 := &x.ResourceQuotaSyncPeriod yym1082 := z.EncBinary() _ = yym1082 if false { @@ -9603,9 +9617,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) - yy1083 := &x.NamespaceSyncPeriod + yy1083 := &x.ResourceQuotaSyncPeriod yym1084 := z.EncBinary() _ = yym1084 if false { @@ -9616,9 +9630,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1083) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1086 := &x.PVClaimBinderSyncPeriod + yy1086 := &x.NamespaceSyncPeriod yym1087 := z.EncBinary() _ = yym1087 if false { @@ -9630,9 +9644,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) - yy1088 := &x.PVClaimBinderSyncPeriod + yy1088 := &x.NamespaceSyncPeriod yym1089 := z.EncBinary() _ = yym1089 if false { @@ -9643,9 +9657,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1088) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1091 := &x.MinResyncPeriod + yy1091 := &x.PVClaimBinderSyncPeriod yym1092 := z.EncBinary() _ = yym1092 if false { @@ -9657,9 +9671,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) - yy1093 := &x.MinResyncPeriod + yy1093 := &x.PVClaimBinderSyncPeriod yym1094 := z.EncBinary() _ = yym1094 if false { @@ -9670,10 +9684,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1093) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1096 := z.EncBinary() - _ = yym1096 + yy1096 := &x.MinResyncPeriod + yym1097 := z.EncBinary() + _ = yym1097 + if false { + } else if z.HasExtensions() && z.EncExt(yy1096) { + } else if !yym1097 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1096) + } else { + z.EncFallback(yy1096) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1098 := &x.MinResyncPeriod + yym1099 := z.EncBinary() + _ = yym1099 + if false { + } else if z.HasExtensions() && z.EncExt(yy1098) { + } else if !yym1099 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1098) + } else { + z.EncFallback(yy1098) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1101 := z.EncBinary() + _ = yym1101 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) @@ -9682,43 +9723,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("terminatedPodGCThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1097 := z.EncBinary() - _ = yym1097 + yym1102 := z.EncBinary() + _ = yym1102 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1099 := &x.HorizontalPodAutoscalerSyncPeriod - yym1100 := z.EncBinary() - _ = yym1100 - if false { - } else if z.HasExtensions() && z.EncExt(yy1099) { - } else if !yym1100 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1099) - } else { - z.EncFallback(yy1099) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1101 := &x.HorizontalPodAutoscalerSyncPeriod - yym1102 := z.EncBinary() - _ = yym1102 - if false { - } else if z.HasExtensions() && z.EncExt(yy1101) { - } else if !yym1102 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1101) - } else { - z.EncFallback(yy1101) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1104 := &x.DeploymentControllerSyncPeriod + yy1104 := &x.HorizontalPodAutoscalerSyncPeriod yym1105 := z.EncBinary() _ = yym1105 if false { @@ -9730,9 +9744,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) - yy1106 := &x.DeploymentControllerSyncPeriod + yy1106 := &x.HorizontalPodAutoscalerSyncPeriod yym1107 := z.EncBinary() _ = yym1107 if false { @@ -9743,9 +9757,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1106) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1109 := &x.PodEvictionTimeout + yy1109 := &x.DeploymentControllerSyncPeriod yym1110 := z.EncBinary() _ = yym1110 if false { @@ -9757,9 +9771,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) - yy1111 := &x.PodEvictionTimeout + yy1111 := &x.DeploymentControllerSyncPeriod yym1112 := z.EncBinary() _ = yym1112 if false { @@ -9770,10 +9784,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1111) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1114 := z.EncBinary() - _ = yym1114 + yy1114 := &x.PodEvictionTimeout + yym1115 := z.EncBinary() + _ = yym1115 + if false { + } else if z.HasExtensions() && z.EncExt(yy1114) { + } else if !yym1115 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1114) + } else { + z.EncFallback(yy1114) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1116 := &x.PodEvictionTimeout + yym1117 := z.EncBinary() + _ = yym1117 + if false { + } else if z.HasExtensions() && z.EncExt(yy1116) { + } else if !yym1117 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1116) + } else { + z.EncFallback(yy1116) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1119 := z.EncBinary() + _ = yym1119 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) @@ -9782,17 +9823,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsQps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1115 := z.EncBinary() - _ = yym1115 + yym1120 := z.EncBinary() + _ = yym1120 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1117 := z.EncBinary() - _ = yym1117 + yym1122 := z.EncBinary() + _ = yym1122 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) @@ -9801,44 +9842,44 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1118 := z.EncBinary() - _ = yym1118 + yym1123 := z.EncBinary() + _ = yym1123 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1120 := &x.NodeMonitorGracePeriod - yym1121 := z.EncBinary() - _ = yym1121 + yy1125 := &x.NodeMonitorGracePeriod + yym1126 := z.EncBinary() + _ = yym1126 if false { - } else if z.HasExtensions() && z.EncExt(yy1120) { - } else if !yym1121 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1120) + } else if z.HasExtensions() && z.EncExt(yy1125) { + } else if !yym1126 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1125) } else { - z.EncFallback(yy1120) + z.EncFallback(yy1125) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1122 := &x.NodeMonitorGracePeriod - yym1123 := z.EncBinary() - _ = yym1123 + yy1127 := &x.NodeMonitorGracePeriod + yym1128 := z.EncBinary() + _ = yym1128 if false { - } else if z.HasExtensions() && z.EncExt(yy1122) { - } else if !yym1123 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1122) + } else if z.HasExtensions() && z.EncExt(yy1127) { + } else if !yym1128 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1127) } else { - z.EncFallback(yy1122) + z.EncFallback(yy1127) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1125 := z.EncBinary() - _ = yym1125 + yym1130 := z.EncBinary() + _ = yym1130 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) @@ -9847,43 +9888,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerRetryCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1126 := z.EncBinary() - _ = yym1126 + yym1131 := z.EncBinary() + _ = yym1131 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1128 := &x.NodeStartupGracePeriod - yym1129 := z.EncBinary() - _ = yym1129 - if false { - } else if z.HasExtensions() && z.EncExt(yy1128) { - } else if !yym1129 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1128) - } else { - z.EncFallback(yy1128) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1130 := &x.NodeStartupGracePeriod - yym1131 := z.EncBinary() - _ = yym1131 - if false { - } else if z.HasExtensions() && z.EncExt(yy1130) { - } else if !yym1131 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1130) - } else { - z.EncFallback(yy1130) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1133 := &x.NodeMonitorPeriod + yy1133 := &x.NodeStartupGracePeriod yym1134 := z.EncBinary() _ = yym1134 if false { @@ -9895,9 +9909,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) - yy1135 := &x.NodeMonitorPeriod + yy1135 := &x.NodeStartupGracePeriod yym1136 := z.EncBinary() _ = yym1136 if false { @@ -9908,10 +9922,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1135) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1138 := z.EncBinary() - _ = yym1138 + yy1138 := &x.NodeMonitorPeriod + yym1139 := z.EncBinary() + _ = yym1139 + if false { + } else if z.HasExtensions() && z.EncExt(yy1138) { + } else if !yym1139 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1138) + } else { + z.EncFallback(yy1138) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1140 := &x.NodeMonitorPeriod + yym1141 := z.EncBinary() + _ = yym1141 + if false { + } else if z.HasExtensions() && z.EncExt(yy1140) { + } else if !yym1141 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1140) + } else { + z.EncFallback(yy1140) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1143 := z.EncBinary() + _ = yym1143 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) @@ -9920,17 +9961,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceAccountKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1139 := z.EncBinary() - _ = yym1139 + yym1144 := z.EncBinary() + _ = yym1144 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1141 := z.EncBinary() - _ = yym1141 + yym1146 := z.EncBinary() + _ = yym1146 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) @@ -9939,17 +9980,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1142 := z.EncBinary() - _ = yym1142 + yym1147 := z.EncBinary() + _ = yym1147 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1144 := z.EncBinary() - _ = yym1144 + yym1149 := z.EncBinary() + _ = yym1149 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) @@ -9958,17 +9999,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1145 := z.EncBinary() - _ = yym1145 + yym1150 := z.EncBinary() + _ = yym1150 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1147 := z.EncBinary() - _ = yym1147 + yym1152 := z.EncBinary() + _ = yym1152 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) @@ -9977,17 +10018,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("approveAllKubeletCSRsForGroup")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1148 := z.EncBinary() - _ = yym1148 + yym1153 := z.EncBinary() + _ = yym1153 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1150 := z.EncBinary() - _ = yym1150 + yym1155 := z.EncBinary() + _ = yym1155 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -9996,17 +10037,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1151 := z.EncBinary() - _ = yym1151 + yym1156 := z.EncBinary() + _ = yym1156 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1153 := z.EncBinary() - _ = yym1153 + yym1158 := z.EncBinary() + _ = yym1158 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) @@ -10015,17 +10056,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1154 := z.EncBinary() - _ = yym1154 + yym1159 := z.EncBinary() + _ = yym1159 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1156 := z.EncBinary() - _ = yym1156 + yym1161 := z.EncBinary() + _ = yym1161 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) @@ -10034,17 +10075,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1157 := z.EncBinary() - _ = yym1157 + yym1162 := z.EncBinary() + _ = yym1162 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1159 := z.EncBinary() - _ = yym1159 + yym1164 := z.EncBinary() + _ = yym1164 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) @@ -10053,17 +10094,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1160 := z.EncBinary() - _ = yym1160 + yym1165 := z.EncBinary() + _ = yym1165 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1162 := z.EncBinary() - _ = yym1162 + yym1167 := z.EncBinary() + _ = yym1167 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) @@ -10072,17 +10113,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeCIDRMaskSize")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1163 := z.EncBinary() - _ = yym1163 + yym1168 := z.EncBinary() + _ = yym1168 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1165 := z.EncBinary() - _ = yym1165 + yym1170 := z.EncBinary() + _ = yym1170 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) @@ -10091,17 +10132,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allocateNodeCIDRs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1166 := z.EncBinary() - _ = yym1166 + yym1171 := z.EncBinary() + _ = yym1171 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1168 := z.EncBinary() - _ = yym1168 + yym1173 := z.EncBinary() + _ = yym1173 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) @@ -10110,17 +10151,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCloudRoutes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1169 := z.EncBinary() - _ = yym1169 + yym1174 := z.EncBinary() + _ = yym1174 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1171 := z.EncBinary() - _ = yym1171 + yym1176 := z.EncBinary() + _ = yym1176 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) @@ -10129,17 +10170,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootCAFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1172 := z.EncBinary() - _ = yym1172 + yym1177 := z.EncBinary() + _ = yym1177 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1174 := z.EncBinary() - _ = yym1174 + yym1179 := z.EncBinary() + _ = yym1179 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -10148,17 +10189,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1175 := z.EncBinary() - _ = yym1175 + yym1180 := z.EncBinary() + _ = yym1180 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1177 := z.EncBinary() - _ = yym1177 + yym1182 := z.EncBinary() + _ = yym1182 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -10167,17 +10208,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1178 := z.EncBinary() - _ = yym1178 + yym1183 := z.EncBinary() + _ = yym1183 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1180 := z.EncBinary() - _ = yym1180 + yym1185 := z.EncBinary() + _ = yym1185 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -10186,66 +10227,66 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1181 := z.EncBinary() - _ = yym1181 + yym1186 := z.EncBinary() + _ = yym1186 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1183 := &x.LeaderElection - yy1183.CodecEncodeSelf(e) + yy1188 := &x.LeaderElection + yy1188.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1184 := &x.LeaderElection - yy1184.CodecEncodeSelf(e) + yy1189 := &x.LeaderElection + yy1189.CodecEncodeSelf(e) } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1186 := &x.VolumeConfiguration - yy1186.CodecEncodeSelf(e) + yy1191 := &x.VolumeConfiguration + yy1191.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1187 := &x.VolumeConfiguration - yy1187.CodecEncodeSelf(e) + yy1192 := &x.VolumeConfiguration + yy1192.CodecEncodeSelf(e) } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1189 := &x.ControllerStartInterval - yym1190 := z.EncBinary() - _ = yym1190 + yy1194 := &x.ControllerStartInterval + yym1195 := z.EncBinary() + _ = yym1195 if false { - } else if z.HasExtensions() && z.EncExt(yy1189) { - } else if !yym1190 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1189) + } else if z.HasExtensions() && z.EncExt(yy1194) { + } else if !yym1195 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1194) } else { - z.EncFallback(yy1189) + z.EncFallback(yy1194) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controllerStartInterval")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1191 := &x.ControllerStartInterval - yym1192 := z.EncBinary() - _ = yym1192 + yy1196 := &x.ControllerStartInterval + yym1197 := z.EncBinary() + _ = yym1197 if false { - } else if z.HasExtensions() && z.EncExt(yy1191) { - } else if !yym1192 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1191) + } else if z.HasExtensions() && z.EncExt(yy1196) { + } else if !yym1197 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1196) } else { - z.EncFallback(yy1191) + z.EncFallback(yy1196) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1194 := z.EncBinary() - _ = yym1194 + yym1199 := z.EncBinary() + _ = yym1199 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) @@ -10254,17 +10295,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableGarbageCollector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1195 := z.EncBinary() - _ = yym1195 + yym1200 := z.EncBinary() + _ = yym1200 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1197 := z.EncBinary() - _ = yym1197 + yym1202 := z.EncBinary() + _ = yym1202 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) @@ -10273,17 +10314,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentGCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1198 := z.EncBinary() - _ = yym1198 + yym1203 := z.EncBinary() + _ = yym1203 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1200 := z.EncBinary() - _ = yym1200 + yym1205 := z.EncBinary() + _ = yym1205 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) @@ -10292,17 +10333,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1201 := z.EncBinary() - _ = yym1201 + yym1206 := z.EncBinary() + _ = yym1206 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1203 := z.EncBinary() - _ = yym1203 + yym1208 := z.EncBinary() + _ = yym1208 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) @@ -10311,17 +10352,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("secondaryNodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1204 := z.EncBinary() - _ = yym1204 + yym1209 := z.EncBinary() + _ = yym1209 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1206 := z.EncBinary() - _ = yym1206 + yym1211 := z.EncBinary() + _ = yym1211 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) @@ -10330,17 +10371,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("largeClusterSizeThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1207 := z.EncBinary() - _ = yym1207 + yym1212 := z.EncBinary() + _ = yym1212 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1209 := z.EncBinary() - _ = yym1209 + yym1214 := z.EncBinary() + _ = yym1214 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) @@ -10349,14 +10390,14 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("unhealthyZoneThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1210 := z.EncBinary() - _ = yym1210 + yym1215 := z.EncBinary() + _ = yym1215 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10369,25 +10410,25 @@ func (x *KubeControllerManagerConfiguration) CodecDecodeSelf(d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1211 := z.DecBinary() - _ = yym1211 + yym1216 := z.DecBinary() + _ = yym1216 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1212 := r.ContainerType() - if yyct1212 == codecSelferValueTypeMap1234 { - yyl1212 := r.ReadMapStart() - if yyl1212 == 0 { + yyct1217 := r.ContainerType() + if yyct1217 == codecSelferValueTypeMap1234 { + yyl1217 := r.ReadMapStart() + if yyl1217 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1212, d) + x.codecDecodeSelfFromMap(yyl1217, d) } - } else if yyct1212 == codecSelferValueTypeArray1234 { - yyl1212 := r.ReadArrayStart() - if yyl1212 == 0 { + } else if yyct1217 == codecSelferValueTypeArray1234 { + yyl1217 := r.ReadArrayStart() + if yyl1217 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1212, d) + x.codecDecodeSelfFromArray(yyl1217, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10399,12 +10440,12 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1213Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1213Slc - var yyhl1213 bool = l >= 0 - for yyj1213 := 0; ; yyj1213++ { - if yyhl1213 { - if yyj1213 >= l { + var yys1218Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1218Slc + var yyhl1218 bool = l >= 0 + for yyj1218 := 0; ; yyj1218++ { + if yyhl1218 { + if yyj1218 >= l { break } } else { @@ -10413,10 +10454,10 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1213Slc = r.DecodeBytes(yys1213Slc, true, true) - yys1213 := string(yys1213Slc) + yys1218Slc = r.DecodeBytes(yys1218Slc, true, true) + yys1218 := string(yys1218Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1213 { + switch yys1218 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -10541,105 +10582,105 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1234 := &x.ServiceSyncPeriod - yym1235 := z.DecBinary() - _ = yym1235 + yyv1239 := &x.ServiceSyncPeriod + yym1240 := z.DecBinary() + _ = yym1240 if false { - } else if z.HasExtensions() && z.DecExt(yyv1234) { - } else if !yym1235 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1234) + } else if z.HasExtensions() && z.DecExt(yyv1239) { + } else if !yym1240 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1239) } else { - z.DecFallback(yyv1234, false) + z.DecFallback(yyv1239, false) } } case "nodeSyncPeriod": if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1236 := &x.NodeSyncPeriod - yym1237 := z.DecBinary() - _ = yym1237 + yyv1241 := &x.NodeSyncPeriod + yym1242 := z.DecBinary() + _ = yym1242 if false { - } else if z.HasExtensions() && z.DecExt(yyv1236) { - } else if !yym1237 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1236) + } else if z.HasExtensions() && z.DecExt(yyv1241) { + } else if !yym1242 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1241) } else { - z.DecFallback(yyv1236, false) + z.DecFallback(yyv1241, false) } } case "routeReconciliationPeriod": if r.TryDecodeAsNil() { x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} } else { - yyv1238 := &x.RouteReconciliationPeriod - yym1239 := z.DecBinary() - _ = yym1239 + yyv1243 := &x.RouteReconciliationPeriod + yym1244 := z.DecBinary() + _ = yym1244 if false { - } else if z.HasExtensions() && z.DecExt(yyv1238) { - } else if !yym1239 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1238) + } else if z.HasExtensions() && z.DecExt(yyv1243) { + } else if !yym1244 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1243) } else { - z.DecFallback(yyv1238, false) + z.DecFallback(yyv1243, false) } } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1240 := &x.ResourceQuotaSyncPeriod - yym1241 := z.DecBinary() - _ = yym1241 + yyv1245 := &x.ResourceQuotaSyncPeriod + yym1246 := z.DecBinary() + _ = yym1246 if false { - } else if z.HasExtensions() && z.DecExt(yyv1240) { - } else if !yym1241 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1240) + } else if z.HasExtensions() && z.DecExt(yyv1245) { + } else if !yym1246 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1245) } else { - z.DecFallback(yyv1240, false) + z.DecFallback(yyv1245, false) } } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1242 := &x.NamespaceSyncPeriod - yym1243 := z.DecBinary() - _ = yym1243 + yyv1247 := &x.NamespaceSyncPeriod + yym1248 := z.DecBinary() + _ = yym1248 if false { - } else if z.HasExtensions() && z.DecExt(yyv1242) { - } else if !yym1243 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1242) + } else if z.HasExtensions() && z.DecExt(yyv1247) { + } else if !yym1248 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1247) } else { - z.DecFallback(yyv1242, false) + z.DecFallback(yyv1247, false) } } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1244 := &x.PVClaimBinderSyncPeriod - yym1245 := z.DecBinary() - _ = yym1245 + yyv1249 := &x.PVClaimBinderSyncPeriod + yym1250 := z.DecBinary() + _ = yym1250 if false { - } else if z.HasExtensions() && z.DecExt(yyv1244) { - } else if !yym1245 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1244) + } else if z.HasExtensions() && z.DecExt(yyv1249) { + } else if !yym1250 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1249) } else { - z.DecFallback(yyv1244, false) + z.DecFallback(yyv1249, false) } } case "minResyncPeriod": if r.TryDecodeAsNil() { x.MinResyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1246 := &x.MinResyncPeriod - yym1247 := z.DecBinary() - _ = yym1247 + yyv1251 := &x.MinResyncPeriod + yym1252 := z.DecBinary() + _ = yym1252 if false { - } else if z.HasExtensions() && z.DecExt(yyv1246) { - } else if !yym1247 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1246) + } else if z.HasExtensions() && z.DecExt(yyv1251) { + } else if !yym1252 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1251) } else { - z.DecFallback(yyv1246, false) + z.DecFallback(yyv1251, false) } } case "terminatedPodGCThreshold": @@ -10652,45 +10693,45 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1249 := &x.HorizontalPodAutoscalerSyncPeriod - yym1250 := z.DecBinary() - _ = yym1250 + yyv1254 := &x.HorizontalPodAutoscalerSyncPeriod + yym1255 := z.DecBinary() + _ = yym1255 if false { - } else if z.HasExtensions() && z.DecExt(yyv1249) { - } else if !yym1250 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1249) + } else if z.HasExtensions() && z.DecExt(yyv1254) { + } else if !yym1255 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1254) } else { - z.DecFallback(yyv1249, false) + z.DecFallback(yyv1254, false) } } case "deploymentControllerSyncPeriod": if r.TryDecodeAsNil() { x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1251 := &x.DeploymentControllerSyncPeriod - yym1252 := z.DecBinary() - _ = yym1252 + yyv1256 := &x.DeploymentControllerSyncPeriod + yym1257 := z.DecBinary() + _ = yym1257 if false { - } else if z.HasExtensions() && z.DecExt(yyv1251) { - } else if !yym1252 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1251) + } else if z.HasExtensions() && z.DecExt(yyv1256) { + } else if !yym1257 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1256) } else { - z.DecFallback(yyv1251, false) + z.DecFallback(yyv1256, false) } } case "podEvictionTimeout": if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1253 := &x.PodEvictionTimeout - yym1254 := z.DecBinary() - _ = yym1254 + yyv1258 := &x.PodEvictionTimeout + yym1259 := z.DecBinary() + _ = yym1259 if false { - } else if z.HasExtensions() && z.DecExt(yyv1253) { - } else if !yym1254 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1253) + } else if z.HasExtensions() && z.DecExt(yyv1258) { + } else if !yym1259 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1258) } else { - z.DecFallback(yyv1253, false) + z.DecFallback(yyv1258, false) } } case "deletingPodsQps": @@ -10709,15 +10750,15 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1257 := &x.NodeMonitorGracePeriod - yym1258 := z.DecBinary() - _ = yym1258 + yyv1262 := &x.NodeMonitorGracePeriod + yym1263 := z.DecBinary() + _ = yym1263 if false { - } else if z.HasExtensions() && z.DecExt(yyv1257) { - } else if !yym1258 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1257) + } else if z.HasExtensions() && z.DecExt(yyv1262) { + } else if !yym1263 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1262) } else { - z.DecFallback(yyv1257, false) + z.DecFallback(yyv1262, false) } } case "registerRetryCount": @@ -10730,30 +10771,30 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1260 := &x.NodeStartupGracePeriod - yym1261 := z.DecBinary() - _ = yym1261 + yyv1265 := &x.NodeStartupGracePeriod + yym1266 := z.DecBinary() + _ = yym1266 if false { - } else if z.HasExtensions() && z.DecExt(yyv1260) { - } else if !yym1261 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1260) + } else if z.HasExtensions() && z.DecExt(yyv1265) { + } else if !yym1266 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1265) } else { - z.DecFallback(yyv1260, false) + z.DecFallback(yyv1265, false) } } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { x.NodeMonitorPeriod = pkg1_unversioned.Duration{} } else { - yyv1262 := &x.NodeMonitorPeriod - yym1263 := z.DecBinary() - _ = yym1263 + yyv1267 := &x.NodeMonitorPeriod + yym1268 := z.DecBinary() + _ = yym1268 if false { - } else if z.HasExtensions() && z.DecExt(yyv1262) { - } else if !yym1263 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1262) + } else if z.HasExtensions() && z.DecExt(yyv1267) { + } else if !yym1268 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1267) } else { - z.DecFallback(yyv1262, false) + z.DecFallback(yyv1267, false) } } case "serviceAccountKeyFile": @@ -10850,29 +10891,29 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1279 := &x.LeaderElection - yyv1279.CodecDecodeSelf(d) + yyv1284 := &x.LeaderElection + yyv1284.CodecDecodeSelf(d) } case "volumeConfiguration": if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1280 := &x.VolumeConfiguration - yyv1280.CodecDecodeSelf(d) + yyv1285 := &x.VolumeConfiguration + yyv1285.CodecDecodeSelf(d) } case "controllerStartInterval": if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1281 := &x.ControllerStartInterval - yym1282 := z.DecBinary() - _ = yym1282 + yyv1286 := &x.ControllerStartInterval + yym1287 := z.DecBinary() + _ = yym1287 if false { - } else if z.HasExtensions() && z.DecExt(yyv1281) { - } else if !yym1282 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1281) + } else if z.HasExtensions() && z.DecExt(yyv1286) { + } else if !yym1287 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1286) } else { - z.DecFallback(yyv1281, false) + z.DecFallback(yyv1286, false) } } case "enableGarbageCollector": @@ -10912,9 +10953,9 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } default: - z.DecStructFieldNotFound(-1, yys1213) - } // end switch yys1213 - } // end for yyj1213 + z.DecStructFieldNotFound(-1, yys1218) + } // end switch yys1218 + } // end for yyj1218 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10922,16 +10963,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1289 int - var yyb1289 bool - var yyhl1289 bool = l >= 0 - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + var yyj1294 int + var yyb1294 bool + var yyhl1294 bool = l >= 0 + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10941,13 +10982,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Kind = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10957,13 +10998,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.APIVersion = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10973,13 +11014,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Port = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10989,13 +11030,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Address = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11005,13 +11046,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.UseServiceAccountCredentials = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11021,13 +11062,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudProvider = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11037,13 +11078,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11053,13 +11094,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentEndpointSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11069,13 +11110,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRSSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11085,13 +11126,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRCSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11101,13 +11142,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentServiceSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11117,13 +11158,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentResourceQuotaSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11133,13 +11174,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDeploymentSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11149,13 +11190,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDaemonSetSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11165,13 +11206,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentJobSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11181,13 +11222,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentNamespaceSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11197,13 +11238,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentSATokenSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11213,13 +11254,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRC = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11229,13 +11270,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRS = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11245,13 +11286,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForDaemonSet = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11259,24 +11300,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ServiceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1310 := &x.ServiceSyncPeriod - yym1311 := z.DecBinary() - _ = yym1311 + yyv1315 := &x.ServiceSyncPeriod + yym1316 := z.DecBinary() + _ = yym1316 if false { - } else if z.HasExtensions() && z.DecExt(yyv1310) { - } else if !yym1311 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1310) + } else if z.HasExtensions() && z.DecExt(yyv1315) { + } else if !yym1316 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1315) } else { - z.DecFallback(yyv1310, false) + z.DecFallback(yyv1315, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11284,24 +11325,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1312 := &x.NodeSyncPeriod - yym1313 := z.DecBinary() - _ = yym1313 + yyv1317 := &x.NodeSyncPeriod + yym1318 := z.DecBinary() + _ = yym1318 if false { - } else if z.HasExtensions() && z.DecExt(yyv1312) { - } else if !yym1313 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1312) + } else if z.HasExtensions() && z.DecExt(yyv1317) { + } else if !yym1318 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1317) } else { - z.DecFallback(yyv1312, false) + z.DecFallback(yyv1317, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11309,24 +11350,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} } else { - yyv1314 := &x.RouteReconciliationPeriod - yym1315 := z.DecBinary() - _ = yym1315 + yyv1319 := &x.RouteReconciliationPeriod + yym1320 := z.DecBinary() + _ = yym1320 if false { - } else if z.HasExtensions() && z.DecExt(yyv1314) { - } else if !yym1315 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1314) + } else if z.HasExtensions() && z.DecExt(yyv1319) { + } else if !yym1320 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1319) } else { - z.DecFallback(yyv1314, false) + z.DecFallback(yyv1319, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11334,24 +11375,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1316 := &x.ResourceQuotaSyncPeriod - yym1317 := z.DecBinary() - _ = yym1317 + yyv1321 := &x.ResourceQuotaSyncPeriod + yym1322 := z.DecBinary() + _ = yym1322 if false { - } else if z.HasExtensions() && z.DecExt(yyv1316) { - } else if !yym1317 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1316) + } else if z.HasExtensions() && z.DecExt(yyv1321) { + } else if !yym1322 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1321) } else { - z.DecFallback(yyv1316, false) + z.DecFallback(yyv1321, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11359,24 +11400,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1318 := &x.NamespaceSyncPeriod - yym1319 := z.DecBinary() - _ = yym1319 + yyv1323 := &x.NamespaceSyncPeriod + yym1324 := z.DecBinary() + _ = yym1324 if false { - } else if z.HasExtensions() && z.DecExt(yyv1318) { - } else if !yym1319 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1318) + } else if z.HasExtensions() && z.DecExt(yyv1323) { + } else if !yym1324 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1323) } else { - z.DecFallback(yyv1318, false) + z.DecFallback(yyv1323, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11384,73 +11425,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1320 := &x.PVClaimBinderSyncPeriod - yym1321 := z.DecBinary() - _ = yym1321 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1320) { - } else if !yym1321 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1320) - } else { - z.DecFallback(yyv1320, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1322 := &x.MinResyncPeriod - yym1323 := z.DecBinary() - _ = yym1323 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1322) { - } else if !yym1323 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1322) - } else { - z.DecFallback(yyv1322, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.TerminatedPodGCThreshold = 0 - } else { - x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1325 := &x.HorizontalPodAutoscalerSyncPeriod + yyv1325 := &x.PVClaimBinderSyncPeriod yym1326 := z.DecBinary() _ = yym1326 if false { @@ -11461,21 +11436,21 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1325, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_unversioned.Duration{} } else { - yyv1327 := &x.DeploymentControllerSyncPeriod + yyv1327 := &x.MinResyncPeriod yym1328 := z.DecBinary() _ = yym1328 if false { @@ -11486,13 +11461,79 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1327, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.TerminatedPodGCThreshold = 0 + } else { + x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1330 := &x.HorizontalPodAutoscalerSyncPeriod + yym1331 := z.DecBinary() + _ = yym1331 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1330) { + } else if !yym1331 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1330) + } else { + z.DecFallback(yyv1330, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + } else { + yyv1332 := &x.DeploymentControllerSyncPeriod + yym1333 := z.DecBinary() + _ = yym1333 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1332) { + } else if !yym1333 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1332) + } else { + z.DecFallback(yyv1332, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11500,24 +11541,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.PodEvictionTimeout = pkg1_unversioned.Duration{} } else { - yyv1329 := &x.PodEvictionTimeout - yym1330 := z.DecBinary() - _ = yym1330 + yyv1334 := &x.PodEvictionTimeout + yym1335 := z.DecBinary() + _ = yym1335 if false { - } else if z.HasExtensions() && z.DecExt(yyv1329) { - } else if !yym1330 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1329) + } else if z.HasExtensions() && z.DecExt(yyv1334) { + } else if !yym1335 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1334) } else { - z.DecFallback(yyv1329, false) + z.DecFallback(yyv1334, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11527,13 +11568,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsQps = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11543,13 +11584,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsBurst = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11557,73 +11598,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} } else { - yyv1333 := &x.NodeMonitorGracePeriod - yym1334 := z.DecBinary() - _ = yym1334 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1333) { - } else if !yym1334 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1333) - } else { - z.DecFallback(yyv1333, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.RegisterRetryCount = 0 - } else { - x.RegisterRetryCount = int32(r.DecodeInt(32)) - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} - } else { - yyv1336 := &x.NodeStartupGracePeriod - yym1337 := z.DecBinary() - _ = yym1337 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1336) { - } else if !yym1337 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1336) - } else { - z.DecFallback(yyv1336, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} - } else { - yyv1338 := &x.NodeMonitorPeriod + yyv1338 := &x.NodeMonitorGracePeriod yym1339 := z.DecBinary() _ = yym1339 if false { @@ -11634,13 +11609,79 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1338, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.RegisterRetryCount = 0 + } else { + x.RegisterRetryCount = int32(r.DecodeInt(32)) + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + } else { + yyv1341 := &x.NodeStartupGracePeriod + yym1342 := z.DecBinary() + _ = yym1342 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1341) { + } else if !yym1342 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1341) + } else { + z.DecFallback(yyv1341, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + } else { + yyv1343 := &x.NodeMonitorPeriod + yym1344 := z.DecBinary() + _ = yym1344 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1343) { + } else if !yym1344 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1343) + } else { + z.DecFallback(yyv1343, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11650,13 +11691,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceAccountKeyFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11666,13 +11707,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningCertFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11682,13 +11723,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningKeyFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11698,13 +11739,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ApproveAllKubeletCSRsForGroup = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11714,13 +11755,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11730,13 +11771,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterName = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11746,13 +11787,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterCIDR = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11762,13 +11803,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceCIDR = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11778,13 +11819,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeCIDRMaskSize = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11794,13 +11835,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.AllocateNodeCIDRs = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11810,13 +11851,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConfigureCloudRoutes = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11826,13 +11867,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.RootCAFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11842,13 +11883,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ContentType = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11858,13 +11899,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11874,13 +11915,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11888,16 +11929,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1355 := &x.LeaderElection - yyv1355.CodecDecodeSelf(d) + yyv1360 := &x.LeaderElection + yyv1360.CodecDecodeSelf(d) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11905,16 +11946,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1356 := &x.VolumeConfiguration - yyv1356.CodecDecodeSelf(d) + yyv1361 := &x.VolumeConfiguration + yyv1361.CodecDecodeSelf(d) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11922,24 +11963,24 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.ControllerStartInterval = pkg1_unversioned.Duration{} } else { - yyv1357 := &x.ControllerStartInterval - yym1358 := z.DecBinary() - _ = yym1358 + yyv1362 := &x.ControllerStartInterval + yym1363 := z.DecBinary() + _ = yym1363 if false { - } else if z.HasExtensions() && z.DecExt(yyv1357) { - } else if !yym1358 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1357) + } else if z.HasExtensions() && z.DecExt(yyv1362) { + } else if !yym1363 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1362) } else { - z.DecFallback(yyv1357, false) + z.DecFallback(yyv1362, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11949,13 +11990,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableGarbageCollector = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11965,13 +12006,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentGCSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11981,13 +12022,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11997,13 +12038,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.SecondaryNodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12013,13 +12054,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LargeClusterSizeThreshold = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12030,17 +12071,17 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } for { - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1289-1, "") + z.DecStructFieldNotFound(yyj1294-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12052,33 +12093,33 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1365 := z.EncBinary() - _ = yym1365 + yym1370 := z.EncBinary() + _ = yym1370 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1366 := !z.EncBinary() - yy2arr1366 := z.EncBasicHandle().StructToArray - var yyq1366 [4]bool - _, _, _ = yysep1366, yyq1366, yy2arr1366 - const yyr1366 bool = false - var yynn1366 int - if yyr1366 || yy2arr1366 { + yysep1371 := !z.EncBinary() + yy2arr1371 := z.EncBasicHandle().StructToArray + var yyq1371 [4]bool + _, _, _ = yysep1371, yyq1371, yy2arr1371 + const yyr1371 bool = false + var yynn1371 int + if yyr1371 || yy2arr1371 { r.EncodeArrayStart(4) } else { - yynn1366 = 4 - for _, b := range yyq1366 { + yynn1371 = 4 + for _, b := range yyq1371 { if b { - yynn1366++ + yynn1371++ } } - r.EncodeMapStart(yynn1366) - yynn1366 = 0 + r.EncodeMapStart(yynn1371) + yynn1371 = 0 } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1368 := z.EncBinary() - _ = yym1368 + yym1373 := z.EncBinary() + _ = yym1373 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) @@ -12087,17 +12128,17 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableHostPathProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1369 := z.EncBinary() - _ = yym1369 + yym1374 := z.EncBinary() + _ = yym1374 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1371 := z.EncBinary() - _ = yym1371 + yym1376 := z.EncBinary() + _ = yym1376 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) @@ -12106,28 +12147,28 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDynamicProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1372 := z.EncBinary() - _ = yym1372 + yym1377 := z.EncBinary() + _ = yym1377 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1374 := &x.PersistentVolumeRecyclerConfiguration - yy1374.CodecEncodeSelf(e) + yy1379 := &x.PersistentVolumeRecyclerConfiguration + yy1379.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("persitentVolumeRecyclerConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1375 := &x.PersistentVolumeRecyclerConfiguration - yy1375.CodecEncodeSelf(e) + yy1380 := &x.PersistentVolumeRecyclerConfiguration + yy1380.CodecEncodeSelf(e) } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1377 := z.EncBinary() - _ = yym1377 + yym1382 := z.EncBinary() + _ = yym1382 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) @@ -12136,14 +12177,14 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("flexVolumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1378 := z.EncBinary() - _ = yym1378 + yym1383 := z.EncBinary() + _ = yym1383 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12156,25 +12197,25 @@ func (x *VolumeConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1379 := z.DecBinary() - _ = yym1379 + yym1384 := z.DecBinary() + _ = yym1384 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1380 := r.ContainerType() - if yyct1380 == codecSelferValueTypeMap1234 { - yyl1380 := r.ReadMapStart() - if yyl1380 == 0 { + yyct1385 := r.ContainerType() + if yyct1385 == codecSelferValueTypeMap1234 { + yyl1385 := r.ReadMapStart() + if yyl1385 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1380, d) + x.codecDecodeSelfFromMap(yyl1385, d) } - } else if yyct1380 == codecSelferValueTypeArray1234 { - yyl1380 := r.ReadArrayStart() - if yyl1380 == 0 { + } else if yyct1385 == codecSelferValueTypeArray1234 { + yyl1385 := r.ReadArrayStart() + if yyl1385 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1380, d) + x.codecDecodeSelfFromArray(yyl1385, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -12186,12 +12227,12 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1381Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1381Slc - var yyhl1381 bool = l >= 0 - for yyj1381 := 0; ; yyj1381++ { - if yyhl1381 { - if yyj1381 >= l { + var yys1386Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1386Slc + var yyhl1386 bool = l >= 0 + for yyj1386 := 0; ; yyj1386++ { + if yyhl1386 { + if yyj1386 >= l { break } } else { @@ -12200,10 +12241,10 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1381Slc = r.DecodeBytes(yys1381Slc, true, true) - yys1381 := string(yys1381Slc) + yys1386Slc = r.DecodeBytes(yys1386Slc, true, true) + yys1386 := string(yys1386Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1381 { + switch yys1386 { case "enableHostPathProvisioning": if r.TryDecodeAsNil() { x.EnableHostPathProvisioning = false @@ -12220,8 +12261,8 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1384 := &x.PersistentVolumeRecyclerConfiguration - yyv1384.CodecDecodeSelf(d) + yyv1389 := &x.PersistentVolumeRecyclerConfiguration + yyv1389.CodecDecodeSelf(d) } case "flexVolumePluginDir": if r.TryDecodeAsNil() { @@ -12230,9 +12271,9 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.FlexVolumePluginDir = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys1381) - } // end switch yys1381 - } // end for yyj1381 + z.DecStructFieldNotFound(-1, yys1386) + } // end switch yys1386 + } // end for yyj1386 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -12240,16 +12281,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1386 int - var yyb1386 bool - var yyhl1386 bool = l >= 0 - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + var yyj1391 int + var yyb1391 bool + var yyhl1391 bool = l >= 0 + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12259,13 +12300,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableHostPathProvisioning = bool(r.DecodeBool()) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12275,13 +12316,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableDynamicProvisioning = bool(r.DecodeBool()) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12289,16 +12330,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1389 := &x.PersistentVolumeRecyclerConfiguration - yyv1389.CodecDecodeSelf(d) + yyv1394 := &x.PersistentVolumeRecyclerConfiguration + yyv1394.CodecDecodeSelf(d) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12309,17 +12350,17 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.FlexVolumePluginDir = string(r.DecodeString()) } for { - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1386-1, "") + z.DecStructFieldNotFound(yyj1391-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12331,33 +12372,33 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc if x == nil { r.EncodeNil() } else { - yym1391 := z.EncBinary() - _ = yym1391 + yym1396 := z.EncBinary() + _ = yym1396 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1392 := !z.EncBinary() - yy2arr1392 := z.EncBasicHandle().StructToArray - var yyq1392 [7]bool - _, _, _ = yysep1392, yyq1392, yy2arr1392 - const yyr1392 bool = false - var yynn1392 int - if yyr1392 || yy2arr1392 { + yysep1397 := !z.EncBinary() + yy2arr1397 := z.EncBasicHandle().StructToArray + var yyq1397 [7]bool + _, _, _ = yysep1397, yyq1397, yy2arr1397 + const yyr1397 bool = false + var yynn1397 int + if yyr1397 || yy2arr1397 { r.EncodeArrayStart(7) } else { - yynn1392 = 7 - for _, b := range yyq1392 { + yynn1397 = 7 + for _, b := range yyq1397 { if b { - yynn1392++ + yynn1397++ } } - r.EncodeMapStart(yynn1392) - yynn1392 = 0 + r.EncodeMapStart(yynn1397) + yynn1397 = 0 } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1394 := z.EncBinary() - _ = yym1394 + yym1399 := z.EncBinary() + _ = yym1399 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) @@ -12366,17 +12407,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maximumRetry")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1395 := z.EncBinary() - _ = yym1395 + yym1400 := z.EncBinary() + _ = yym1400 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1397 := z.EncBinary() - _ = yym1397 + yym1402 := z.EncBinary() + _ = yym1402 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) @@ -12385,17 +12426,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1398 := z.EncBinary() - _ = yym1398 + yym1403 := z.EncBinary() + _ = yym1403 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1400 := z.EncBinary() - _ = yym1400 + yym1405 := z.EncBinary() + _ = yym1405 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) @@ -12404,17 +12445,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1401 := z.EncBinary() - _ = yym1401 + yym1406 := z.EncBinary() + _ = yym1406 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1403 := z.EncBinary() - _ = yym1403 + yym1408 := z.EncBinary() + _ = yym1408 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) @@ -12423,17 +12464,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1404 := z.EncBinary() - _ = yym1404 + yym1409 := z.EncBinary() + _ = yym1409 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1406 := z.EncBinary() - _ = yym1406 + yym1411 := z.EncBinary() + _ = yym1411 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) @@ -12442,17 +12483,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1407 := z.EncBinary() - _ = yym1407 + yym1412 := z.EncBinary() + _ = yym1412 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1409 := z.EncBinary() - _ = yym1409 + yym1414 := z.EncBinary() + _ = yym1414 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) @@ -12461,17 +12502,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1410 := z.EncBinary() - _ = yym1410 + yym1415 := z.EncBinary() + _ = yym1415 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1412 := z.EncBinary() - _ = yym1412 + yym1417 := z.EncBinary() + _ = yym1417 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) @@ -12480,14 +12521,14 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1413 := z.EncBinary() - _ = yym1413 + yym1418 := z.EncBinary() + _ = yym1418 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12500,25 +12541,25 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecDecodeSelf(d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1414 := z.DecBinary() - _ = yym1414 + yym1419 := z.DecBinary() + _ = yym1419 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1415 := r.ContainerType() - if yyct1415 == codecSelferValueTypeMap1234 { - yyl1415 := r.ReadMapStart() - if yyl1415 == 0 { + yyct1420 := r.ContainerType() + if yyct1420 == codecSelferValueTypeMap1234 { + yyl1420 := r.ReadMapStart() + if yyl1420 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1415, d) + x.codecDecodeSelfFromMap(yyl1420, d) } - } else if yyct1415 == codecSelferValueTypeArray1234 { - yyl1415 := r.ReadArrayStart() - if yyl1415 == 0 { + } else if yyct1420 == codecSelferValueTypeArray1234 { + yyl1420 := r.ReadArrayStart() + if yyl1420 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1415, d) + x.codecDecodeSelfFromArray(yyl1420, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -12530,12 +12571,12 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1416Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1416Slc - var yyhl1416 bool = l >= 0 - for yyj1416 := 0; ; yyj1416++ { - if yyhl1416 { - if yyj1416 >= l { + var yys1421Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1421Slc + var yyhl1421 bool = l >= 0 + for yyj1421 := 0; ; yyj1421++ { + if yyhl1421 { + if yyj1421 >= l { break } } else { @@ -12544,10 +12585,10 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1416Slc = r.DecodeBytes(yys1416Slc, true, true) - yys1416 := string(yys1416Slc) + yys1421Slc = r.DecodeBytes(yys1421Slc, true, true) + yys1421 := string(yys1421Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1416 { + switch yys1421 { case "maximumRetry": if r.TryDecodeAsNil() { x.MaximumRetry = 0 @@ -12591,9 +12632,9 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } default: - z.DecStructFieldNotFound(-1, yys1416) - } // end switch yys1416 - } // end for yyj1416 + z.DecStructFieldNotFound(-1, yys1421) + } // end switch yys1421 + } // end for yyj1421 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -12601,16 +12642,16 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1424 int - var yyb1424 bool - var yyhl1424 bool = l >= 0 - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + var yyj1429 int + var yyb1429 bool + var yyhl1429 bool = l >= 0 + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12620,13 +12661,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MaximumRetry = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12636,13 +12677,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12652,13 +12693,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathNFS = string(r.DecodeString()) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12668,13 +12709,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.IncrementTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12684,13 +12725,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathHostPath = string(r.DecodeString()) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12700,13 +12741,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutHostPath = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12717,17 +12758,17 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } for { - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1424-1, "") + z.DecStructFieldNotFound(yyj1429-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12737,20 +12778,20 @@ func (x codecSelfer1234) encconfig_ConfigurationMap(v pkg2_config.ConfigurationM z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk1432, yyv1432 := range v { + for yyk1437, yyv1437 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym1433 := z.EncBinary() - _ = yym1433 + yym1438 := z.EncBinary() + _ = yym1438 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk1432)) + r.EncodeString(codecSelferC_UTF81234, string(yyk1437)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1434 := z.EncBinary() - _ = yym1434 + yym1439 := z.EncBinary() + _ = yym1439 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyv1432)) + r.EncodeString(codecSelferC_UTF81234, string(yyv1437)) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12761,63 +12802,63 @@ func (x codecSelfer1234) decconfig_ConfigurationMap(v *pkg2_config.Configuration z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1435 := *v - yyl1435 := r.ReadMapStart() - yybh1435 := z.DecBasicHandle() - if yyv1435 == nil { - yyrl1435, _ := z.DecInferLen(yyl1435, yybh1435.MaxInitLen, 32) - yyv1435 = make(map[string]string, yyrl1435) - *v = yyv1435 + yyv1440 := *v + yyl1440 := r.ReadMapStart() + yybh1440 := z.DecBasicHandle() + if yyv1440 == nil { + yyrl1440, _ := z.DecInferLen(yyl1440, yybh1440.MaxInitLen, 32) + yyv1440 = make(map[string]string, yyrl1440) + *v = yyv1440 } - var yymk1435 string - var yymv1435 string - var yymg1435 bool - if yybh1435.MapValueReset { + var yymk1440 string + var yymv1440 string + var yymg1440 bool + if yybh1440.MapValueReset { } - if yyl1435 > 0 { - for yyj1435 := 0; yyj1435 < yyl1435; yyj1435++ { + if yyl1440 > 0 { + for yyj1440 := 0; yyj1440 < yyl1440; yyj1440++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1435 = "" + yymk1440 = "" } else { - yymk1435 = string(r.DecodeString()) + yymk1440 = string(r.DecodeString()) } - if yymg1435 { - yymv1435 = yyv1435[yymk1435] + if yymg1440 { + yymv1440 = yyv1440[yymk1440] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1435 = "" + yymv1440 = "" } else { - yymv1435 = string(r.DecodeString()) + yymv1440 = string(r.DecodeString()) } - if yyv1435 != nil { - yyv1435[yymk1435] = yymv1435 + if yyv1440 != nil { + yyv1440[yymk1440] = yymv1440 } } - } else if yyl1435 < 0 { - for yyj1435 := 0; !r.CheckBreak(); yyj1435++ { + } else if yyl1440 < 0 { + for yyj1440 := 0; !r.CheckBreak(); yyj1440++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1435 = "" + yymk1440 = "" } else { - yymk1435 = string(r.DecodeString()) + yymk1440 = string(r.DecodeString()) } - if yymg1435 { - yymv1435 = yyv1435[yymk1435] + if yymg1440 { + yymv1440 = yyv1440[yymk1440] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1435 = "" + yymv1440 = "" } else { - yymv1435 = string(r.DecodeString()) + yymv1440 = string(r.DecodeString()) } - if yyv1435 != nil { - yyv1435[yymk1435] = yymv1435 + if yyv1440 != nil { + yyv1440[yymk1440] = yymv1440 } } } // 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 45dd4de00b..78a07ec246 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/types.go @@ -424,6 +424,9 @@ type KubeletConfiguration struct { // Comma-delimited list of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure. // +optional EvictionMinimumReclaim string `json:"evictionMinimumReclaim,omitempty"` + // If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling. + // +optional + ExperimentalKernelMemcgNotification bool `json:"experimentalKernelMemcgNotification"` // Maximum number of pods per core. Cannot exceed MaxPods PodsPerCore int32 `json:"podsPerCore"` // enableControllerAttachDetach enables the Attach/Detach controller to 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 318cdd03cc..7cf8834b44 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -374,6 +374,9 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { if obj.EvictionPressureTransitionPeriod == zeroDuration { obj.EvictionPressureTransitionPeriod = unversioned.Duration{Duration: 5 * time.Minute} } + if obj.ExperimentalKernelMemcgNotification == nil { + obj.ExperimentalKernelMemcgNotification = boolVar(false) + } if obj.SystemReserved == nil { obj.SystemReserved = make(map[string]string) } 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 1fb8292134..7c192a17bf 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/types.go @@ -462,6 +462,8 @@ type KubeletConfiguration struct { EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod"` // Comma-delimited list of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure. EvictionMinimumReclaim string `json:"evictionMinimumReclaim"` + // If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling. + ExperimentalKernelMemcgNotification *bool `json:"experimentalKernelMemcgNotification"` // Maximum number of pods per core. Cannot exceed MaxPods PodsPerCore int32 `json:"podsPerCore"` // enableControllerAttachDetach enables the Attach/Detach controller to 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 a8c1ce5220..b76653e914 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 @@ -387,6 +387,9 @@ func autoConvert_v1alpha1_KubeletConfiguration_To_componentconfig_KubeletConfigu out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + if err := api.Convert_Pointer_bool_To_bool(&in.ExperimentalKernelMemcgNotification, &out.ExperimentalKernelMemcgNotification, s); err != nil { + return err + } out.PodsPerCore = in.PodsPerCore if err := api.Convert_Pointer_bool_To_bool(&in.EnableControllerAttachDetach, &out.EnableControllerAttachDetach, s); err != nil { return err @@ -556,6 +559,9 @@ func autoConvert_componentconfig_KubeletConfiguration_To_v1alpha1_KubeletConfigu out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + if err := api.Convert_bool_To_Pointer_bool(&in.ExperimentalKernelMemcgNotification, &out.ExperimentalKernelMemcgNotification, s); err != nil { + return err + } out.PodsPerCore = in.PodsPerCore if err := api.Convert_bool_To_Pointer_bool(&in.EnableControllerAttachDetach, &out.EnableControllerAttachDetach, s); err != nil { return err 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 2f5bc2852a..a725d641e2 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 @@ -403,6 +403,13 @@ func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c * out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + if in.ExperimentalKernelMemcgNotification != nil { + in, out := &in.ExperimentalKernelMemcgNotification, &out.ExperimentalKernelMemcgNotification + *out = new(bool) + **out = **in + } else { + out.ExperimentalKernelMemcgNotification = nil + } out.PodsPerCore = in.PodsPerCore if in.EnableControllerAttachDetach != nil { in, out := &in.EnableControllerAttachDetach, &out.EnableControllerAttachDetach 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 9f9ce1bb39..9c536b6845 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 @@ -358,6 +358,7 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + out.ExperimentalKernelMemcgNotification = in.ExperimentalKernelMemcgNotification out.PodsPerCore = in.PodsPerCore out.EnableControllerAttachDetach = in.EnableControllerAttachDetach if in.SystemReserved != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go index ded03596dc..3010ae3544 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/types.go @@ -124,7 +124,6 @@ type ThirdPartyResource struct { Description string `json:"description,omitempty"` // Versions are versions for this third party object - // +optional Versions []APIVersion `json:"versions,omitempty"` } @@ -143,7 +142,6 @@ type ThirdPartyResourceList struct { // TODO: we should consider merge this struct with GroupVersion in unversioned.go type APIVersion struct { // Name of this version (e.g. 'v1'). - // +optional Name string `json:"name,omitempty"` } diff --git a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go index 8ac12827c0..bb5224f132 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/extensions/validation/validation.go @@ -68,6 +68,9 @@ func ValidateThirdPartyResource(obj *extensions.ThirdPartyResource) field.ErrorL allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&obj.ObjectMeta, false, ValidateThirdPartyResourceName, field.NewPath("metadata"))...) versions := sets.String{} + if len(obj.Versions) == 0 { + allErrs = append(allErrs, field.Required(field.NewPath("versions"), "must specify at least one version")) + } for ix := range obj.Versions { version := &obj.Versions[ix] if len(version.Name) == 0 { diff --git a/vendor/k8s.io/kubernetes/pkg/apiserver/api_installer.go b/vendor/k8s.io/kubernetes/pkg/apiserver/api_installer.go index 07a5b066e0..eaf6e23563 100644 --- a/vendor/k8s.io/kubernetes/pkg/apiserver/api_installer.go +++ b/vendor/k8s.io/kubernetes/pkg/apiserver/api_installer.go @@ -197,7 +197,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag if err != nil { return nil, err } - versionedObject := indirectArbitraryPointer(versionedPtr) + defaultVersionedObject := indirectArbitraryPointer(versionedPtr) kind := fqKindToRegister.Kind hasSubresource := len(subresource) > 0 @@ -503,6 +503,10 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag Kind: fqKindToRegister, } for _, action := range actions { + versionedObject := storageMeta.ProducesObject(action.Verb) + if versionedObject == nil { + versionedObject = defaultVersionedObject + } reqScope.Namer = action.Namer namespaced := "" if apiResource.Namespaced { @@ -1022,6 +1026,10 @@ func (defaultStorageMetadata) ProducesMIMETypes(verb string) []string { return nil } +func (defaultStorageMetadata) ProducesObject(verb string) interface{} { + return nil +} + // splitSubresource checks if the given storage path is the path of a subresource and returns // the resource and subresource components. func splitSubresource(path string) (string, string, error) { diff --git a/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go b/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go index 24663107f3..4ad837260d 100644 --- a/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go +++ b/vendor/k8s.io/kubernetes/pkg/apiserver/resthandler.go @@ -591,11 +591,11 @@ func patchResource( if err != nil { return nil, err } - currentPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, currentObjectJS, versionedObj, strategicpatch.SMPatchVersionLatest) + currentPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, currentObjectJS, versionedObj) if err != nil { return nil, err } - originalPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, originalPatchedObjJS, versionedObj, strategicpatch.SMPatchVersionLatest) + originalPatch, err := strategicpatch.CreateStrategicMergePatch(originalObjJS, originalPatchedObjJS, versionedObj) if err != nil { return nil, err } diff --git a/vendor/k8s.io/kubernetes/pkg/client/cache/reflector.go b/vendor/k8s.io/kubernetes/pkg/client/cache/reflector.go index 8a0d05ab47..b4cd417f12 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/cache/reflector.go +++ b/vendor/k8s.io/kubernetes/pkg/client/cache/reflector.go @@ -259,12 +259,16 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error { r.setLastSyncResourceVersion(resourceVersion) resyncerrc := make(chan error, 1) + cancelCh := make(chan struct{}) + defer close(cancelCh) go func() { for { select { case <-resyncCh: case <-stopCh: return + case <-cancelCh: + return } glog.V(4).Infof("%s: forcing resync", r.name) if err := r.store.Resync(); err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/client/record/events_cache.go b/vendor/k8s.io/kubernetes/pkg/client/record/events_cache.go index 6b2d6429e7..8ff65776cb 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/record/events_cache.go +++ b/vendor/k8s.io/kubernetes/pkg/client/record/events_cache.go @@ -244,9 +244,7 @@ func (e *eventLogger) eventObserve(newEvent *api.Event) (*api.Event, []byte, err newData, _ := json.Marshal(event) oldData, _ := json.Marshal(eventCopy2) - // TODO: need to figure out if we need to let eventObserve() use the new behavior of StrategicMergePatch. - // Currently default to old behavior now. Ref: issue #35936 - patch, err = strategicpatch.CreateStrategicMergePatch(oldData, newData, event, strategicpatch.SMPatchVersion_1_0) + patch, err = strategicpatch.CreateStrategicMergePatch(oldData, newData, event) } // record our new observation diff --git a/vendor/k8s.io/kubernetes/pkg/client/typed/discovery/discovery_client.go b/vendor/k8s.io/kubernetes/pkg/client/typed/discovery/discovery_client.go index e64ffd578f..377bbfd3b4 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/typed/discovery/discovery_client.go +++ b/vendor/k8s.io/kubernetes/pkg/client/typed/discovery/discovery_client.go @@ -213,9 +213,11 @@ func (d *DiscoveryClient) serverPreferredResources(namespaced bool) ([]unversion const maxRetries = 2 var failedGroups map[unversioned.GroupVersion]error var results []unversioned.GroupVersionResource + var resources map[unversioned.GroupResource]string RetrieveGroups: for i := 0; i < maxRetries; i++ { results = []unversioned.GroupVersionResource{} + resources = map[unversioned.GroupResource]string{} failedGroups = make(map[unversioned.GroupVersion]error) serverGroupList, err := d.ServerGroups() if err != nil { @@ -223,25 +225,40 @@ RetrieveGroups: } for _, apiGroup := range serverGroupList.Groups { - preferredVersion := apiGroup.PreferredVersion - groupVersion := unversioned.GroupVersion{Group: apiGroup.Name, Version: preferredVersion.Version} - apiResourceList, err := d.ServerResourcesForGroupVersion(preferredVersion.GroupVersion) - if err != nil { - if i < maxRetries-1 { - continue RetrieveGroups - } - failedGroups[groupVersion] = err - continue - } - for _, apiResource := range apiResourceList.APIResources { - // ignore the root scoped resources if "namespaced" is true. - if namespaced && !apiResource.Namespaced { + versions := apiGroup.Versions + for _, version := range versions { + groupVersion := unversioned.GroupVersion{Group: apiGroup.Name, Version: version.Version} + apiResourceList, err := d.ServerResourcesForGroupVersion(version.GroupVersion) + if err != nil { + if i < maxRetries-1 { + continue RetrieveGroups + } + failedGroups[groupVersion] = err continue } - if strings.Contains(apiResource.Name, "/") { - continue + for _, apiResource := range apiResourceList.APIResources { + // ignore the root scoped resources if "namespaced" is true. + if namespaced && !apiResource.Namespaced { + continue + } + if strings.Contains(apiResource.Name, "/") { + continue + } + gvr := groupVersion.WithResource(apiResource.Name) + if _, ok := resources[gvr.GroupResource()]; ok { + if gvr.Version != apiGroup.PreferredVersion.Version { + continue + } + // remove previous entry, because it will be replaced with a preferred one + for i := range results { + if results[i].GroupResource() == gvr.GroupResource() { + results = append(results[:i], results[i+1:]...) + } + } + } + resources[gvr.GroupResource()] = gvr.Version + results = append(results, gvr) } - results = append(results, groupVersion.WithResource(apiResource.Name)) } } if len(failedGroups) == 0 { diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_util.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_util.go index 2f31cab9ac..c020671042 100644 --- a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_util.go +++ b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/azure/azure_util.go @@ -151,9 +151,12 @@ func getPrimaryIPConfig(nic network.Interface) (*network.InterfaceIPConfiguratio return &((*nic.Properties.IPConfigurations)[0]), nil } - // we're here because we either have multiple ipconfigs and can't determine the primary: - // https://github.com/Azure/azure-rest-api-specs/issues/305 - // or somehow we had zero ipconfigs + for _, ref := range *nic.Properties.IPConfigurations { + if *ref.Properties.Primary { + return &ref, nil + } + } + return nil, fmt.Errorf("failed to determine the determine primary ipconfig. nicname=%q", *nic.Name) } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go index 2ce713e004..11f871a8b0 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go @@ -520,11 +520,11 @@ func (r RealPodControl) DeletePod(namespace string, podID string, object runtime if err != nil { return fmt.Errorf("object does not have ObjectMeta, %v", err) } + glog.V(2).Infof("Controller %v deleting pod %v/%v", accessor.GetName(), namespace, podID) if err := r.KubeClient.Core().Pods(namespace).Delete(podID, nil); err != nil { r.Recorder.Eventf(object, api.EventTypeWarning, FailedDeletePodReason, "Error deleting: %v", err) return fmt.Errorf("unable to delete pods: %v", err) } else { - glog.V(4).Infof("Controller %v deleted pod %v", accessor.GetName(), podID) r.Recorder.Eventf(object, api.EventTypeNormal, SuccessfulDeletePodReason, "Deleted pod: %v", podID) } return nil diff --git a/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go b/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go index f7887cd82b..aeeca3946c 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/cronjob/controller.go @@ -231,6 +231,7 @@ func SyncOne(sj batch.CronJob, js []batch.Job, now time.Time, jc jobControlInter } errList := []error{} for _, pod := range podList.Items { + glog.V(2).Infof("CronJob controller is deleting Pod %v/%v", pod.Namespace, pod.Name) if err := pc.DeletePod(pod.Namespace, pod.Name); err != nil { // ignores the error when the pod isn't found if !errors.IsNotFound(err) { 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 d511119053..73b9eefec7 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller.go @@ -35,6 +35,16 @@ import ( "github.com/golang/glog" ) +const ( + // namespaceDeletionGracePeriod is the time period to wait before processing a received namespace event. + // This allows time for the following to occur: + // * lifecycle admission plugins on HA apiservers to also observe a namespace + // deletion and prevent new objects from being created in the terminating namespace + // * non-leader etcd servers to observe last-minute object creations in a namespace + // so this controller's cleanup can actually clean up all objects + namespaceDeletionGracePeriod = 5 * time.Second +) + // NamespaceController is responsible for performing actions dependent upon a namespace phase type NamespaceController struct { // client that purges namespace content, must have list/delete privileges on all content @@ -47,8 +57,8 @@ type NamespaceController struct { 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 - groupVersionResources []unversioned.GroupVersionResource + // function to list of preferred group versions and their corresponding resource set for namespace deletion + groupVersionResourcesFn func() ([]unversioned.GroupVersionResource, error) // opCache is a cache to remember if a particular operation is not supported to aid dynamic client. opCache *operationNotSupportedCache // finalizerToken is the finalizer token managed by this controller @@ -59,7 +69,7 @@ type NamespaceController struct { func NewNamespaceController( kubeClient clientset.Interface, clientPool dynamic.ClientPool, - groupVersionResources []unversioned.GroupVersionResource, + groupVersionResourcesFn func() ([]unversioned.GroupVersionResource, error), resyncPeriod time.Duration, finalizerToken api.FinalizerName) *NamespaceController { @@ -86,9 +96,9 @@ func NewNamespaceController( kubeClient: kubeClient, clientPool: clientPool, queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "namespace"), - groupVersionResources: groupVersionResources, - opCache: opCache, - finalizerToken: finalizerToken, + groupVersionResourcesFn: groupVersionResourcesFn, + opCache: opCache, + finalizerToken: finalizerToken, } if kubeClient != nil && kubeClient.Core().RESTClient().GetRateLimiter() != nil { @@ -132,7 +142,9 @@ func (nm *NamespaceController) enqueueNamespace(obj interface{}) { glog.Errorf("Couldn't get key for object %+v: %v", obj, err) return } - nm.queue.Add(key) + // delay processing namespace events to allow HA api servers to observe namespace deletion, + // and HA etcd servers to observe last minute object creations inside the namespace + nm.queue.AddAfter(key, namespaceDeletionGracePeriod) } // worker processes the queue of namespace objects. @@ -191,7 +203,7 @@ func (nm *NamespaceController) syncNamespaceFromKey(key string) (err error) { return err } namespace := obj.(*api.Namespace) - return syncNamespace(nm.kubeClient, nm.clientPool, nm.opCache, nm.groupVersionResources, namespace, nm.finalizerToken) + return syncNamespace(nm.kubeClient, nm.clientPool, nm.opCache, nm.groupVersionResourcesFn, namespace, nm.finalizerToken) } // Run starts observing the system with the specified number of workers. diff --git a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_utils.go index f6bffd58bd..04db7841eb 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_utils.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/namespace/namespace_controller_utils.go @@ -371,7 +371,7 @@ func syncNamespace( kubeClient clientset.Interface, clientPool dynamic.ClientPool, opCache *operationNotSupportedCache, - groupVersionResources []unversioned.GroupVersionResource, + groupVersionResourcesFn func() ([]unversioned.GroupVersionResource, error), namespace *api.Namespace, finalizerToken api.FinalizerName, ) error { @@ -422,6 +422,10 @@ func syncNamespace( } // there may still be content for us to remove + groupVersionResources, err := groupVersionResourcesFn() + if err != nil { + return err + } estimate, err := deleteAllContent(kubeClient, clientPool, opCache, groupVersionResources, namespace.Name, *namespace.DeletionTimestamp) if err != nil { return err diff --git a/vendor/k8s.io/kubernetes/pkg/controller/node/controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/node/controller_utils.go index b48e21214a..fa10c2e8b8 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/node/controller_utils.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/node/controller_utils.go @@ -118,6 +118,7 @@ func setPodTerminationReason(kubeClient clientset.Interface, pod *api.Pod, nodeN func forcefullyDeletePod(c clientset.Interface, pod *api.Pod) error { var zero int64 + glog.Infof("NodeController is force deleting Pod: %v:%v", pod.Namespace, pod.Name) err := c.Core().Pods(pod.Namespace).Delete(pod.Name, &api.DeleteOptions{GracePeriodSeconds: &zero}) if err == nil { glog.V(4).Infof("forceful deletion of %s succeeded", pod.Name) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/petset/pet.go b/vendor/k8s.io/kubernetes/pkg/controller/petset/pet.go index 4f3f552214..f830fcd59a 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/petset/pet.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/petset/pet.go @@ -107,7 +107,7 @@ func (p *petSyncer) Sync(pet *pcb) error { } // if pet failed - we need to remove old one because of consistent naming if exists && realPet.pod.Status.Phase == api.PodFailed { - glog.V(4).Infof("Delete evicted pod %v", realPet.pod.Name) + glog.V(2).Infof("Deleting evicted pod %v/%v", realPet.pod.Namespace, realPet.pod.Name) if err := p.petClient.Delete(realPet); err != nil { return err } @@ -156,7 +156,7 @@ func (p *petSyncer) Delete(pet *pcb) error { // The returned error will force a requeue. p.blockingPet = realPet if !p.isDying(realPet.pod) { - glog.V(4).Infof("StatefulSet %v deleting pet %v", pet.parent.Name, pet.pod.Name) + glog.V(2).Infof("StatefulSet %v deleting pet %v/%v", pet.parent.Name, pet.pod.Namespace, pet.pod.Name) return p.petClient.Delete(pet) } glog.V(4).Infof("StatefulSet %v waiting on pet %v to die in %v", pet.parent.Name, realPet.pod.Name, realPet.pod.DeletionTimestamp) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go index b5e7ab3876..176c9e62b1 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go @@ -292,9 +292,12 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo rescaleReason := "" timestamp := time.Now() + rescale := true + if scale.Spec.Replicas == 0 { // Autoscaling is disabled for this resource desiredReplicas = 0 + rescale = false } else if currentReplicas > hpa.Spec.MaxReplicas { rescaleReason = "Current number of replicas above Spec.MaxReplicas" desiredReplicas = hpa.Spec.MaxReplicas @@ -360,9 +363,10 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo if desiredReplicas > calculateScaleUpLimit(currentReplicas) { desiredReplicas = calculateScaleUpLimit(currentReplicas) } + + rescale = shouldScale(hpa, currentReplicas, desiredReplicas, timestamp) } - rescale := shouldScale(hpa, currentReplicas, desiredReplicas, timestamp) if rescale { scale.Spec.Replicas = desiredReplicas _, err = a.scaleNamespacer.Scales(hpa.Namespace).Update(hpa.Spec.ScaleTargetRef.Kind, scale) 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 dea856ca97..800b942e5c 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/podgc/gc_controller.go @@ -68,6 +68,7 @@ func NewPodGC(kubeClient clientset.Interface, podInformer cache.SharedIndexInfor kubeClient: kubeClient, terminatedPodThreshold: terminatedPodThreshold, deletePod: func(namespace, name string) error { + glog.Infof("PodGC is force deleting Pod: %v:%v", namespace, name) return kubeClient.Core().Pods(namespace).Delete(name, api.NewDeleteOptions(0)) }, } 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 d7b36463af..310bceb028 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/replicaset/replica_set.go @@ -342,8 +342,19 @@ func (rsc *ReplicaSetController) updatePod(old, cur interface{}) { } } + changedToReady := !api.IsPodReady(oldPod) && api.IsPodReady(curPod) if curRS := rsc.getPodReplicaSet(curPod); curRS != nil { rsc.enqueueReplicaSet(curRS) + // TODO: MinReadySeconds in the Pod will generate an Available condition to be added in + // the Pod status which in turn will trigger a requeue of the owning replica set thus + // having its status updated with the newly available replica. For now, we can fake the + // update by resyncing the controller MinReadySeconds after the it is requeued because + // a Pod transitioned to Ready. + // Note that this still suffers from #29229, we are just moving the problem one level + // "closer" to kubelet (from the deployment to the replica set controller). + if changedToReady && curRS.Spec.MinReadySeconds > 0 { + rsc.enqueueReplicaSetAfter(curRS, time.Duration(curRS.Spec.MinReadySeconds)*time.Second) + } } } @@ -397,6 +408,23 @@ func (rsc *ReplicaSetController) enqueueReplicaSet(obj interface{}) { rsc.queue.Add(key) } +// obj could be an *extensions.ReplicaSet, or a DeletionFinalStateUnknown marker item. +func (rsc *ReplicaSetController) enqueueReplicaSetAfter(obj interface{}, after time.Duration) { + key, err := controller.KeyFunc(obj) + if err != nil { + utilruntime.HandleError(fmt.Errorf("Couldn't get key for object %+v: %v", obj, err)) + return + } + + // TODO: Handle overlapping replica sets better. Either disallow them at admission time or + // deterministically avoid syncing replica sets that fight over pods. Currently, we only + // ensure that the same replica set is synced for a given pod. When we periodically relist + // all replica sets there will still be some replica instability. One way to handle this is + // by querying the store for all replica sets that this replica set overlaps, as well as all + // replica sets that overlap this ReplicaSet, and sorting them. + rsc.queue.AddAfter(key, after) +} + // worker runs a worker thread that just dequeues items, processes them, and marks them done. // It enforces that the syncHandler is never invoked concurrently with the same key. func (rsc *ReplicaSetController) worker() { 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 31bf816f22..901522acb1 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/replication/replication_controller.go @@ -401,8 +401,19 @@ func (rm *ReplicationManager) updatePod(old, cur interface{}) { } } + changedToReady := !api.IsPodReady(oldPod) && api.IsPodReady(curPod) if curRC := rm.getPodController(curPod); curRC != nil { rm.enqueueController(curRC) + // TODO: MinReadySeconds in the Pod will generate an Available condition to be added in + // the Pod status which in turn will trigger a requeue of the owning replication controller + // thus having its status updated with the newly available replica. For now, we can fake the + // update by resyncing the controller MinReadySeconds after the it is requeued because a Pod + // transitioned to Ready. + // Note that this still suffers from #29229, we are just moving the problem one level + // "closer" to kubelet (from the deployment to the replication controller manager). + if changedToReady && curRC.Spec.MinReadySeconds > 0 { + rm.enqueueControllerAfter(curRC, time.Duration(curRC.Spec.MinReadySeconds)*time.Second) + } } } @@ -456,6 +467,23 @@ func (rm *ReplicationManager) enqueueController(obj interface{}) { rm.queue.Add(key) } +// obj could be an *v1.ReplicationController, or a DeletionFinalStateUnknown marker item. +func (rm *ReplicationManager) enqueueControllerAfter(obj interface{}, after time.Duration) { + key, err := controller.KeyFunc(obj) + if err != nil { + glog.Errorf("Couldn't get key for object %+v: %v", obj, err) + return + } + + // TODO: Handle overlapping controllers better. Either disallow them at admission time or + // deterministically avoid syncing controllers that fight over pods. Currently, we only + // ensure that the same controller is synced for a given pod. When we periodically relist + // all controllers there will still be some replica instability. One way to handle this is + // by querying the store for all controllers that this rc overlaps, as well as all + // controllers that overlap this rc, and sorting them. + rm.queue.AddAfter(key, after) +} + // worker runs a worker thread that just dequeues items, processes them, and marks them done. // It enforces that the syncHandler is never invoked concurrently with the same key. func (rm *ReplicationManager) worker() { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go b/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go index 441c481dde..c41b0daa01 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/service/servicecontroller.go @@ -430,6 +430,13 @@ func (s *ServiceController) needsUpdate(oldService *api.Service, newService *api oldService.Spec.Type, newService.Spec.Type) return true } + + if wantsLoadBalancer(newService) && !reflect.DeepEqual(oldService.Spec.LoadBalancerSourceRanges, newService.Spec.LoadBalancerSourceRanges) { + s.eventRecorder.Eventf(newService, api.EventTypeNormal, "LoadBalancerSourceRanges", "%v -> %v", + oldService.Spec.LoadBalancerSourceRanges, newService.Spec.LoadBalancerSourceRanges) + return true + } + if !portsEqualForLB(oldService, newService) || oldService.Spec.SessionAffinity != newService.Spec.SessionAffinity { return true } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/BUILD index fafb2f7fb1..37c49fce1a 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/controller/serviceaccount/BUILD @@ -68,6 +68,7 @@ go_test( "//pkg/runtime:go_default_library", "//pkg/util/rand:go_default_library", "//pkg/util/sets:go_default_library", + "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/golang/glog", ], ) 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 359de53fb7..a6aadeddee 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 @@ -239,6 +239,23 @@ func (adc *attachDetachController) podDelete(obj interface{}) { func (adc *attachDetachController) nodeAdd(obj interface{}) { node, ok := obj.(*api.Node) + // TODO: investigate if nodeName is empty then if we can return + // kubernetes/kubernetes/issues/37777 + if node == nil || !ok { + return + } + nodeName := types.NodeName(node.Name) + adc.nodeUpdate(nil, obj) + // kubernetes/kubernetes/issues/37586 + // This is to workaround the case when a node add causes to wipe out + // the attached volumes field. This function ensures that we sync with + // the actual status. + adc.actualStateOfWorld.SetNodeStatusUpdateNeeded(nodeName) +} + +func (adc *attachDetachController) nodeUpdate(oldObj, newObj interface{}) { + node, ok := newObj.(*api.Node) + // TODO: investigate if nodeName is empty then if we can return if node == nil || !ok { return } @@ -249,15 +266,9 @@ func (adc *attachDetachController) nodeAdd(obj interface{}) { // detach controller. Add it to desired state of world. adc.desiredStateOfWorld.AddNode(nodeName) } - adc.processVolumesInUse(nodeName, node.Status.VolumesInUse) } -func (adc *attachDetachController) nodeUpdate(oldObj, newObj interface{}) { - // The flow for update is the same as add. - adc.nodeAdd(newObj) -} - func (adc *attachDetachController) nodeDelete(obj interface{}) { node, ok := obj.(*api.Node) if node == nil || !ok { 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 3c203bbcd2..7b8393d79e 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 @@ -116,6 +116,9 @@ type ActualStateOfWorld interface { // since volumes should be removed from this list as soon a detach operation // is considered, before the detach operation is triggered). GetVolumesToReportAttached() map[types.NodeName][]api.AttachedVolume + + // GetNodesToUpdateStatusFor returns the map of nodeNames to nodeToUpdateStatusFor + GetNodesToUpdateStatusFor() map[types.NodeName]nodeToUpdateStatusFor } // AttachedVolume represents a volume that is attached to a node. @@ -457,6 +460,7 @@ func (asw *actualStateOfWorld) updateNodeStatusUpdateNeeded(nodeName types.NodeN "Failed to set statusUpdateNeeded to needed %t because nodeName=%q does not exist", needed, nodeName) + return } nodeToUpdate.statusUpdateNeeded = needed @@ -591,6 +595,10 @@ func (asw *actualStateOfWorld) GetVolumesToReportAttached() map[types.NodeName][ return volumesToReportAttached } +func (asw *actualStateOfWorld) GetNodesToUpdateStatusFor() map[types.NodeName]nodeToUpdateStatusFor { + return asw.nodesToUpdateStatusFor +} + func getAttachedVolume( attachedVolume *attachedVolume, nodeAttachedTo *nodeAttachedTo) AttachedVolume { diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler.go index 74c330cd75..b12bd113eb 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler/reconciler.go @@ -192,11 +192,11 @@ func (rc *reconciler) reconcile() { if rc.actualStateOfWorld.VolumeNodeExists( volumeToAttach.VolumeName, volumeToAttach.NodeName) { // Volume/Node exists, touch it to reset detachRequestedTime - glog.V(1).Infof("Volume %q/Node %q is attached--touching.", volumeToAttach.VolumeName, volumeToAttach.NodeName) + glog.V(5).Infof("Volume %q/Node %q is attached--touching.", volumeToAttach.VolumeName, volumeToAttach.NodeName) rc.actualStateOfWorld.ResetDetachRequestTime(volumeToAttach.VolumeName, volumeToAttach.NodeName) } else { // Volume/Node doesn't exist, spawn a goroutine to attach it - glog.V(1).Infof("Attempting to start AttachVolume for volume %q to node %q", volumeToAttach.VolumeName, volumeToAttach.NodeName) + glog.V(5).Infof("Attempting to start AttachVolume for volume %q to node %q", volumeToAttach.VolumeName, volumeToAttach.NodeName) err := rc.attacherDetacher.AttachVolume(volumeToAttach.VolumeToAttach, rc.actualStateOfWorld) if err == nil { glog.Infof("Started AttachVolume for volume %q to node %q", volumeToAttach.VolumeName, volumeToAttach.NodeName) 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 ec58e8e5b1..fc470e55b1 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 @@ -59,17 +59,15 @@ type nodeStatusUpdater struct { } func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error { - smPatchVersion, err := strategicpatch.GetServerSupportedSMPatchVersion(nsu.kubeClient.Discovery()) - if err != nil { - return err - } + // TODO: investigate right behavior if nodeName is empty + // kubernetes/kubernetes/issues/37777 nodesToUpdate := nsu.actualStateOfWorld.GetVolumesToReportAttached() for nodeName, attachedVolumes := range nodesToUpdate { nodeObj, exists, err := nsu.nodeInformer.GetStore().GetByKey(string(nodeName)) if nodeObj == nil || !exists || err != nil { // If node does not exist, its status cannot be updated, log error and // reset flag statusUpdateNeeded back to true to indicate this node status - // needs to be udpated again + // needs to be updated again glog.V(2).Infof( "Could not update node status. Failed to find node %q in NodeInformer cache. %v", nodeName, @@ -112,7 +110,7 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error { } patchBytes, err := - strategicpatch.CreateStrategicMergePatch(oldData, newData, node, smPatchVersion) + strategicpatch.CreateStrategicMergePatch(oldData, newData, node) if err != nil { return fmt.Errorf( "failed to CreateStrategicMergePatch for node %q. %v", @@ -123,7 +121,7 @@ func (nsu *nodeStatusUpdater) UpdateNodeStatuses() error { _, err = nsu.kubeClient.Core().Nodes().PatchStatus(string(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 + // to indicate this node status needs to be updated again nsu.actualStateOfWorld.SetNodeStatusUpdateNeeded(nodeName) return fmt.Errorf( "failed to kubeClient.Core().Nodes().Patch for node %q. %v", diff --git a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go index 2401d9fd8a..bba05efb1f 100644 --- a/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go +++ b/vendor/k8s.io/kubernetes/pkg/generated/openapi/zz_generated.openapi.go @@ -2898,6 +2898,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Format: "", }, }, + "experimentalKernelMemcgNotification": { + SchemaProps: spec.SchemaProps{ + Description: "If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.", + Type: []string{"boolean"}, + Format: "", + }, + }, "podsPerCore": { SchemaProps: spec.SchemaProps{ Description: "Maximum number of pods per core. Cannot exceed MaxPods", @@ -3011,7 +3018,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "authentication", "authorization", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginMTU", "networkPluginDir", "cniConfDir", "cniBinDir", "volumePluginDir", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "experimentalMounterPath", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit", "featureGates", "experimentalFailSwapOn", "ExperimentalCheckNodeCapabilitiesBeforeMount"}, + Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "authentication", "authorization", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginMTU", "networkPluginDir", "cniConfDir", "cniBinDir", "volumePluginDir", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit", "featureGates"}, }, }, Dependencies: []string{ @@ -3540,7 +3547,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"type", "status", "lastUpdateTime", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status"}, }, }, Dependencies: []string{ @@ -3678,7 +3685,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"template", "progressDeadlineSeconds"}, + Required: []string{"template"}, }, }, Dependencies: []string{ @@ -3737,7 +3744,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"conditions"}, }, }, Dependencies: []string{ @@ -9751,7 +9757,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, "unschedulable": { SchemaProps: spec.SchemaProps{ - Description: "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"`", + Description: "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"", Type: []string{"boolean"}, Format: "", }, @@ -10577,7 +10583,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"photonPersistentDisk"}, }, }, Dependencies: []string{ @@ -10685,7 +10690,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"pdID", "fsType"}, + Required: []string{"pdID"}, }, }, Dependencies: []string{}, @@ -12324,15 +12329,8 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ AdditionalProperties: &spec.SchemaOrBool{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "byte", - }, - }, - }, + Type: []string{"string"}, + Format: "byte", }, }, }, @@ -13198,7 +13196,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"photonPersistentDisk"}, }, }, Dependencies: []string{ @@ -14705,6 +14702,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Format: "", }, }, + "experimentalKernelMemcgNotification": { + SchemaProps: spec.SchemaProps{ + Description: "If enabled, the kubelet will integrate with the kernel memcg notification to determine if memory eviction thresholds are crossed rather than polling.", + Type: []string{"boolean"}, + Format: "", + }, + }, "podsPerCore": { SchemaProps: spec.SchemaProps{ Description: "Maximum number of pods per core. Cannot exceed MaxPods", @@ -14818,7 +14822,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "authentication", "authorization", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginDir", "cniConfDir", "cniBinDir", "networkPluginMTU", "volumePluginDir", "cloudProvider", "cloudConfigFile", "kubeletCgroups", "runtimeCgroups", "systemCgroups", "cgroupRoot", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "runtimeRequestTimeout", "rktPath", "experimentalMounterPath", "rktAPIEndpoint", "rktStage1Image", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "outOfDiskTransitionFrequency", "nodeIP", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "evictionHard", "evictionSoft", "evictionSoftGracePeriod", "evictionPressureTransitionPeriod", "evictionMaxPodGracePeriod", "evictionMinimumReclaim", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit", "featureGates", "experimentalFailSwapOn", "ExperimentalCheckNodeCapabilitiesBeforeMount"}, + Required: []string{"TypeMeta", "podManifestPath", "syncFrequency", "fileCheckFrequency", "httpCheckFrequency", "manifestURL", "manifestURLHeader", "enableServer", "address", "port", "readOnlyPort", "tlsCertFile", "tlsPrivateKeyFile", "certDirectory", "authentication", "authorization", "hostnameOverride", "podInfraContainerImage", "dockerEndpoint", "rootDirectory", "seccompProfileRoot", "allowPrivileged", "hostNetworkSources", "hostPIDSources", "hostIPCSources", "registryPullQPS", "registryBurst", "eventRecordQPS", "eventBurst", "enableDebuggingHandlers", "minimumGCAge", "maxPerPodContainerCount", "maxContainerCount", "cAdvisorPort", "healthzPort", "healthzBindAddress", "oomScoreAdj", "registerNode", "clusterDomain", "masterServiceNamespace", "clusterDNS", "streamingConnectionIdleTimeout", "nodeStatusUpdateFrequency", "imageMinimumGCAge", "imageGCHighThresholdPercent", "imageGCLowThresholdPercent", "lowDiskSpaceThresholdMB", "volumeStatsAggPeriod", "networkPluginName", "networkPluginDir", "cniConfDir", "cniBinDir", "networkPluginMTU", "volumePluginDir", "cloudProvider", "cloudConfigFile", "kubeletCgroups", "runtimeCgroups", "systemCgroups", "cgroupRoot", "containerRuntime", "remoteRuntimeEndpoint", "remoteImageEndpoint", "runtimeRequestTimeout", "rktPath", "rktAPIEndpoint", "rktStage1Image", "lockFilePath", "exitOnLockContention", "hairpinMode", "babysitDaemons", "maxPods", "nvidiaGPUs", "dockerExecHandlerName", "podCIDR", "resolvConf", "cpuCFSQuota", "containerized", "maxOpenFiles", "reconcileCIDR", "registerSchedulable", "contentType", "kubeAPIQPS", "kubeAPIBurst", "serializeImagePulls", "outOfDiskTransitionFrequency", "nodeIP", "nodeLabels", "nonMasqueradeCIDR", "enableCustomMetrics", "evictionHard", "evictionSoft", "evictionSoftGracePeriod", "evictionPressureTransitionPeriod", "evictionMaxPodGracePeriod", "evictionMinimumReclaim", "experimentalKernelMemcgNotification", "podsPerCore", "enableControllerAttachDetach", "systemReserved", "kubeReserved", "protectKernelDefaults", "makeIPTablesUtilChains", "iptablesMasqueradeBit", "iptablesDropBit"}, }, }, Dependencies: []string{ @@ -15729,7 +15733,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"type", "status", "lastUpdateTime", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status"}, }, }, Dependencies: []string{ @@ -15870,7 +15874,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"template", "progressDeadlineSeconds"}, + Required: []string{"template"}, }, }, Dependencies: []string{ @@ -15930,7 +15934,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"conditions"}, }, }, Dependencies: []string{ @@ -15978,7 +15981,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"metadata", "deleteOptions"}, }, }, Dependencies: []string{ @@ -16955,7 +16957,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"metadata", "spec", "status"}, }, }, Dependencies: []string{ @@ -16984,7 +16985,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"metadata", "items"}, + Required: []string{"items"}, }, }, Dependencies: []string{ @@ -17008,7 +17009,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, }, - Required: []string{"minAvailable", "selector"}, }, }, Dependencies: []string{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go b/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go index 7acf0447d8..ec3d90b5b9 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.pb.go @@ -665,7 +665,8 @@ type PodSandboxConfig struct { // * runtime/default: the default profile for the container runtime // * unconfined: unconfined profile, ie, no seccomp sandboxing // * localhost/: the profile installed to the node's - // local seccomp profile root + // local seccomp profile root. Note that profile root is set in + // kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997. // // 3. Sysctls // diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto b/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto index de10e4c29f..7df26e32ec 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime/api.proto @@ -255,7 +255,8 @@ message PodSandboxConfig { // * runtime/default: the default profile for the container runtime // * unconfined: unconfined profile, ie, no seccomp sandboxing // * localhost/: the profile installed to the node's - // local seccomp profile root + // local seccomp profile root. Note that profile root is set in + // kubelet, and it is not passed in CRI yet, see https://issues.k8s.io/36997. // // 3. Sysctls // diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/BUILD index 3cf7984a25..0d3bf2663b 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/BUILD @@ -25,6 +25,7 @@ go_library( "//pkg/api/unversioned:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", + "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/server/stats:go_default_library", diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go index 9f56a729aa..b261cfdf12 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/eviction_manager.go @@ -24,7 +24,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/kubelet/server/stats" @@ -33,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/util/wait" ) -// managerImpl implements NodeStabilityManager +// managerImpl implements Manager type managerImpl struct { // used to track time clock clock.Clock @@ -65,6 +67,8 @@ type managerImpl struct { resourceToNodeReclaimFuncs map[api.ResourceName]nodeReclaimFuncs // last observations from synchronize lastObservations signalObservations + // notifiersInitialized indicates if the threshold notifiers have been initialized (i.e. synchronize() has been called once) + notifiersInitialized bool } // ensure it implements the required interface @@ -139,6 +143,39 @@ func (m *managerImpl) IsUnderDiskPressure() bool { return hasNodeCondition(m.nodeConditions, api.NodeDiskPressure) } +func startMemoryThresholdNotifier(thresholds []Threshold, observations signalObservations, hard bool, handler thresholdNotifierHandlerFunc) error { + for _, threshold := range thresholds { + if threshold.Signal != SignalMemoryAvailable || hard != isHardEvictionThreshold(threshold) { + continue + } + observed, found := observations[SignalMemoryAvailable] + if !found { + continue + } + cgroups, err := cm.GetCgroupSubsystems() + if err != nil { + return err + } + // TODO add support for eviction from --cgroup-root + cgpath, found := cgroups.MountPoints["memory"] + if !found || len(cgpath) == 0 { + return fmt.Errorf("memory cgroup mount point not found") + } + attribute := "memory.usage_in_bytes" + quantity := getThresholdQuantity(threshold.Value, observed.capacity) + usageThreshold := resource.NewQuantity(observed.capacity.Value(), resource.DecimalSI) + usageThreshold.Sub(*quantity) + description := fmt.Sprintf("<%s available", formatThresholdValue(threshold.Value)) + memcgThresholdNotifier, err := NewMemCGThresholdNotifier(cgpath, attribute, usageThreshold.String(), description, handler) + if err != nil { + return err + } + go memcgThresholdNotifier.Start(wait.NeverStop) + return nil + } + return nil +} + // synchronize is the main control loop that enforces eviction thresholds. func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc ActivePodsFunc) { // if we have nothing to do, just return @@ -166,8 +203,28 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act return } - // find the list of thresholds that are met independent of grace period - now := m.clock.Now() + // attempt to create a threshold notifier to improve eviction response time + if m.config.KernelMemcgNotification && !m.notifiersInitialized { + glog.Infof("eviction manager attempting to integrate with kernel memcg notification api") + m.notifiersInitialized = true + // start soft memory notification + err = startMemoryThresholdNotifier(m.config.Thresholds, observations, false, func(desc string) { + glog.Infof("soft memory eviction threshold crossed at %s", desc) + // TODO wait grace period for soft memory limit + m.synchronize(diskInfoProvider, podFunc) + }) + if err != nil { + glog.Warningf("eviction manager: failed to create hard memory threshold notifier: %v", err) + } + // start hard memory notification + err = startMemoryThresholdNotifier(m.config.Thresholds, observations, true, func(desc string) { + glog.Infof("hard memory eviction threshold crossed at %s", desc) + m.synchronize(diskInfoProvider, podFunc) + }) + if err != nil { + glog.Warningf("eviction manager: failed to create soft memory threshold notifier: %v", err) + } + } // determine the set of thresholds met independent of grace period thresholds = thresholdsMet(thresholds, observations, false) @@ -182,6 +239,7 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act thresholds = thresholdsUpdatedStats(thresholds, observations, m.lastObservations) // track when a threshold was first observed + now := m.clock.Now() thresholdsFirstObservedAt := thresholdsFirstObservedAt(thresholds, m.thresholdsFirstObservedAt, now) // the set of node conditions that are triggered by currently observed thresholds @@ -218,7 +276,7 @@ func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc Act glog.Warningf("eviction manager: attempting to reclaim %v", resourceToReclaim) // determine if this is a soft or hard eviction associated with the resource - softEviction := isSoftEviction(thresholds, resourceToReclaim) + softEviction := isSoftEvictionThresholds(thresholds, resourceToReclaim) // record an event about the resources we are now attempting to reclaim via eviction m.recorder.Eventf(m.nodeRef, api.EventTypeWarning, "EvictionThresholdMet", "Attempting to reclaim %s", resourceToReclaim) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go index 290ca66226..b6bb414241 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go @@ -848,18 +848,23 @@ func getStarvedResources(thresholds []Threshold) []api.ResourceName { } // isSoftEviction returns true if the thresholds met for the starved resource are only soft thresholds -func isSoftEviction(thresholds []Threshold, starvedResource api.ResourceName) bool { +func isSoftEvictionThresholds(thresholds []Threshold, starvedResource api.ResourceName) bool { for _, threshold := range thresholds { if resourceToCheck := signalToResource[threshold.Signal]; resourceToCheck != starvedResource { continue } - if threshold.GracePeriod == time.Duration(0) { + if isHardEvictionThreshold(threshold) { return false } } return true } +// isSoftEviction returns true if the thresholds met for the starved resource are only soft thresholds +func isHardEvictionThreshold(threshold Threshold) bool { + return threshold.GracePeriod == time.Duration(0) +} + // buildResourceToRankFunc returns ranking functions associated with resources func buildResourceToRankFunc(withImageFs bool) map[api.ResourceName]rankFunc { resourceToRankFunc := map[api.ResourceName]rankFunc{ diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_linux.go new file mode 100644 index 0000000000..1587dea85c --- /dev/null +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_linux.go @@ -0,0 +1,119 @@ +/* +Copyright 2016 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 eviction + +/* +#include +*/ +import "C" + +import ( + "fmt" + "syscall" + + "github.com/golang/glog" +) + +type memcgThresholdNotifier struct { + watchfd int + controlfd int + eventfd int + handler thresholdNotifierHandlerFunc + description string +} + +var _ ThresholdNotifier = &memcgThresholdNotifier{} + +// NewMemCGThresholdNotifier sends notifications when a cgroup threshold +// is crossed (in either direction) for a given cgroup attribute +func NewMemCGThresholdNotifier(path, attribute, threshold, description string, handler thresholdNotifierHandlerFunc) (ThresholdNotifier, error) { + watchfd, err := syscall.Open(fmt.Sprintf("%s/%s", path, attribute), syscall.O_RDONLY, 0) + if err != nil { + return nil, err + } + defer func() { + if err != nil { + syscall.Close(watchfd) + } + }() + controlfd, err := syscall.Open(fmt.Sprintf("%s/cgroup.event_control", path), syscall.O_WRONLY, 0) + if err != nil { + return nil, err + } + defer func() { + if err != nil { + syscall.Close(controlfd) + } + }() + efd, err := C.eventfd(0, C.EFD_CLOEXEC) + if err != nil { + return nil, err + } + eventfd := int(efd) + if eventfd < 0 { + err = fmt.Errorf("eventfd call failed") + return nil, err + } + defer func() { + if err != nil { + syscall.Close(eventfd) + } + }() + glog.V(2).Infof("eviction: setting notification threshold to %s", threshold) + config := fmt.Sprintf("%d %d %s", eventfd, watchfd, threshold) + _, err = syscall.Write(controlfd, []byte(config)) + if err != nil { + return nil, err + } + return &memcgThresholdNotifier{ + watchfd: watchfd, + controlfd: controlfd, + eventfd: eventfd, + handler: handler, + description: description, + }, nil +} + +func getThresholdEvents(eventfd int, eventCh chan<- int) { + for { + buf := make([]byte, 8) + _, err := syscall.Read(eventfd, buf) + if err != nil { + return + } + eventCh <- 0 + } +} + +func (n *memcgThresholdNotifier) Start(stopCh <-chan struct{}) { + eventCh := make(chan int, 1) + go getThresholdEvents(n.eventfd, eventCh) + for { + select { + case <-stopCh: + glog.V(2).Infof("eviction: stopping threshold notifier") + syscall.Close(n.watchfd) + syscall.Close(n.controlfd) + syscall.Close(n.eventfd) + close(eventCh) + return + case <-eventCh: + glog.V(2).Infof("eviction: threshold crossed") + n.handler(n.description) + } + } +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_unsupported.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_unsupported.go new file mode 100644 index 0000000000..77a9b26cfc --- /dev/null +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/threshold_notifier_unsupported.go @@ -0,0 +1,27 @@ +// +build !linux + +/* +Copyright 2016 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 eviction + +import "fmt" + +// NewMemCGThresholdNotifier sends notifications when a cgroup threshold +// is crossed (in either direction) for a given cgroup attribute +func NewMemCGThresholdNotifier(path, attribute, threshold, description string, handler thresholdNotifierHandlerFunc) (ThresholdNotifier, error) { + return nil, fmt.Errorf("threshold notification not supported") +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/types.go index 0a20611e8c..3a1b437630 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/types.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/types.go @@ -69,6 +69,8 @@ type Config struct { MaxPodGracePeriodSeconds int64 // Thresholds define the set of conditions monitored to trigger eviction. Thresholds []Threshold + // KernelMemcgNotification if true will integrate with the kernel memcg notification to determine if memory thresholds are crossed. + KernelMemcgNotification bool } // ThresholdValue is a value holder that abstracts literal versus percentage based quantity @@ -161,3 +163,11 @@ type nodeReclaimFunc func() (*resource.Quantity, error) // nodeReclaimFuncs is an ordered list of nodeReclaimFunc type nodeReclaimFuncs []nodeReclaimFunc + +// thresholdNotifierHandlerFunc is a function that takes action in response to a crossed threshold +type thresholdNotifierHandlerFunc func(thresholdDescription string) + +// ThresholdNotifier notifies the user when an attribute crosses a threshold value +type ThresholdNotifier interface { + Start(stopCh <-chan struct{}) +} diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go index a563f1dd57..1703c731cd 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go @@ -353,6 +353,7 @@ func NewMainKubelet(kubeCfg *componentconfig.KubeletConfiguration, kubeDeps *Kub PressureTransitionPeriod: kubeCfg.EvictionPressureTransitionPeriod.Duration, MaxPodGracePeriodSeconds: int64(kubeCfg.EvictionMaxPodGracePeriod), Thresholds: thresholds, + KernelMemcgNotification: kubeCfg.ExperimentalKernelMemcgNotification, } reservation, err := ParseReservation(kubeCfg.KubeReserved, kubeCfg.SystemReserved) @@ -1850,8 +1851,8 @@ func (kl *Kubelet) syncLoopIteration(configCh <-chan kubetypes.PodUpdate, handle } case <-housekeepingCh: if !kl.sourcesReady.AllReady() { - // If the sources aren't ready, skip housekeeping, as we may - // accidentally delete pods from unready sources. + // If the sources aren't ready or volume manager has not yet synced the states, + // skip housekeeping, as we may accidentally delete pods from unready sources. glog.V(4).Infof("SyncLoop (housekeeping, skipped): sources aren't ready yet.") } else { glog.V(4).Infof("SyncLoop (housekeeping)") @@ -1910,22 +1911,32 @@ func (kl *Kubelet) HandlePodAdditions(pods []*api.Pod) { start := kl.clock.Now() sort.Sort(sliceutils.PodsByCreationTime(pods)) for _, pod := range pods { + existingPods := kl.podManager.GetPods() + // Always add the pod to the pod manager. Kubelet relies on the pod + // manager as the source of truth for the desired state. If a pod does + // not exist in the pod manager, it means that it has been deleted in + // the apiserver and no action (other than cleanup) is required. + kl.podManager.AddPod(pod) + if kubepod.IsMirrorPod(pod) { - kl.podManager.AddPod(pod) kl.handleMirrorPod(pod, start) continue } - // Note that allPods excludes the new pod. - allPods := kl.podManager.GetPods() - // We failed pods that we rejected, so activePods include all admitted - // pods that are alive. - activePods := kl.filterOutTerminatedPods(allPods) - // Check if we can admit the pod; if not, reject it. - if ok, reason, message := kl.canAdmitPod(activePods, pod); !ok { - kl.rejectPod(pod, reason, message) - continue + + if !kl.podIsTerminated(pod) { + // Only go through the admission process if the pod is not + // terminated. + + // We failed pods that we rejected, so activePods include all admitted + // pods that are alive. + activePods := kl.filterOutTerminatedPods(existingPods) + + // Check if we can admit the pod; if not, reject it. + if ok, reason, message := kl.canAdmitPod(activePods, pod); !ok { + kl.rejectPod(pod, reason, message) + continue + } } - kl.podManager.AddPod(pod) mirrorPod, _ := kl.podManager.GetMirrorPodByPod(pod) kl.dispatchWork(pod, kubetypes.SyncPodCreate, mirrorPod, start) kl.probeManager.AddPod(pod) 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 ec8f52f6dd..52141168a1 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go @@ -298,7 +298,7 @@ func (kl *Kubelet) syncNodeStatus() { // updateNodeStatus updates node status to master with retries. func (kl *Kubelet) updateNodeStatus() error { for i := 0; i < nodeStatusUpdateRetry; i++ { - if err := kl.tryUpdateNodeStatus(); err != nil { + if err := kl.tryUpdateNodeStatus(i); err != nil { glog.Errorf("Error updating node status, will retry: %v", err) } else { return nil @@ -309,20 +309,23 @@ func (kl *Kubelet) updateNodeStatus() error { // tryUpdateNodeStatus tries to update node status to master. If ReconcileCBR0 // is set, this function will also confirm that cbr0 is configured correctly. -func (kl *Kubelet) tryUpdateNodeStatus() error { +func (kl *Kubelet) tryUpdateNodeStatus(tryNumber int) error { // In large clusters, GET and PUT operations on Node objects coming // from here are the majority of load on apiserver and etcd. // To reduce the load on etcd, we are serving GET operations from // apiserver cache (the data might be slightly delayed but it doesn't // seem to cause more confilict - the delays are pretty small). + // If it result in a conflict, all retries are served directly from etcd. // TODO: Currently apiserver doesn't support serving GET operations // from its cache. Thus we are hacking it by issuing LIST with // field selector for the name of the node (field selectors with // specified name are handled efficiently by apiserver). Once // apiserver supports GET from cache, change it here. opts := api.ListOptions{ - FieldSelector: fields.Set{"metadata.name": string(kl.nodeName)}.AsSelector(), - ResourceVersion: "0", + FieldSelector: fields.Set{"metadata.name": string(kl.nodeName)}.AsSelector(), + } + if tryNumber == 0 { + opts.ResourceVersion = "0" } nodes, err := kl.kubeClient.Core().Nodes().List(opts) if err != nil { diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go index c7ae64050a..660a7a902e 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go @@ -25,7 +25,6 @@ import ( kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" utilerrors "k8s.io/kubernetes/pkg/util/errors" - "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/volume" volumetypes "k8s.io/kubernetes/pkg/volume/util/types" @@ -105,24 +104,12 @@ func (kl *Kubelet) cleanupOrphanedPodDirs( glog.V(3).Infof("Orphaned pod %q found, but volumes are not cleaned up", uid) continue } - // Check whether volume is still mounted on disk. If so, do not delete directory + // If there are still volume directories, do not delete directory volumePaths, err := kl.getPodVolumePathListFromDisk(uid) - if err != nil { + if err != nil || len(volumePaths) > 0 { glog.Errorf("Orphaned pod %q found, but error %v occured during reading volume dir from disk", uid, err) continue - } else if len(volumePaths) > 0 { - for _, path := range volumePaths { - notMount, err := mount.IsNotMountPoint(path) - if err == nil && notMount { - glog.V(2).Infof("Volume path %q is no longer mounted, remove it", path) - os.Remove(path) - } else { - glog.Errorf("Orphaned pod %q found, but it might still mounted with error %v", uid, err) - } - } - continue } - glog.V(3).Infof("Orphaned pod %q found, removing", uid) if err := os.RemoveAll(kl.getPodDir(uid)); err != nil { glog.Errorf("Failed to remove orphaned pod %q dir; err: %v", uid, err) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport.go b/vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport.go index 35d4ac2c8e..2fcd9f6208 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/network/hostport/hostport.go @@ -370,7 +370,7 @@ func (h *handler) cleanupHostportMap(containerPortMap map[api.ContainerPort]targ for containerPort := range containerPortMap { hp := hostport{ port: containerPort.HostPort, - protocol: string(containerPort.Protocol), + protocol: strings.ToLower(string(containerPort.Protocol)), } currentHostports[hp] = true } @@ -379,6 +379,7 @@ func (h *handler) cleanupHostportMap(containerPortMap map[api.ContainerPort]targ for hp, socket := range h.hostPortMap { if _, ok := currentHostports[hp]; !ok { socket.Close() + glog.V(3).Infof("Closed local port %s", hp.String()) delete(h.hostPortMap, hp) } } diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/pod/mirror_client.go b/vendor/k8s.io/kubernetes/pkg/kubelet/pod/mirror_client.go index f19bc240bc..a57d6414d2 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/pod/mirror_client.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/pod/mirror_client.go @@ -81,7 +81,7 @@ func (mc *basicMirrorClient) DeleteMirrorPod(podFullName string) error { glog.Errorf("Failed to parse a pod full name %q", podFullName) return err } - glog.V(4).Infof("Deleting a mirror pod %q", podFullName) + glog.V(2).Infof("Deleting a mirror pod %q", podFullName) // TODO(random-liu): Delete the mirror pod with uid precondition in mirror pod manager if err := mc.apiserverClient.Core().Pods(namespace).Delete(name, api.NewDeleteOptions(0)); err != nil && !errors.IsNotFound(err) { glog.Errorf("Failed deleting a mirror pod %q: %v", podFullName, err) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go index 4cc107546e..8c509e35f1 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go @@ -438,6 +438,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) { deleteOptions := api.NewDeleteOptions(0) // Use the pod UID as the precondition for deletion to prevent deleting a newly created pod with the same name and namespace. deleteOptions.Preconditions = api.NewUIDPreconditions(string(pod.UID)) + glog.V(2).Infof("Removing Pod %q from etcd", format.Pod(pod)) if err = m.kubeClient.Core().Pods(pod.Namespace).Delete(pod.Name, deleteOptions); err == nil { glog.V(3).Infof("Pod %q fully terminated and removed from etcd", format.Pod(pod)) m.deletePodStatus(uid) diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index 6aac183a7e..888cf9c343 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -129,10 +129,18 @@ func (dswp *desiredStateOfWorldPopulator) populatorLoopFunc() func() { } } +func isPodTerminated(pod *api.Pod) bool { + return pod.Status.Phase == api.PodFailed || pod.Status.Phase == api.PodSucceeded +} + // Iterate through all pods and add to desired state of world if they don't // exist but should func (dswp *desiredStateOfWorldPopulator) findAndAddNewPods() { for _, pod := range dswp.podManager.GetPods() { + if isPodTerminated(pod) { + // Do not (re)add volumes for terminated pods + continue + } dswp.processPodVolumes(pod) } } @@ -144,9 +152,18 @@ func (dswp *desiredStateOfWorldPopulator) findAndRemoveDeletedPods() { runningPodsFetched := false for _, volumeToMount := range dswp.desiredStateOfWorld.GetVolumesToMount() { - if _, podExists := - dswp.podManager.GetPodByUID(volumeToMount.Pod.UID); podExists { - continue + pod, podExists := dswp.podManager.GetPodByUID(volumeToMount.Pod.UID) + if podExists { + // Skip running pods + if !isPodTerminated(pod) { + continue + } + // Skip non-memory backed volumes belonging to terminated pods + volume := volumeToMount.VolumeSpec.Volume + if (volume.EmptyDir == nil || volume.EmptyDir.Medium != api.StorageMediumMemory) && + volume.ConfigMap == nil && volume.Secret == nil { + continue + } } // Once a pod has been deleted from kubelet pod manager, do not delete diff --git a/vendor/k8s.io/kubernetes/pkg/master/thirdparty/thirdparty.go b/vendor/k8s.io/kubernetes/pkg/master/thirdparty/thirdparty.go index 54e0a67351..55d8c7acef 100644 --- a/vendor/k8s.io/kubernetes/pkg/master/thirdparty/thirdparty.go +++ b/vendor/k8s.io/kubernetes/pkg/master/thirdparty/thirdparty.go @@ -246,6 +246,9 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th if err != nil { return err } + if len(rsrc.Versions) == 0 { + return fmt.Errorf("ThirdPartyResource %s has no defined versions", rsrc.Name) + } plural, _ := meta.KindToResource(unversioned.GroupVersionKind{ Group: group, Version: rsrc.Versions[0].Name, diff --git a/vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go b/vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go index deabe872cd..2f39fe9bbc 100644 --- a/vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go +++ b/vendor/k8s.io/kubernetes/pkg/proxy/iptables/proxier.go @@ -138,7 +138,7 @@ type serviceInfo struct { nodePort int loadBalancerStatus api.LoadBalancerStatus sessionAffinityType api.ServiceAffinity - stickyMaxAgeSeconds int + stickyMaxAgeMinutes int externalIPs []string loadBalancerSourceRanges []string onlyNodeLocalEndpoints bool @@ -155,7 +155,7 @@ type endpointsInfo struct { func newServiceInfo(service proxy.ServicePortName) *serviceInfo { return &serviceInfo{ sessionAffinityType: api.ServiceAffinityNone, // default - stickyMaxAgeSeconds: 180, // TODO: paramaterize this in the API. + stickyMaxAgeMinutes: 180, // TODO: paramaterize this in the API. } } @@ -388,6 +388,9 @@ func (proxier *Proxier) sameConfig(info *serviceInfo, service *api.Service, port if info.onlyNodeLocalEndpoints != onlyNodeLocalEndpoints { return false } + if !reflect.DeepEqual(info.loadBalancerSourceRanges, service.Spec.LoadBalancerSourceRanges) { + return false + } return true } @@ -1165,7 +1168,7 @@ func (proxier *Proxier) syncProxyRules() { "-A", string(svcChain), "-m", "comment", "--comment", svcName.String(), "-m", "recent", "--name", string(endpointChain), - "--rcheck", "--seconds", fmt.Sprintf("%d", svcInfo.stickyMaxAgeSeconds), "--reap", + "--rcheck", "--seconds", fmt.Sprintf("%d", svcInfo.stickyMaxAgeMinutes*60), "--reap", "-j", string(endpointChain)) } } diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/BUILD b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/BUILD index 243d432f15..f70bac824e 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/BUILD @@ -26,6 +26,7 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", + "//pkg/client/retry:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/cachesize:go_default_library", @@ -35,6 +36,7 @@ go_library( "//pkg/registry/generic/registry:go_default_library", "//pkg/runtime:go_default_library", "//pkg/storage:go_default_library", + "//pkg/util/wait:go_default_library", ], ) diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/eviction.go b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/eviction.go index 312bdfdf88..138c944953 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/eviction.go +++ b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/etcd/eviction.go @@ -21,13 +21,16 @@ import ( "time" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/policy" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" + "k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/util/wait" ) const ( @@ -40,6 +43,15 @@ const ( MaxDisruptedPodSize = 2000 ) +// EvictionsRetry is the retry for a conflict where multiple clients +// are making changes to the same resource. +var EvictionsRetry = wait.Backoff{ + Steps: 20, + Duration: 500 * time.Millisecond, + Factor: 1.0, + Jitter: 0.1, +} + func newEvictionStorage(store *registry.Store, podDisruptionBudgetClient policyclient.PodDisruptionBudgetsGetter) *EvictionREST { return &EvictionREST{store: store, podDisruptionBudgetClient: podDisruptionBudgetClient} } @@ -66,41 +78,58 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje return nil, err } pod := obj.(*api.Pod) - pdbs, err := r.getPodDisruptionBudgets(ctx, pod) + var rtStatus *unversioned.Status + var pdbName string + err = retry.RetryOnConflict(EvictionsRetry, func() error { + pdbs, err := r.getPodDisruptionBudgets(ctx, pod) + if err != nil { + return err + } + + if len(pdbs) > 1 { + rtStatus = &unversioned.Status{ + Status: unversioned.StatusFailure, + Message: "This pod has more than one PodDisruptionBudget, which the eviction subresource does not support.", + Code: 500, + } + return nil + } else if len(pdbs) == 1 { + pdb := pdbs[0] + pdbName = pdb.Name + // Try to verify-and-decrement + + // If it was false already, or if it becomes false during the course of our retries, + // raise an error marked as a 429. + ok, err := r.checkAndDecrement(pod.Namespace, pod.Name, pdb) + if err != nil { + return err + } + + if !ok { + rtStatus = &unversioned.Status{ + Status: unversioned.StatusFailure, + // TODO(mml): Include some more details about why the eviction is disallowed. + // Ideally any such text is generated by the DisruptionController (offline). + Message: "Cannot evict pod as it would violate the pod's disruption budget.", + Code: 429, + // TODO(mml): Add a Retry-After header. Once there are time-based + // budgets, we can sometimes compute a sensible suggested value. But + // even without that, we can give a suggestion (10 minutes?) that + // prevents well-behaved clients from hammering us. + } + } + } + return nil + }) + if err == wait.ErrWaitTimeout { + err = errors.NewTimeoutError(fmt.Sprintf("couldn't update PodDisruptionBudget %q due to conflicts", pdbName), 10) + } if err != nil { return nil, err } - if len(pdbs) > 1 { - return &unversioned.Status{ - Status: unversioned.StatusFailure, - Message: "This pod has more than one PodDisruptionBudget, which the eviction subresource does not support.", - Code: 500, - }, nil - } else if len(pdbs) == 1 { - pdb := pdbs[0] - // Try to verify-and-decrement - - // If it was false already, or if it becomes false during the course of our retries, - // raise an error marked as a 429. - ok, err := r.checkAndDecrement(pod.Namespace, pod.Name, pdb) - if err != nil { - return nil, err - } - - if !ok { - return &unversioned.Status{ - Status: unversioned.StatusFailure, - // TODO(mml): Include some more details about why the eviction is disallowed. - // Ideally any such text is generated by the DisruptionController (offline). - Message: "Cannot evict pod as it would violate the pod's disruption budget.", - Code: 429, - // TODO(mml): Add a Retry-After header. Once there are time-based - // budgets, we can sometimes compute a sensible suggested value. But - // even without that, we can give a suggestion (10 minutes?) that - // prevents well-behaved clients from hammering us. - }, nil - } + if rtStatus != nil { + return rtStatus, nil } // At this point there was either no PDB or we succeded in decrementing @@ -115,15 +144,16 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje return &unversioned.Status{Status: unversioned.StatusSuccess}, nil } +// checkAndDecrement checks if the provided PodDisruptionBudget allows any disruption. func (r *EvictionREST) checkAndDecrement(namespace string, podName string, pdb policy.PodDisruptionBudget) (ok bool, err error) { - if pdb.Status.ObservedGeneration != pdb.Generation { + if pdb.Status.ObservedGeneration < pdb.Generation { return false, nil } if pdb.Status.PodDisruptionsAllowed < 0 { - return false, fmt.Errorf("pdb disruptions allowed is negative") + return false, errors.NewForbidden(policy.Resource("poddisruptionbudget"), pdb.Name, fmt.Errorf("pdb disruptions allowed is negative")) } if len(pdb.Status.DisruptedPods) > MaxDisruptedPodSize { - return false, fmt.Errorf("DisrputedPods map too big - too many evictions not confirmed by PDB controller") + return false, errors.NewForbidden(policy.Resource("poddisruptionbudget"), pdb.Name, fmt.Errorf("DisrputedPods map too big - too many evictions not confirmed by PDB controller")) } if pdb.Status.PodDisruptionsAllowed == 0 { return false, nil @@ -144,18 +174,18 @@ func (r *EvictionREST) checkAndDecrement(namespace string, podName string, pdb p return true, nil } -// Returns any PDBs that match the pod. -// err is set if there's an error. -func (r *EvictionREST) getPodDisruptionBudgets(ctx api.Context, pod *api.Pod) (pdbs []policy.PodDisruptionBudget, err error) { +// getPodDisruptionBudgets returns any PDBs that match the pod or err if there's an error. +func (r *EvictionREST) getPodDisruptionBudgets(ctx api.Context, pod *api.Pod) ([]policy.PodDisruptionBudget, error) { if len(pod.Labels) == 0 { - return + return nil, nil } pdbList, err := r.podDisruptionBudgetClient.PodDisruptionBudgets(pod.Namespace).List(api.ListOptions{}) if err != nil { - return + return nil, err } + var pdbs []policy.PodDisruptionBudget for _, pdb := range pdbList.Items { if pdb.Namespace != pod.Namespace { continue diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go index e396b61732..c946eda757 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go +++ b/vendor/k8s.io/kubernetes/pkg/registry/core/pod/rest/log.go @@ -55,6 +55,11 @@ func (r *LogREST) ProducesMIMETypes(verb string) []string { } } +// LogREST implements StorageMetadata, return string as the generating object +func (r *LogREST) ProducesObject(verb string) interface{} { + return "" +} + // Get retrieves a runtime.Object that will stream the contents of the pod log func (r *LogREST) Get(ctx api.Context, name string, opts runtime.Object) (runtime.Object, error) { logOpts, ok := opts.(*api.PodLogOptions) diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller/repair.go b/vendor/k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller/repair.go index de323fbc77..e06ef571ff 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller/repair.go +++ b/vendor/k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller/repair.go @@ -105,7 +105,7 @@ func (c *Repair) runOnce() error { // the service collection. The caching layer keeps per-collection RVs, // and this is proper, since in theory the collections could be hosted // in separate etcd (or even non-etcd) instances. - list, err := c.registry.ListServices(ctx, nil) + list, err := c.registry.ListServices(ctx, &api.ListOptions{}) if err != nil { return fmt.Errorf("unable to refresh the service IP block: %v", err) } diff --git a/vendor/k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller/repair.go b/vendor/k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller/repair.go index 4d5cb51914..5ad15c3294 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller/repair.go +++ b/vendor/k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller/repair.go @@ -94,7 +94,7 @@ func (c *Repair) runOnce() error { // the service collection. The caching layer keeps per-collection RVs, // and this is proper, since in theory the collections could be hosted // in separate etcd (or even non-etcd) instances. - list, err := c.registry.ListServices(ctx, nil) + list, err := c.registry.ListServices(ctx, &api.ListOptions{}) if err != nil { return fmt.Errorf("unable to refresh the port block: %v", err) } diff --git a/vendor/k8s.io/kubernetes/pkg/registry/generic/registry/store.go b/vendor/k8s.io/kubernetes/pkg/registry/generic/registry/store.go index 30094ee8b7..30357d715a 100644 --- a/vendor/k8s.io/kubernetes/pkg/registry/generic/registry/store.go +++ b/vendor/k8s.io/kubernetes/pkg/registry/generic/registry/store.go @@ -202,7 +202,8 @@ func (e *Store) List(ctx api.Context, options *api.ListOptions) (runtime.Object, // ListPredicate returns a list of all the items matching m. func (e *Store) ListPredicate(ctx api.Context, p storage.SelectionPredicate, options *api.ListOptions) (runtime.Object, error) { if options == nil { - options = &api.ListOptions{ResourceVersion: "0"} + // By default we should serve the request from etcd. + options = &api.ListOptions{ResourceVersion: ""} } list := e.NewListFunc() if name, ok := p.MatchesSingle(); ok { diff --git a/vendor/k8s.io/kubernetes/pkg/storage/cacher.go b/vendor/k8s.io/kubernetes/pkg/storage/cacher.go index ae64f741dc..f7f5febf4a 100644 --- a/vendor/k8s.io/kubernetes/pkg/storage/cacher.go +++ b/vendor/k8s.io/kubernetes/pkg/storage/cacher.go @@ -531,17 +531,23 @@ func (c *Cacher) dispatchEvents() { func (c *Cacher) dispatchEvent(event *watchCacheEvent) { triggerValues, supported := c.triggerValues(event) + // TODO: For now we assume we have a given budget for dispatching + // a single event. We should consider changing to the approach with: + // - budget has upper bound at + // - we add to current timeout every second + timeout := time.Duration(250) * time.Millisecond + c.Lock() defer c.Unlock() // Iterate over "allWatchers" no matter what the trigger function is. for _, watcher := range c.watchers.allWatchers { - watcher.add(event) + watcher.add(event, &timeout) } if supported { // Iterate over watchers interested in the given values of the trigger. for _, triggerValue := range triggerValues { for _, watcher := range c.watchers.valueWatchers[triggerValue] { - watcher.add(event) + watcher.add(event, &timeout) } } } else { @@ -554,7 +560,7 @@ func (c *Cacher) dispatchEvent(event *watchCacheEvent) { // Iterate over watchers interested in exact values for all values. for _, watchers := range c.watchers.valueWatchers { for _, watcher := range watchers { - watcher.add(event) + watcher.add(event, &timeout) } } } @@ -728,7 +734,7 @@ func (c *cacheWatcher) stop() { var timerPool sync.Pool -func (c *cacheWatcher) add(event *watchCacheEvent) { +func (c *cacheWatcher) add(event *watchCacheEvent, timeout *time.Duration) { // Try to send the event immediately, without blocking. select { case c.input <- *event: @@ -736,20 +742,16 @@ func (c *cacheWatcher) add(event *watchCacheEvent) { default: } - // OK, block sending, but only for up to 5 seconds. + // OK, block sending, but only for up to . // cacheWatcher.add is called very often, so arrange // to reuse timers instead of constantly allocating. - trace := util.NewTrace( - fmt.Sprintf("cacheWatcher %v: waiting for add (initial result size %v)", - reflect.TypeOf(event.Object).String(), len(c.result))) - defer trace.LogIfLong(50 * time.Millisecond) + startTime := time.Now() - const timeout = 5 * time.Second t, ok := timerPool.Get().(*time.Timer) if ok { - t.Reset(timeout) + t.Reset(*timeout) } else { - t = time.NewTimer(timeout) + t = time.NewTimer(*timeout) } defer timerPool.Put(t) @@ -768,6 +770,10 @@ func (c *cacheWatcher) add(event *watchCacheEvent) { c.forget(false) c.stop() } + + if *timeout = *timeout - time.Since(startTime); *timeout < 0 { + *timeout = 0 + } } // NOTE: sendWatchCacheEvent is assumed to not modify !!! diff --git a/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/BUILD b/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/BUILD index 3caecf81cf..433cd4350e 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/BUILD @@ -20,7 +20,7 @@ go_library( deps = [ "//pkg/util/clock:go_default_library", "//pkg/util/integer:go_default_library", - "//pkg/util/ratelimit:go_default_library", + "//vendor:github.com/juju/ratelimit", ], ) diff --git a/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/throttle.go b/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/throttle.go index 42170a1892..881a2f57d7 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/throttle.go +++ b/vendor/k8s.io/kubernetes/pkg/util/flowcontrol/throttle.go @@ -19,7 +19,7 @@ package flowcontrol import ( "sync" - "k8s.io/kubernetes/pkg/util/ratelimit" + "github.com/juju/ratelimit" ) type RateLimiter interface { diff --git a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go index afc2a95452..b5840a2887 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go +++ b/vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.go @@ -374,6 +374,12 @@ func (runner *runner) checkRule(table Table, chain Chain, args ...string) (bool, } } +var hexnumRE = regexp.MustCompile("0x0+([0-9])") + +func trimhex(s string) string { + return hexnumRE.ReplaceAllString(s, "0x$1") +} + // Executes the rule check without using the "-C" flag, instead parsing iptables-save. // Present for compatibility with <1.4.11 versions of iptables. This is full // of hack and half-measures. We should nix this ASAP. @@ -392,6 +398,7 @@ func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...st var argsCopy []string for i := range args { tmpField := strings.Trim(args[i], "\"") + tmpField = trimhex(tmpField) argsCopy = append(argsCopy, strings.Fields(tmpField)...) } argset := sets.NewString(argsCopy...) @@ -409,6 +416,7 @@ func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...st // Just remove all quotes. for i := range fields { fields[i] = strings.Trim(fields[i], "\"") + fields[i] = trimhex(fields[i]) } // TODO: This misses reorderings e.g. "-x foo ! -y bar" will match "! -x foo -y bar" diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go b/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go index 02ef476b1f..8796d6a52d 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go +++ b/vendor/k8s.io/kubernetes/pkg/util/mount/mount.go @@ -30,7 +30,8 @@ import ( const ( // Default mount command if mounter path is not specified - defaultMountCommand = "mount" + defaultMountCommand = "mount" + MountsInGlobalPDPath = "mounts" ) type Interface interface { @@ -189,9 +190,15 @@ func getDeviceNameFromMount(mounter Interface, mountPath, pluginDir string) (str glog.V(4).Infof("Directory %s is not mounted", mountPath) return "", fmt.Errorf("directory %s is not mounted", mountPath) } + basemountPath := path.Join(pluginDir, MountsInGlobalPDPath) for _, ref := range refs { - if strings.HasPrefix(ref, pluginDir) { - return path.Base(ref), nil + if strings.HasPrefix(ref, basemountPath) { + volumeID, err := filepath.Rel(basemountPath, ref) + if err != nil { + glog.Errorf("Failed to get volume id from mount %s - %v", mountPath, err) + return "", err + } + return volumeID, nil } } diff --git a/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go b/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go index 2688f8105b..dff5353e73 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/util/mount/mount_linux.go @@ -74,9 +74,9 @@ func (mounter *Mounter) Mount(source string, target string, fstype string, optio } return doMount(mounterPath, source, target, fstype, bindRemountOpts) } - // These filesystem types are expected to be supported by the mount utility on the host across all Linux distros. - var defaultMounterFsTypes = sets.NewString("tmpfs", "ext4", "ext3", "ext2") - if !defaultMounterFsTypes.Has(fstype) { + // The list of filesystems that require containerized mounter on GCI image cluster + fsTypesNeedMounter := sets.NewString("nfs", "glusterfs") + if fsTypesNeedMounter.Has(fstype) { mounterPath = mounter.mounterPath } return doMount(mounterPath, source, target, fstype, options) diff --git a/vendor/k8s.io/kubernetes/pkg/util/rand/rand.go b/vendor/k8s.io/kubernetes/pkg/util/rand/rand.go index 134c152605..db109c2cd2 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/rand/rand.go +++ b/vendor/k8s.io/kubernetes/pkg/util/rand/rand.go @@ -23,8 +23,6 @@ import ( "time" ) -var letters = []rune("abcdefghijklmnopqrstuvwxyz0123456789") -var numLetters = len(letters) var rng = struct { sync.Mutex rand *rand.Rand @@ -72,12 +70,16 @@ func Perm(n int) []int { return rng.rand.Perm(n) } -// String generates a random alphanumeric string n characters long. This will -// panic if n is less than zero. +// We omit vowels from the set of available characters to reduce the chances +// of "bad words" being formed. +var alphanums = []rune("bcdfghjklmnpqrstvwxz0123456789") + +// String generates a random alphanumeric string, without vowels, which is n +// characters long. This will panic if n is less than zero. func String(length int) string { b := make([]rune, length) for i := range b { - b[i] = letters[Intn(numLetters)] + b[i] = alphanums[Intn(len(alphanums))] } return string(b) } diff --git a/vendor/k8s.io/kubernetes/pkg/util/ratelimit/BUILD b/vendor/k8s.io/kubernetes/pkg/util/ratelimit/BUILD deleted file mode 100644 index 760940e2e8..0000000000 --- a/vendor/k8s.io/kubernetes/pkg/util/ratelimit/BUILD +++ /dev/null @@ -1,25 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_binary", - "go_library", - "go_test", - "cgo_library", -) - -go_library( - name = "go_default_library", - srcs = ["bucket.go"], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["bucket_test.go"], - library = "go_default_library", - tags = ["automanaged"], - deps = [], -) diff --git a/vendor/k8s.io/kubernetes/pkg/util/ratelimit/bucket.go b/vendor/k8s.io/kubernetes/pkg/util/ratelimit/bucket.go deleted file mode 100644 index 752a251d05..0000000000 --- a/vendor/k8s.io/kubernetes/pkg/util/ratelimit/bucket.go +++ /dev/null @@ -1,170 +0,0 @@ -/* -Copyright 2016 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 ratelimit - -import ( - "math" - "sync" - "time" -) - -// Bucket models a token bucket -type Bucket struct { - unitsPerNano float64 - nanosPerUnit float64 - capacity int64 - - mutex sync.Mutex - available int64 - lastRefill int64 - // fractionalAvailable "buffers" any amounts that flowed into the bucket smaller than one unit - // This lets us retain precision even with pathological refill rates like (1E9 + 1) per second - fractionalAvailable float64 -} - -// NewBucketWithRate creates a new token bucket, with maximum capacity = initial capacity, and a refill rate of qps -// We use floats for refill calculations, which introduces the possibility of truncation and rounding errors. -// For "sensible" qps values though, is is acceptable: jbeda did some tests here https://play.golang.org/p/LSKUOGz2LG -func NewBucketWithRate(qps float64, capacity int64) *Bucket { - unitsPerNano := qps / 1E9 - nanosPerUnit := 1E9 / qps - b := &Bucket{ - unitsPerNano: unitsPerNano, - nanosPerUnit: nanosPerUnit, - capacity: capacity, - available: capacity, - lastRefill: time.Now().UnixNano(), - } - return b -} - -// Take takes n units from the bucket, reducing the available quantity even below zero, -// but then returns the amount of time we should wait -func (b *Bucket) Take(n int64) time.Duration { - b.mutex.Lock() - defer b.mutex.Unlock() - - var d time.Duration - if b.available >= n { - // Fast path when bucket has sufficient availability before refilling - } else { - b.refill() - - if b.available < n { - deficit := n - b.available - d = time.Duration(int64(float64(deficit) * b.nanosPerUnit)) - } - } - - b.available -= n - - return d -} - -// TakeAvailable immediately takes whatever quantity is available, up to max -func (b *Bucket) TakeAvailable(max int64) int64 { - b.mutex.Lock() - defer b.mutex.Unlock() - - var took int64 - if b.available >= max { - // Fast path when bucket has sufficient availability before refilling - took = max - } else { - b.refill() - - took = b.available - - if took < 0 { - took = 0 - } else if took > max { - took = max - } - } - - if took > 0 { - b.available -= took - } - - return took -} - -// Wait combines a call to Take with a sleep call -func (b *Bucket) Wait(n int64) { - d := b.Take(n) - if d != 0 { - time.Sleep(d) - } -} - -// Capacity returns the maximum capacity of the bucket -func (b *Bucket) Capacity() int64 { - return b.capacity -} - -// Available returns the quantity available in the bucket (which may be negative), but does not take it. -// This function is for diagnostic / informational purposes only - the returned capacity may immediately -// be inaccurate if another thread is operating on the bucket concurrently. -func (b *Bucket) Available() int64 { - b.mutex.Lock() - defer b.mutex.Unlock() - - b.refill() - - return b.available -} - -// refill replenishes the bucket based on elapsed time; mutex must be held -func (b *Bucket) refill() { - // Note that we really want a monotonic clock here, but go says no: - // https://github.com/golang/go/issues/12914 - now := time.Now().UnixNano() - - b.refillAtTimestamp(now) -} - -// refillAtTimestamp is the logic of the refill function, for testing -func (b *Bucket) refillAtTimestamp(now int64) { - nanosSinceLastRefill := now - b.lastRefill - if nanosSinceLastRefill <= 0 { - // we really want monotonic - return - } - - // Compute units that have flowed into bucket - refillFloat := (float64(nanosSinceLastRefill) * b.unitsPerNano) + b.fractionalAvailable - if refillFloat > float64(b.capacity) { - // float64 > MaxInt64 can be converted to negative int64; side step this - b.available = b.capacity - - // Don't worry about the fractional units with huge refill rates - } else { - whole, fraction := math.Modf(refillFloat) - refill := int64(whole) - b.fractionalAvailable = fraction - if refill != 0 { - // Refill with overflow - b.available += refill - if b.available >= b.capacity { - b.available = b.capacity - b.fractionalAvailable = 0 - } - } - - } - b.lastRefill = now -} diff --git a/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/BUILD b/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/BUILD index 8340ba0c5a..433b7a295d 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/BUILD @@ -15,7 +15,6 @@ go_library( srcs = ["patch.go"], tags = ["automanaged"], deps = [ - "//pkg/client/typed/discovery:go_default_library", "//pkg/util/json:go_default_library", "//third_party/forked/golang/json:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", diff --git a/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/patch.go b/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/patch.go index f6c5e699eb..66a33f7ad0 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/patch.go +++ b/vendor/k8s.io/kubernetes/pkg/util/strategicpatch/patch.go @@ -21,7 +21,6 @@ import ( "reflect" "sort" - "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/util/json" forkedjson "k8s.io/kubernetes/third_party/forked/golang/json" @@ -39,20 +38,11 @@ import ( // Some of the content of this package was borrowed with minor adaptations from // evanphx/json-patch and openshift/origin. -type StrategicMergePatchVersion string - const ( - directiveMarker = "$patch" - deleteDirective = "delete" - replaceDirective = "replace" - mergeDirective = "merge" - mergePrimitivesListDirective = "mergeprimitiveslist" - - // different versions of StrategicMergePatch - SMPatchVersion_1_0 StrategicMergePatchVersion = "v1.0.0" - SMPatchVersion_1_5 StrategicMergePatchVersion = "v1.5.0" - Unknown StrategicMergePatchVersion = "Unknown" - SMPatchVersionLatest = SMPatchVersion_1_5 + directiveMarker = "$patch" + deleteDirective = "delete" + replaceDirective = "replace" + mergeDirective = "merge" ) // IsPreconditionFailed returns true if the provided error indicates @@ -97,7 +87,6 @@ func IsConflict(err error) bool { var errBadJSONDoc = fmt.Errorf("Invalid JSON document") var errNoListOfLists = fmt.Errorf("Lists of lists are not supported") -var errNoElementsInSlice = fmt.Errorf("no elements in any of the given slices") // The following code is adapted from github.com/openshift/origin/pkg/util/jsonmerge. // Instead of defining a Delta that holds an original, a patch and a set of preconditions, @@ -144,15 +133,15 @@ func RequireMetadataKeyUnchanged(key string) PreconditionFunc { } // Deprecated: Use the synonym CreateTwoWayMergePatch, instead. -func CreateStrategicMergePatch(original, modified []byte, dataStruct interface{}, smPatchVersion StrategicMergePatchVersion) ([]byte, error) { - return CreateTwoWayMergePatch(original, modified, dataStruct, smPatchVersion) +func CreateStrategicMergePatch(original, modified []byte, dataStruct interface{}) ([]byte, error) { + return CreateTwoWayMergePatch(original, modified, dataStruct) } // CreateTwoWayMergePatch creates a patch that can be passed to StrategicMergePatch from an original // document and a modified document, which are passed to the method as json encoded content. It will // return a patch that yields the modified document when applied to the original document, or an error // if either of the two documents is invalid. -func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, smPatchVersion StrategicMergePatchVersion, fns ...PreconditionFunc) ([]byte, error) { +func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, fns ...PreconditionFunc) ([]byte, error) { originalMap := map[string]interface{}{} if len(original) > 0 { if err := json.Unmarshal(original, &originalMap); err != nil { @@ -172,7 +161,7 @@ func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, s return nil, err } - patchMap, err := diffMaps(originalMap, modifiedMap, t, false, false, smPatchVersion) + patchMap, err := diffMaps(originalMap, modifiedMap, t, false, false) if err != nil { return nil, err } @@ -188,7 +177,7 @@ func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, s } // Returns a (recursive) strategic merge patch that yields modified when applied to original. -func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (map[string]interface{}, error) { +func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreChangesAndAdditions, ignoreDeletions bool) (map[string]interface{}, error) { patch := map[string]interface{}{} if t.Kind() == reflect.Ptr { t = t.Elem() @@ -241,7 +230,7 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC return nil, err } - patchValue, err := diffMaps(originalValueTyped, modifiedValueTyped, fieldType, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffMaps(originalValueTyped, modifiedValueTyped, fieldType, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } @@ -259,25 +248,13 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC } if fieldPatchStrategy == mergeDirective { - patchValue, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } - if patchValue == nil { - continue - } - switch typedPatchValue := patchValue.(type) { - case []interface{}: - if len(typedPatchValue) > 0 { - patch[key] = typedPatchValue - } - case map[string]interface{}: - if len(typedPatchValue) > 0 { - patch[key] = typedPatchValue - } - default: - return nil, fmt.Errorf("invalid type of patch: %v", reflect.TypeOf(patchValue)) + if len(patchValue) > 0 { + patch[key] = patchValue } continue @@ -307,7 +284,7 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists with merge semantics. -func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (interface{}, error) { +func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { if len(original) == 0 { if len(modified) == 0 || ignoreChangesAndAdditions { return nil, nil @@ -321,14 +298,12 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string return nil, err } - var patch interface{} + var patch []interface{} if elementType.Kind() == reflect.Map { - patch, err = diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) - } else if elementType.Kind() == reflect.Slice { - err = errNoListOfLists - } else { - patch, err = diffListsOfScalars(original, modified, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patch, err = diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions) + } else if !ignoreChangesAndAdditions { + patch, err = diffListsOfScalars(original, modified) } if err != nil { @@ -340,23 +315,8 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists of scalars with merge semantics. -func diffListsOfScalars(original, modified []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (interface{}, error) { - originalScalars := uniqifyAndSortScalars(original) - modifiedScalars := uniqifyAndSortScalars(modified) - - switch smPatchVersion { - case SMPatchVersion_1_5: - return diffListsOfScalarsIntoMap(originalScalars, modifiedScalars, ignoreChangesAndAdditions, ignoreDeletions) - case SMPatchVersion_1_0: - return diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars, ignoreChangesAndAdditions, ignoreDeletions) - default: - return nil, fmt.Errorf("Unknown StrategicMergePatchVersion: %v", smPatchVersion) - } -} - -func diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { - originalIndex, modifiedIndex := 0, 0 - if len(modifiedScalars) == 0 { +func diffListsOfScalars(original, modified []interface{}) ([]interface{}, error) { + if len(modified) == 0 { // There is no need to check the length of original because there is no way to create // a patch that deletes a scalar from a list of scalars with merge semantics. return nil, nil @@ -364,14 +324,18 @@ func diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars []interface{}, patch := []interface{}{} + originalScalars := uniqifyAndSortScalars(original) + modifiedScalars := uniqifyAndSortScalars(modified) + originalIndex, modifiedIndex := 0, 0 + loopB: for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { for ; originalIndex < len(originalScalars); originalIndex++ { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) + originalString := fmt.Sprintf("%v", original[originalIndex]) + modifiedString := fmt.Sprintf("%v", modified[modifiedIndex]) if originalString >= modifiedString { if originalString != modifiedString { - patch = append(patch, modifiedScalars[modifiedIndex]) + patch = append(patch, modified[modifiedIndex]) } continue loopB @@ -385,57 +349,7 @@ loopB: // Add any remaining items found only in modified for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { - patch = append(patch, modifiedScalars[modifiedIndex]) - } - - return patch, nil -} - -func diffListsOfScalarsIntoMap(originalScalars, modifiedScalars []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool) (map[string]interface{}, error) { - originalIndex, modifiedIndex := 0, 0 - patch := map[string]interface{}{} - patch[directiveMarker] = mergePrimitivesListDirective - - for originalIndex < len(originalScalars) && modifiedIndex < len(modifiedScalars) { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) - - // objects are identical - if originalString == modifiedString { - originalIndex++ - modifiedIndex++ - continue - } - - if originalString > modifiedString { - if !ignoreChangesAndAdditions { - modifiedValue := modifiedScalars[modifiedIndex] - patch[modifiedString] = modifiedValue - } - modifiedIndex++ - } else { - if !ignoreDeletions { - patch[originalString] = nil - } - originalIndex++ - } - } - - // Delete any remaining items found only in original - if !ignoreDeletions { - for ; originalIndex < len(originalScalars); originalIndex++ { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - patch[originalString] = nil - } - } - - // Add any remaining items found only in modified - if !ignoreChangesAndAdditions { - for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) - modifiedValue := modifiedScalars[modifiedIndex] - patch[modifiedString] = modifiedValue - } + patch = append(patch, modified[modifiedIndex]) } return patch, nil @@ -446,7 +360,7 @@ var errBadArgTypeFmt = "expected a %s, but received a %s" // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists of maps with merge semantics. -func diffListsOfMaps(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) ([]interface{}, error) { +func diffListsOfMaps(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { patch := make([]interface{}, 0) originalSorted, err := sortMergeListsByNameArray(original, t, mergeKey, false) @@ -492,7 +406,7 @@ loopB: if originalString >= modifiedString { if originalString == modifiedString { // Merge key values are equal, so recurse - patchValue, err := diffMaps(originalMap, modifiedMap, t, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffMaps(originalMap, modifiedMap, t, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } @@ -628,15 +542,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin return map[string]interface{}{}, nil } - if v == mergePrimitivesListDirective { - // delete the directiveMarker's key-value pair to avoid delta map and delete map - // overlaping with each other when calculating a ThreeWayDiff for list of Primitives. - // Otherwise, the overlaping will cause it calling LookupPatchMetadata() which will - // return an error since the metadata shows it's a slice but it is actually a map. - delete(original, directiveMarker) - } else { - return nil, fmt.Errorf(errBadPatchTypeFmt, v, patch) - } + return nil, fmt.Errorf(errBadPatchTypeFmt, v, patch) } // nil is an accepted value for original to simplify logic in other places. @@ -672,9 +578,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin // If they're both maps or lists, recurse into the value. originalType := reflect.TypeOf(original[k]) patchType := reflect.TypeOf(patchV) - // check if we are trying to merge a slice with a map for list of primitives - isMergeSliceOfPrimitivesWithAPatchMap := originalType != nil && patchType != nil && originalType.Kind() == reflect.Slice && patchType.Kind() == reflect.Map - if originalType == patchType || isMergeSliceOfPrimitivesWithAPatchMap { + if originalType == patchType { // First find the fieldPatchStrategy and fieldPatchMergeKey. fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(t, k) if err != nil { @@ -696,8 +600,9 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin if originalType.Kind() == reflect.Slice && fieldPatchStrategy == mergeDirective { elemType := fieldType.Elem() typedOriginal := original[k].([]interface{}) + typedPatch := patchV.([]interface{}) var err error - original[k], err = mergeSlice(typedOriginal, patchV, elemType, fieldPatchMergeKey) + original[k], err = mergeSlice(typedOriginal, typedPatch, elemType, fieldPatchMergeKey) if err != nil { return nil, err } @@ -718,34 +623,13 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin // Merge two slices together. Note: This may modify both the original slice and // the patch because getting a deep copy of a slice in golang is highly // non-trivial. -// The patch could be a map[string]interface{} representing a slice of primitives. -// If the patch map doesn't has the specific directiveMarker (mergePrimitivesListDirective), -// it returns an error. Please check patch_test.go and find the test case named -// "merge lists of scalars for list of primitives" to see what the patch looks like. -// Patch is still []interface{} for all the other types. -func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type, mergeKey string) ([]interface{}, error) { - t, err := sliceElementType(original) - if err != nil && err != errNoElementsInSlice { - return nil, err - } - - if patchMap, ok := patch.(map[string]interface{}); ok { - // We try to merge the original slice with a patch map only when the map has - // a specific directiveMarker. Otherwise, this patch will be treated as invalid. - if directiveValue, ok := patchMap[directiveMarker]; ok && directiveValue == mergePrimitivesListDirective { - return mergeSliceOfScalarsWithPatchMap(original, patchMap) - } else { - return nil, fmt.Errorf("Unable to merge a slice with an invalid map") - } - } - - typedPatch := patch.([]interface{}) - if len(original) == 0 && len(typedPatch) == 0 { +func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey string) ([]interface{}, error) { + if len(original) == 0 && len(patch) == 0 { return original, nil } // All the values must be of the same type, but not a list. - t, err = sliceElementType(original, typedPatch) + t, err := sliceElementType(original, patch) if err != nil { return nil, err } @@ -754,7 +638,7 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type if t.Kind() != reflect.Map { // Maybe in the future add a "concat" mode that doesn't // uniqify. - both := append(original, typedPatch...) + both := append(original, patch...) return uniqifyScalars(both), nil } @@ -765,7 +649,7 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type // First look for any special $patch elements. patchWithoutSpecialElements := []interface{}{} replace := false - for _, v := range typedPatch { + for _, v := range patch { typedV := v.(map[string]interface{}) patchType, ok := typedV[directiveMarker] if ok { @@ -801,10 +685,10 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type return patchWithoutSpecialElements, nil } - typedPatch = patchWithoutSpecialElements + patch = patchWithoutSpecialElements // Merge patch into original. - for _, v := range typedPatch { + for _, v := range patch { // Because earlier we confirmed that all the elements are maps. typedV := v.(map[string]interface{}) mergeValue, ok := typedV[mergeKey] @@ -837,36 +721,6 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type return original, nil } -// mergeSliceOfScalarsWithPatchMap merges the original slice with a patch map and -// returns an uniqified and sorted slice of primitives. -// The patch map must have the specific directiveMarker (mergePrimitivesListDirective). -func mergeSliceOfScalarsWithPatchMap(original []interface{}, patch map[string]interface{}) ([]interface{}, error) { - // make sure the patch has the specific directiveMarker () - if directiveValue, ok := patch[directiveMarker]; ok && directiveValue != mergePrimitivesListDirective { - return nil, fmt.Errorf("Unable to merge a slice with an invalid map") - } - delete(patch, directiveMarker) - output := make([]interface{}, 0, len(original)+len(patch)) - for _, value := range original { - valueString := fmt.Sprintf("%v", value) - if v, ok := patch[valueString]; ok { - if v != nil { - output = append(output, v) - } - delete(patch, valueString) - } else { - output = append(output, value) - } - } - for _, value := range patch { - if value != nil { - output = append(output, value) - } - // No action required to delete items that missing from the original slice. - } - return uniqifyAndSortScalars(output), nil -} - // This method no longer panics if any element of the slice is not a map. func findMapInSliceBasedOnKeyValue(m []interface{}, key string, value interface{}) (map[string]interface{}, int, bool, error) { for k, v := range m { @@ -1092,7 +946,7 @@ func sliceElementType(slices ...[]interface{}) (reflect.Type, error) { } if prevType == nil { - return nil, errNoElementsInSlice + return nil, fmt.Errorf("no elements in any of the given slices") } return prevType, nil @@ -1181,10 +1035,6 @@ func mergingMapFieldsHaveConflicts( if leftMarker != rightMarker { return true, nil } - - if leftMarker == mergePrimitivesListDirective && rightMarker == mergePrimitivesListDirective { - return false, nil - } } // Check the individual keys. @@ -1207,29 +1057,12 @@ func mergingMapFieldsHaveConflicts( } func mapsHaveConflicts(typedLeft, typedRight map[string]interface{}, structType reflect.Type) (bool, error) { - isForListOfPrimitives := false - if leftDirective, ok := typedLeft[directiveMarker]; ok { - if rightDirective, ok := typedRight[directiveMarker]; ok { - if leftDirective == mergePrimitivesListDirective && rightDirective == rightDirective { - isForListOfPrimitives = true - } - } - } for key, leftValue := range typedLeft { if key != directiveMarker { if rightValue, ok := typedRight[key]; ok { - var fieldType reflect.Type - var fieldPatchStrategy, fieldPatchMergeKey string - var err error - if isForListOfPrimitives { - fieldType = reflect.TypeOf(leftValue) - fieldPatchStrategy = "" - fieldPatchMergeKey = "" - } else { - fieldType, fieldPatchStrategy, fieldPatchMergeKey, err = forkedjson.LookupPatchMetadata(structType, key) - if err != nil { - return true, err - } + fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(structType, key) + if err != nil { + return true, err } if hasConflicts, err := mergingMapFieldsHaveConflicts(leftValue, rightValue, @@ -1339,7 +1172,7 @@ func mapsOfMapsHaveConflicts(typedLeft, typedRight map[string]interface{}, struc // than from original to current. In other words, a conflict occurs if modified changes any key // in a way that is different from how it is changed in current (e.g., deleting it, changing its // value). -func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct interface{}, overwrite bool, smPatchVersion StrategicMergePatchVersion, fns ...PreconditionFunc) ([]byte, error) { +func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct interface{}, overwrite bool, fns ...PreconditionFunc) ([]byte, error) { originalMap := map[string]interface{}{} if len(original) > 0 { if err := json.Unmarshal(original, &originalMap); err != nil { @@ -1370,12 +1203,12 @@ func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct int // from original to modified. To find it, we compute deletions, which are the deletions from // original to modified, and delta, which is the difference from current to modified without // deletions, and then apply delta to deletions as a patch, which should be strictly additive. - deltaMap, err := diffMaps(currentMap, modifiedMap, t, false, true, smPatchVersion) + deltaMap, err := diffMaps(currentMap, modifiedMap, t, false, true) if err != nil { return nil, err } - deletionsMap, err := diffMaps(originalMap, modifiedMap, t, true, false, smPatchVersion) + deletionsMap, err := diffMaps(originalMap, modifiedMap, t, true, false) if err != nil { return nil, err } @@ -1395,7 +1228,7 @@ func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct int // If overwrite is false, and the patch contains any keys that were changed differently, // then return a conflict error. if !overwrite { - changedMap, err := diffMaps(originalMap, currentMap, t, false, false, smPatchVersion) + changedMap, err := diffMaps(originalMap, currentMap, t, false, false) if err != nil { return nil, err } @@ -1430,20 +1263,3 @@ func toYAML(v interface{}) (string, error) { return string(y), nil } - -// GetServerSupportedSMPatchVersion takes a discoveryClient, -// returns the max StrategicMergePatch version supported -func GetServerSupportedSMPatchVersion(discoveryClient discovery.DiscoveryInterface) (StrategicMergePatchVersion, error) { - serverVersion, err := discoveryClient.ServerVersion() - if err != nil { - return Unknown, err - } - serverGitVersion := serverVersion.GitVersion - if serverGitVersion >= string(SMPatchVersion_1_5) { - return SMPatchVersion_1_5, nil - } - if serverGitVersion >= string(SMPatchVersion_1_0) { - return SMPatchVersion_1_0, nil - } - return Unknown, fmt.Errorf("The version is too old: %v\n", serverVersion) -} diff --git a/vendor/k8s.io/kubernetes/pkg/util/workqueue/BUILD b/vendor/k8s.io/kubernetes/pkg/util/workqueue/BUILD index af8eb00324..8b8e98d92a 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/workqueue/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/util/workqueue/BUILD @@ -25,8 +25,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/util/clock:go_default_library", - "//pkg/util/ratelimit:go_default_library", "//pkg/util/runtime:go_default_library", + "//vendor:github.com/juju/ratelimit", ], ) diff --git a/vendor/k8s.io/kubernetes/pkg/util/workqueue/default_rate_limiters.go b/vendor/k8s.io/kubernetes/pkg/util/workqueue/default_rate_limiters.go index 0b5b9bba29..35caed4fa4 100644 --- a/vendor/k8s.io/kubernetes/pkg/util/workqueue/default_rate_limiters.go +++ b/vendor/k8s.io/kubernetes/pkg/util/workqueue/default_rate_limiters.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/util/ratelimit" + "github.com/juju/ratelimit" ) type RateLimiter interface { @@ -35,7 +35,7 @@ type RateLimiter interface { } // DefaultControllerRateLimiter is a no-arg constructor for a default rate limiter for a workqueue. It has -// both overall and per-item rate limiting. The overall is a token bucket and the per-item is exponential +// both overall and per-item rate limitting. The overall is a token bucket and the per-item is exponential func DefaultControllerRateLimiter() RateLimiter { return NewMaxOfRateLimiter( NewItemExponentialFailureRateLimiter(5*time.Millisecond, 1000*time.Second), diff --git a/vendor/k8s.io/kubernetes/pkg/version/base.go b/vendor/k8s.io/kubernetes/pkg/version/base.go index 4fba563077..7f3e39677b 100644 --- a/vendor/k8s.io/kubernetes/pkg/version/base.go +++ b/vendor/k8s.io/kubernetes/pkg/version/base.go @@ -39,8 +39,8 @@ var ( // them irrelevant. (Next we'll take it out, which may muck with // scripts consuming the kubectl version output - but most of // these should be looking at gitVersion already anyways.) - gitMajor string = "1" // major version, always numeric - gitMinor string = "5+" // minor version, numeric possibly followed by "+" + gitMajor string = "1" // major version, always numeric + gitMinor string = "5" // minor version, numeric possibly followed by "+" // semantic version, derived by build scripts (see // https://github.com/kubernetes/kubernetes/blob/master/docs/design/versioning.md @@ -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.5.0-beta.1+$Format:%h$" + gitVersion string = "v1.5.0+$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/aws_ebs/aws_ebs.go b/vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_ebs.go index c9bf5f7265..fbc88791bf 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_ebs.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/aws_ebs/aws_ebs.go @@ -51,6 +51,7 @@ var _ volume.ProvisionableVolumePlugin = &awsElasticBlockStorePlugin{} const ( awsElasticBlockStorePluginName = "kubernetes.io/aws-ebs" + awsURLNamePrefix = "aws://" ) func getPath(uid types.UID, volName string, host volume.VolumeHost) string { @@ -189,10 +190,36 @@ func getVolumeSource( func (plugin *awsElasticBlockStorePlugin) ConstructVolumeSpec(volName, mountPath string) (*volume.Spec, error) { mounter := plugin.host.GetMounter() pluginDir := plugin.host.GetPluginDir(plugin.GetPluginName()) - sourceName, err := mounter.GetDeviceNameFromMount(mountPath, pluginDir) + volumeID, err := mounter.GetDeviceNameFromMount(mountPath, pluginDir) if err != nil { return nil, err } + // This is a workaround to fix the issue in converting aws volume id from globalPDPath + // There are three aws volume id formats and their volumeID from GetDeviceNameFromMount() are: + // aws:///vol-1234 (aws/vol-1234) + // aws://us-east-1/vol-1234 (aws/us-east-1/vol-1234) + // vol-1234 (vol-1234) + // This code is for converting volume id to aws style volume id for the first two cases. + sourceName := volumeID + if strings.HasPrefix(volumeID, "aws/") { + names := strings.Split(volumeID, "/") + length := len(names) + if length < 2 || length > 3 { + return nil, fmt.Errorf("Failed to get AWS volume id from mount path %q: invalid volume name format %q", mountPath, volumeID) + } + volName := names[length-1] + if !strings.HasPrefix(volName, "vol-") { + return nil, fmt.Errorf("Invalid volume name format for AWS volume (%q) retrieved from mount path %q", volName, mountPath) + } + if length == 2 { + sourceName = awsURLNamePrefix + "" + "/" + volName // empty zone label + } + if length == 3 { + sourceName = awsURLNamePrefix + names[1] + "/" + volName // names[1] is the zone label + } + glog.V(4).Infof("Convert aws volume name from %q to %q ", volumeID, sourceName) + } + awsVolume := &api.Volume{ Name: volName, VolumeSource: api.VolumeSource{ @@ -324,12 +351,12 @@ func makeGlobalPDPath(host volume.VolumeHost, volumeID aws.KubernetesVolumeID) s // Clean up the URI to be more fs-friendly name := string(volumeID) name = strings.Replace(name, "://", "/", -1) - return path.Join(host.GetPluginDir(awsElasticBlockStorePluginName), "mounts", name) + return path.Join(host.GetPluginDir(awsElasticBlockStorePluginName), mount.MountsInGlobalPDPath, name) } // Reverses the mapping done in makeGlobalPDPath func getVolumeIDFromGlobalMount(host volume.VolumeHost, globalPath string) (string, error) { - basePath := path.Join(host.GetPluginDir(awsElasticBlockStorePluginName), "mounts") + basePath := path.Join(host.GetPluginDir(awsElasticBlockStorePluginName), mount.MountsInGlobalPDPath) rel, err := filepath.Rel(basePath, globalPath) if err != nil { glog.Errorf("Failed to get volume id from global mount %s - %v", globalPath, err) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_dd.go b/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_dd.go index d8ca6886dd..a7f97ca59e 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_dd.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/azure_dd/azure_dd.go @@ -293,7 +293,7 @@ func (b *azureDiskMounter) SetUpAt(dir string, fsGroup *int64) error { } func makeGlobalPDPath(host volume.VolumeHost, volume string) string { - return path.Join(host.GetPluginDir(azureDataDiskPluginName), "mounts", volume) + return path.Join(host.GetPluginDir(azureDataDiskPluginName), mount.MountsInGlobalPDPath, volume) } func (azure *azureDisk) GetPath() string { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder.go b/vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder.go index 093cc04d87..41a4b146ed 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/cinder/cinder.go @@ -365,7 +365,7 @@ func (b *cinderVolumeMounter) SetUpAt(dir string, fsGroup *int64) error { } func makeGlobalPDName(host volume.VolumeHost, devName string) string { - return path.Join(host.GetPluginDir(cinderVolumePluginName), "mounts", devName) + return path.Join(host.GetPluginDir(cinderVolumePluginName), mount.MountsInGlobalPDPath, devName) } func (cd *cinderVolume) GetPath() string { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/gce_pd/gce_pd.go b/vendor/k8s.io/kubernetes/pkg/volume/gce_pd/gce_pd.go index d17543b1e8..b9fca2c265 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/gce_pd/gce_pd.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/gce_pd/gce_pd.go @@ -314,7 +314,7 @@ func (b *gcePersistentDiskMounter) SetUpAt(dir string, fsGroup *int64) error { } func makeGlobalPDName(host volume.VolumeHost, devName string) string { - return path.Join(host.GetPluginDir(gcePersistentDiskPluginName), "mounts", devName) + return path.Join(host.GetPluginDir(gcePersistentDiskPluginName), mount.MountsInGlobalPDPath, devName) } func (b *gcePersistentDiskMounter) GetPath() string { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/BUILD b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/BUILD index 274340e9e8..0250fb8dc3 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/BUILD @@ -29,7 +29,6 @@ go_library( "//pkg/util/strings:go_default_library", "//pkg/volume:go_default_library", "//pkg/volume/util:go_default_library", - "//pkg/volume/util/volumehelper:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/heketi/heketi/client/api/go-client", "//vendor:github.com/heketi/heketi/pkg/glusterfs/api", diff --git a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go index cd7ea371f8..bb2f49eb3d 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/glusterfs/glusterfs.go @@ -18,12 +18,9 @@ package glusterfs import ( "fmt" - "math/rand" "os" "path" - "strconv" dstrings "strings" - "time" "github.com/golang/glog" gcli "github.com/heketi/heketi/client/api/go-client" @@ -38,7 +35,6 @@ import ( "k8s.io/kubernetes/pkg/util/strings" "k8s.io/kubernetes/pkg/volume" volutil "k8s.io/kubernetes/pkg/volume/util" - "k8s.io/kubernetes/pkg/volume/util/volumehelper" "runtime" ) @@ -64,8 +60,6 @@ const ( volPrefix = "vol_" dynamicEpSvcPrefix = "glusterfs-dynamic-" replicaCount = 3 - gidMax = 600000 - gidMin = 2000 durabilityType = "replicate" secretKeyName = "key" // key name used in secret annGlusterURL = "glusterfs.kubernetes.io/url" @@ -487,8 +481,6 @@ func (d *glusterfsVolumeDeleter) Delete() error { func (r *glusterfsVolumeProvisioner) Provision() (*api.PersistentVolume, error) { var err error - var reqGid int64 - gidRandomizer := rand.New(rand.NewSource(time.Now().UnixNano())) if r.options.PVC.Spec.Selector != nil { glog.V(4).Infof("glusterfs: not able to parse your claim Selector") return nil, fmt.Errorf("glusterfs: not able to parse your claim Selector") @@ -500,9 +492,9 @@ func (r *glusterfsVolumeProvisioner) Provision() (*api.PersistentVolume, error) return nil, err } r.provisioningConfig = *cfg + glog.V(4).Infof("glusterfs: creating volume with configuration %+v", r.provisioningConfig) - reqGid = gidMin + gidRandomizer.Int63n(gidMax) - glusterfs, sizeGB, err := r.CreateVolume(reqGid) + glusterfs, sizeGB, err := r.CreateVolume() if err != nil { glog.Errorf("glusterfs: create volume err: %v.", err) return nil, fmt.Errorf("glusterfs: create volume err: %v.", err) @@ -514,15 +506,13 @@ func (r *glusterfsVolumeProvisioner) Provision() (*api.PersistentVolume, error) if len(pv.Spec.AccessModes) == 0 { pv.Spec.AccessModes = r.plugin.GetAccessModes() } - sGid := strconv.FormatInt(reqGid, 10) - pv.Annotations = map[string]string{volumehelper.VolumeGidAnnotationKey: sGid} pv.Spec.Capacity = api.ResourceList{ api.ResourceName(api.ResourceStorage): resource.MustParse(fmt.Sprintf("%dGi", sizeGB)), } return pv, nil } -func (p *glusterfsVolumeProvisioner) CreateVolume(reqGid int64) (r *api.GlusterfsVolumeSource, size int, err error) { +func (p *glusterfsVolumeProvisioner) CreateVolume() (r *api.GlusterfsVolumeSource, size int, err error) { capacity := p.options.PVC.Spec.Resources.Requests[api.ResourceName(api.ResourceStorage)] volSizeBytes := capacity.Value() sz := int(volume.RoundUpSize(volSizeBytes, 1024*1024*1024)) @@ -536,7 +526,7 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(reqGid int64) (r *api.Glusterf glog.Errorf("glusterfs: failed to create glusterfs rest client") return nil, 0, fmt.Errorf("failed to create glusterfs REST client, REST server authentication failed") } - volumeReq := &gapi.VolumeCreateRequest{Size: sz, Gid: reqGid, Durability: gapi.VolumeDurabilityInfo{Type: durabilityType, Replicate: gapi.ReplicaDurability{Replica: replicaCount}}} + volumeReq := &gapi.VolumeCreateRequest{Size: sz, Durability: gapi.VolumeDurabilityInfo{Type: durabilityType, Replicate: gapi.ReplicaDurability{Replica: replicaCount}}} volume, err := cli.VolumeCreate(volumeReq) if err != nil { glog.Errorf("glusterfs: error creating volume %v ", err) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/host_path/BUILD b/vendor/k8s.io/kubernetes/pkg/volume/host_path/BUILD index 7fc20f5d5a..f4ec83fad9 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/host_path/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/volume/host_path/BUILD @@ -19,6 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/conversion:go_default_library", "//pkg/types:go_default_library", "//pkg/util/uuid:go_default_library", "//pkg/volume:go_default_library", 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 cc14bcb3c6..cc2c5e1c0f 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 @@ -22,6 +22,7 @@ import ( "regexp" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/pkg/volume" @@ -244,7 +245,11 @@ func (r *hostPathRecycler) GetPath() string { // Recycle blocks until the pod has completed or any error occurs. // HostPath recycling only works in single node clusters and is meant for testing purposes only. func (r *hostPathRecycler) Recycle() error { - pod := r.config.RecyclerPodTemplate + templateClone, err := conversion.NewCloner().DeepCopy(r.config.RecyclerPodTemplate) + if err != nil { + return err + } + pod := templateClone.(*api.Pod) // overrides pod.Spec.ActiveDeadlineSeconds = &r.timeout pod.Spec.Volumes[0].VolumeSource = api.VolumeSource{ diff --git a/vendor/k8s.io/kubernetes/pkg/volume/nfs/BUILD b/vendor/k8s.io/kubernetes/pkg/volume/nfs/BUILD index a1b2b1d967..67e1e5c452 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/nfs/BUILD +++ b/vendor/k8s.io/kubernetes/pkg/volume/nfs/BUILD @@ -19,6 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/conversion:go_default_library", "//pkg/types:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/mount:go_default_library", diff --git a/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go b/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go index abacb8cb46..25d3cb58d7 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/nfs/nfs.go @@ -23,6 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" @@ -332,7 +333,11 @@ func (r *nfsRecycler) GetPath() string { // Recycle recycles/scrubs clean an NFS volume. // Recycle blocks until the pod has completed or any error occurs. func (r *nfsRecycler) Recycle() error { - pod := r.config.RecyclerPodTemplate + templateClone, err := conversion.NewCloner().DeepCopy(r.config.RecyclerPodTemplate) + if err != nil { + return err + } + pod := templateClone.(*api.Pod) // overrides pod.Spec.ActiveDeadlineSeconds = &r.timeout pod.GenerateName = "pv-recycler-nfs-" diff --git a/vendor/k8s.io/kubernetes/pkg/volume/photon_pd/photon_pd.go b/vendor/k8s.io/kubernetes/pkg/volume/photon_pd/photon_pd.go index 809498750e..05fd3c2c29 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/photon_pd/photon_pd.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/photon_pd/photon_pd.go @@ -119,12 +119,19 @@ func (plugin *photonPersistentDiskPlugin) newUnmounterInternal(volName string, p }}, nil } -func (plugin *photonPersistentDiskPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) { +func (plugin *photonPersistentDiskPlugin) ConstructVolumeSpec(volumeSpecName, mountPath string) (*volume.Spec, error) { + mounter := plugin.host.GetMounter() + pluginDir := plugin.host.GetPluginDir(plugin.GetPluginName()) + pdID, err := mounter.GetDeviceNameFromMount(mountPath, pluginDir) + if err != nil { + return nil, err + } + photonPersistentDisk := &api.Volume{ - Name: volumeName, + Name: volumeSpecName, VolumeSource: api.VolumeSource{ PhotonPersistentDisk: &api.PhotonPersistentDiskVolumeSource{ - PdID: volumeName, + PdID: pdID, }, }, } @@ -283,7 +290,7 @@ func (c *photonPersistentDiskUnmounter) TearDownAt(dir string) error { } func makeGlobalPDPath(host volume.VolumeHost, devName string) string { - return path.Join(host.GetPluginDir(photonPersistentDiskPluginName), "mounts", devName) + return path.Join(host.GetPluginDir(photonPersistentDiskPluginName), mount.MountsInGlobalPDPath, devName) } func (ppd *photonPersistentDisk) GetPath() string { diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util.go index a5ff196114..0438772933 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util.go @@ -83,7 +83,12 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *api.P return fmt.Errorf("unexpected error creating recycler pod: %+v\n", err) } } - defer recyclerClient.DeletePod(pod.Name, pod.Namespace) + defer func(pod *api.Pod) { + glog.V(2).Infof("deleting recycler pod %s/%s", pod.Namespace, pod.Name) + if err := recyclerClient.DeletePod(pod.Name, pod.Namespace); err != nil { + glog.Errorf("failed to delete recycler pod %s/%s: %v", pod.Namespace, pod.Name, err) + } + }(pod) // 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 diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go index 15c425cbfd..ea00d6f606 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/operationexecutor/operation_executor.go @@ -22,6 +22,7 @@ package operationexecutor import ( "fmt" + "strings" "time" "github.com/golang/glog" @@ -1053,7 +1054,8 @@ func (oe *operationExecutor) generateUnmountDeviceFunc( err) } refs, err := attachableVolumePlugin.GetDeviceMountRefs(deviceMountPath) - if err != nil || len(refs) > 0 { + + if err != nil || hasMountRefs(deviceMountPath, refs) { if err == nil { err = fmt.Errorf("The device mount path %q is still mounted by other references %v", deviceMountPath, refs) } @@ -1124,6 +1126,24 @@ func (oe *operationExecutor) generateUnmountDeviceFunc( }, nil } +// TODO: this is a workaround for the unmount device issue caused by gci mounter. +// In GCI cluster, if gci mounter is used for mounting, the container started by mounter +// script will cause additional mounts created in the container. Since these mounts are +// irrelavant to the original mounts, they should be not considered when checking the +// mount references. Current solution is to filter out those mount paths that contain +// the string of original mount path. +// Plan to work on better approach to solve this issue. + +func hasMountRefs(mountPath string, mountRefs []string) bool { + count := 0 + for _, ref := range mountRefs { + if !strings.Contains(ref, mountPath) { + count = count + 1 + } + } + return count > 0 +} + func (oe *operationExecutor) generateVerifyControllerAttachedVolumeFunc( volumeToMount VolumeToMount, nodeName types.NodeName, diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go index 8b67c5d2f7..8122e04dd6 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go @@ -94,7 +94,7 @@ func UnmountPath(mountPath string, mounter mount.Interface) error { return err } if notMnt { - glog.V(4).Info("%q is unmounted, deleting the directory", mountPath) + glog.V(4).Infof("%q is unmounted, deleting the directory", mountPath) return os.Remove(mountPath) } return nil diff --git a/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go b/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go index 1391e62256..d82c776724 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/volume_linux.go @@ -51,6 +51,17 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error { return err } + // chown and chmod pass through to the underlying file for symlinks. + // Symlinks have a mode of 777 but this really doesn't mean anything. + // The permissions of the underlying file are what matter. + // However, if one reads the mode of a symlink then chmods the symlink + // with that mode, it changes the mode of the underlying file, overridden + // the defaultMode and permissions initialized by the volume plugin, which + // is not what we want; thus, we skip chown/chmod for symlinks. + if info.Mode()&os.ModeSymlink != 0 { + return nil + } + stat, ok := info.Sys().(*syscall.Stat_t) if !ok { return nil diff --git a/vendor/k8s.io/kubernetes/pkg/volume/vsphere_volume/vsphere_volume.go b/vendor/k8s.io/kubernetes/pkg/volume/vsphere_volume/vsphere_volume.go index d2dd86a1a4..218b022780 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/vsphere_volume/vsphere_volume.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/vsphere_volume/vsphere_volume.go @@ -276,7 +276,7 @@ func (v *vsphereVolumeUnmounter) TearDownAt(dir string) error { } func makeGlobalPDPath(host volume.VolumeHost, devName string) string { - return path.Join(host.GetPluginDir(vsphereVolumePluginName), "mounts", devName) + return path.Join(host.GetPluginDir(vsphereVolumePluginName), mount.MountsInGlobalPDPath, devName) } func (vv *vsphereVolume) GetPath() string { diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/client/auth/gcp/gcp.go b/vendor/k8s.io/kubernetes/plugin/pkg/client/auth/gcp/gcp.go index df5c623f94..8b52a27a19 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/client/auth/gcp/gcp.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/client/auth/gcp/gcp.go @@ -41,6 +41,48 @@ func init() { } } +// gcpAuthProvider is an auth provider plugin that uses GCP credentials to provide +// tokens for kubectl to authenticate itself to the apiserver. A sample json config +// is provided below with all recognized options described. +// +// { +// 'auth-provider': { +// # Required +// "name": "gcp", +// +// 'config': { +// # Caching options +// +// # Raw string data representing cached access token. +// "access-token": "ya29.CjWdA4GiBPTt", +// # RFC3339Nano expiration timestamp for cached access token. +// "expiry": "2016-10-31 22:31:9.123", +// +// # Command execution options +// # These options direct the plugin to execute a specified command and parse +// # token and expiry time from the output of the command. +// +// # Command to execute for access token. String is split on whitespace +// # with first field treated as the executable, remaining fields as args. +// # Command output will be parsed as JSON. +// "cmd-path": "/usr/bin/gcloud config config-helper --output=json", +// +// # JSONPath to the string field that represents the access token in +// # command output. If omitted, defaults to "{.access_token}". +// "token-key": "{.credential.access_token}", +// +// # JSONPath to the string field that represents expiration timestamp +// # of the access token in the command output. If omitted, defaults to +// # "{.token_expiry}" +// "expiry-key": ""{.credential.token_expiry}", +// +// # golang reference time in the format that the expiration timestamp uses. +// # If omitted, defaults to time.RFC3339Nano +// "time-fmt": "2006-01-02 15:04:05.999999999" +// } +// } +// } +// type gcpAuthProvider struct { tokenSource oauth2.TokenSource persister restclient.AuthProviderConfigPersister 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 a7b5169d20..e57afcceba 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 @@ -721,7 +721,7 @@ func NewServiceAffinityPredicate(podLister algorithm.PodLister, serviceLister al // The pod has all information necessary to check affinity, the pod's label selector is sufficient to calculate // the match. // Otherwise: -// Create an "implicit selector" which gaurantees pods will land on nodes with similar values +// Create an "implicit selector" which guarantees pods will land on nodes with similar values // for the affinity labels. // // To do this, we "reverse engineer" a selector by introspecting existing pods running under the same service+namespace. @@ -730,8 +730,8 @@ func NewServiceAffinityPredicate(podLister algorithm.PodLister, serviceLister al // - L is not defined in the pod itself already. // - and SOME pod, from a service, in the same namespace, ALREADY scheduled onto a node, has a matching value. // -// WARNING: This Predicate is NOT gauranteed to work if some of the predicateMetadata data isn't precomputed... -// For that reason it is not exported, i.e. it is highlhy coupled to the implementation of the FitPredicate construction. +// WARNING: This Predicate is NOT guaranteed to work if some of the predicateMetadata data isn't precomputed... +// For that reason it is not exported, i.e. it is highly coupled to the implementation of the FitPredicate construction. func (s *ServiceAffinity) checkServiceAffinity(pod *api.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []algorithm.PredicateFailureReason, error) { var services []*api.Service var pods []*api.Pod @@ -1087,7 +1087,7 @@ func (c *PodAffinityChecker) satisfiesPodsAffinityAntiAffinity(pod *api.Pod, nod return false } if !termMatches { - // If the requirement matches a pod's own labels ane namespace, and there are + // If the requirement matches a pod's own labels are namespace, and there are // no other such pods, then disregard the requirement. This is necessary to // not block forever because the first pod of the collection can't be scheduled. match, err := priorityutil.PodMatchesTermsNamespaceAndSelector(pod, pod, &term) @@ -1192,7 +1192,7 @@ func CheckNodeMemoryPressurePredicate(pod *api.Pod, meta interface{}, nodeInfo * return true, nil, nil } - // is node under presure? + // is node under pressure? for _, cond := range node.Status.Conditions { if cond.Type == api.NodeMemoryPressure && cond.Status == api.ConditionTrue { return false, []algorithm.PredicateFailureReason{ErrNodeUnderMemoryPressure}, nil @@ -1210,7 +1210,7 @@ func CheckNodeDiskPressurePredicate(pod *api.Pod, meta interface{}, nodeInfo *sc return false, nil, fmt.Errorf("node not found") } - // is node under presure? + // is node under pressure? for _, cond := range node.Status.Conditions { if cond.Type == api.NodeDiskPressure && cond.Status == api.ConditionTrue { return false, []algorithm.PredicateFailureReason{ErrNodeUnderDiskPressure}, nil 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 3f004682c1..23fd57f274 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/factory/factory.go @@ -507,22 +507,15 @@ func getNodeConditionPredicate() cache.NodeConditionPredicate { // - NodeReady condition status is ConditionTrue, // - NodeOutOfDisk condition status is ConditionFalse, // - NodeNetworkUnavailable condition status is ConditionFalse. - switch cond.Type { - case api.NodeReady: - if cond.Status != api.ConditionTrue { - glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) - return false - } - - case api.NodeMemoryPressure, api.NodeDiskPressure: - // We don't block on "pressure" conditions; these are warnings, not errors! - - default: - // We assume everything else is blocking if the condition is True or Unknown - if cond.Status != api.ConditionFalse { - glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) - return false - } + if cond.Type == api.NodeReady && cond.Status != api.ConditionTrue { + glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) + return false + } else if cond.Type == api.NodeOutOfDisk && cond.Status != api.ConditionFalse { + glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) + return false + } else if cond.Type == api.NodeNetworkUnavailable && cond.Status != api.ConditionFalse { + glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) + return false } } // Ignore nodes that are marked unschedulable diff --git a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler.go b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler.go index d5b8cc0a91..690064f0ea 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/scheduler.go @@ -114,6 +114,13 @@ func (s *Scheduler) scheduleOne() { assumed.Spec.NodeName = dest if err := s.config.SchedulerCache.AssumePod(&assumed); err != nil { glog.Errorf("scheduler cache AssumePod failed: %v", err) + // TODO: This means that a given pod is already in cache (which means it + // is either assumed or already added). This is most probably result of a + // BUG in retrying logic. As a temporary workaround (which doesn't fully + // fix the problem, but should reduce its impact), we simply return here, + // as binding doesn't make sense anyway. + // This should be fixed properly though. + return } go func() { 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 985f9ed0f7..a7e9c2b020 100644 --- a/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go +++ b/vendor/k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache/cache.go @@ -110,15 +110,15 @@ func (cache *schedulerCache) AssumePod(pod *api.Pod) error { // assumePod exists for making test deterministic by taking time as input argument. func (cache *schedulerCache) assumePod(pod *api.Pod, now time.Time) error { - cache.mu.Lock() - defer cache.mu.Unlock() - key, err := getPodKey(pod) if err != nil { return err } + + cache.mu.Lock() + defer cache.mu.Unlock() if _, ok := cache.podStates[key]; ok { - return fmt.Errorf("pod state wasn't initial but get assumed. Pod key: %v", key) + return fmt.Errorf("pod %v state wasn't initial but get assumed", key) } cache.addPod(pod) @@ -141,7 +141,11 @@ func (cache *schedulerCache) ForgetPod(pod *api.Pod) error { cache.mu.Lock() defer cache.mu.Unlock() - _, ok := cache.podStates[key] + currState, ok := cache.podStates[key] + if currState.pod.Spec.NodeName != pod.Spec.NodeName { + return fmt.Errorf("pod %v state was assumed on a different node", key) + } + switch { // Only assumed pod can be forgotten. case ok && cache.assumedPods[key]: @@ -152,7 +156,38 @@ func (cache *schedulerCache) ForgetPod(pod *api.Pod) error { delete(cache.assumedPods, key) delete(cache.podStates, key) default: - return fmt.Errorf("pod state wasn't assumed but get forgotten. Pod key: %v", key) + return fmt.Errorf("pod %v state wasn't assumed but get forgotten", key) + } + return nil +} + +// Assumes that lock is already acquired. +func (cache *schedulerCache) addPod(pod *api.Pod) { + n, ok := cache.nodes[pod.Spec.NodeName] + if !ok { + n = NewNodeInfo() + cache.nodes[pod.Spec.NodeName] = n + } + n.addPod(pod) +} + +// Assumes that lock is already acquired. +func (cache *schedulerCache) updatePod(oldPod, newPod *api.Pod) error { + if err := cache.removePod(oldPod); err != nil { + return err + } + cache.addPod(newPod) + return nil +} + +// Assumes that lock is already acquired. +func (cache *schedulerCache) removePod(pod *api.Pod) error { + n := cache.nodes[pod.Spec.NodeName] + if err := n.removePod(pod); err != nil { + return err + } + if len(n.pods) == 0 && n.node == nil { + delete(cache.nodes, pod.Spec.NodeName) } return nil } @@ -166,9 +201,16 @@ func (cache *schedulerCache) AddPod(pod *api.Pod) error { cache.mu.Lock() defer cache.mu.Unlock() - _, ok := cache.podStates[key] + currState, ok := cache.podStates[key] switch { case ok && cache.assumedPods[key]: + if currState.pod.Spec.NodeName != pod.Spec.NodeName { + // The pod was added to a different node than it was assumed to. + glog.Warningf("Pod %v assumed to a different node than added to.", key) + // Clean this up. + cache.removePod(currState.pod) + cache.addPod(pod) + } delete(cache.assumedPods, key) cache.podStates[key].deadline = nil case !ok: @@ -193,44 +235,20 @@ func (cache *schedulerCache) UpdatePod(oldPod, newPod *api.Pod) error { cache.mu.Lock() defer cache.mu.Unlock() - _, ok := cache.podStates[key] + currState, ok := cache.podStates[key] switch { // An assumed pod won't have Update/Remove event. It needs to have Add event // before Update event, in which case the state would change from Assumed to Added. case ok && !cache.assumedPods[key]: + if currState.pod.Spec.NodeName != newPod.Spec.NodeName { + glog.Errorf("Pod %v updated on a different node than previously added to.", key) + glog.Fatalf("Schedulercache is corrupted and can badly affect scheduling decisions") + } if err := cache.updatePod(oldPod, newPod); err != nil { return err } default: - return fmt.Errorf("pod state wasn't added but get updated. Pod key: %v", key) - } - return nil -} - -func (cache *schedulerCache) updatePod(oldPod, newPod *api.Pod) error { - if err := cache.removePod(oldPod); err != nil { - return err - } - cache.addPod(newPod) - return nil -} - -func (cache *schedulerCache) addPod(pod *api.Pod) { - n, ok := cache.nodes[pod.Spec.NodeName] - if !ok { - n = NewNodeInfo() - cache.nodes[pod.Spec.NodeName] = n - } - n.addPod(pod) -} - -func (cache *schedulerCache) removePod(pod *api.Pod) error { - n := cache.nodes[pod.Spec.NodeName] - if err := n.removePod(pod); err != nil { - return err - } - if len(n.pods) == 0 && n.node == nil { - delete(cache.nodes, pod.Spec.NodeName) + return fmt.Errorf("pod %v state wasn't added but get updated", key) } return nil } @@ -244,12 +262,16 @@ func (cache *schedulerCache) RemovePod(pod *api.Pod) error { cache.mu.Lock() defer cache.mu.Unlock() - cachedstate, ok := cache.podStates[key] + currState, 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(cachedstate.pod) + if currState.pod.Spec.NodeName != pod.Spec.NodeName { + glog.Errorf("Pod %v removed from a different node than previously added to.", key) + glog.Fatalf("Schedulercache is corrupted and can badly affect scheduling decisions") + } + err := cache.removePod(currState.pod) if err != nil { return err }