From aeccffc3396b9207d0ebfbc99ad33fe3d1f095a5 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Sat, 26 May 2018 19:41:18 -0400 Subject: [PATCH] Phase out rescheduler in favor of priority and preemption --- build/lib/release.sh | 1 - .../fluentd-es-configmap.yaml | 15 -- .../fluentd-gcp-configmap-old.yaml | 14 -- .../fluentd-gcp/fluentd-gcp-configmap.yaml | 14 -- cluster/gce/config-default.sh | 3 - cluster/gce/config-test.sh | 3 - cluster/gce/gci/configure-helper.sh | 11 -- cluster/gce/manifests/kube-proxy.manifest | 3 +- cluster/gce/manifests/rescheduler.manifest | 36 ----- cluster/gce/util.sh | 1 - cluster/log-dump/log-dump.sh | 2 +- pkg/kubelet/types/pod_update.go | 2 +- .../equivalence_cache_predicates.go | 4 + test/e2e/scheduling/rescheduler.go | 133 ------------------ 14 files changed, 7 insertions(+), 235 deletions(-) delete mode 100644 cluster/gce/manifests/rescheduler.manifest delete mode 100644 test/e2e/scheduling/rescheduler.go diff --git a/build/lib/release.sh b/build/lib/release.sh index aaec30f52e0..46e143e31d2 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -387,7 +387,6 @@ function kube::release::package_kube_manifests_tarball() { cp "${src_dir}/kube-controller-manager.manifest" "${dst_dir}" cp "${src_dir}/kube-addon-manager.yaml" "${dst_dir}" cp "${src_dir}/glbc.manifest" "${dst_dir}" - cp "${src_dir}/rescheduler.manifest" "${dst_dir}/" cp "${src_dir}/e2e-image-puller.manifest" "${dst_dir}/" cp "${src_dir}/etcd-empty-dir-cleanup.yaml" "${dst_dir}/" cp "${KUBE_ROOT}/cluster/gce/gci/configure-helper.sh" "${dst_dir}/gci-configure-helper.sh" diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml index 5b861084da0..7dd846248d8 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml @@ -273,21 +273,6 @@ data: tag kube-scheduler - # Example: - # I1104 10:36:20.242766 5 rescheduler.go:73] Running Rescheduler - - @id rescheduler.log - @type tail - format multiline - multiline_flush_interval 5s - format_firstline /^\w\d{4}/ - format1 /^(?\w)(?