Merge pull request #60098 from dashpole/fix_localstorage_eviction

Automatic merge from submit-queue (batch tested with PRs 59934, 60098, 60103, 60104, 60109). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix running with no eviction thresholds **What this PR does / why we need it**: After https://github.com/kubernetes/kubernetes/pull/57802, [LocalStorageCapacityIsolationEviction tests](https://k8s-testgrid.appspot.com/sig-node-kubelet#kubelet-serial-gce-e2e&include-filter-by-regex=LocalStorageCapacityIsolationEviction) started failing. They failed because the eviction manager was not running its synchronization loops when we have no thresholds. We should still perform the eviction manager synchronization loop even when we have no thresholds if the LocalStorageCapacityIsolation feature gate is enabled. The reason we didn't see this before is that we added a threshold for node allocatable even when there was no corresponding eviction threshold. https://github.com/kubernetes/kubernetes/pull/57802 changed this to only add a memory allocatable threshold when we have a memory eviction threshold specified. **Release note**: ```release-note NONE ``` /kind bug /priority critical-urgent /sig node /assign @Random-Liu cc @kubernetes/sig-node-test-failures

Merge pull request #60098 from dashpole/fix_localstorage_eviction
36f824b6 · Kubernetes Submit Queue · GitHub · 237007b6 · a5511982 · 36f824b6
Unverified Commit 36f824b6 authored Feb 20, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

eviction_manager.go pkg/kubelet/eviction/eviction_manager.go +1 -1

No files found.
--- a/pkg/kubelet/eviction/eviction_manager.go
+++ b/pkg/kubelet/eviction/eviction_manager.go
@@ -222,7 +222,7 @@ func startMemoryThresholdNotifier(thresholds []evictionapi.Threshold, observatio
 func (m *managerImpl) synchronize(diskInfoProvider DiskInfoProvider, podFunc ActivePodsFunc) []*v1.Pod {
 	// if we have nothing to do, just return
 	thresholds := m.config.Thresholds
-	if len(thresholds) == 0 {
+	if len(thresholds) == 0 && !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) {
 		return nil
 	}