UPSTREAM: 53069: Align imagefs eviction defaults with image gc defaults

openshift · Sep 26, 2017 · 19851cd · 19851cd
1 parent 4be6729
commit 19851cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cmd/server/kubernetes/node/node_config_test.go b/pkg/cmd/server/kubernetes/node/node_config_test.go
@@ -72,7 +72,7 @@ func TestKubeletDefaults(t *testing.T) {
 			EnableCustomMetrics:            false,
 			EnableDebuggingHandlers:        true,
 			EnableServer:                   true,
-			EvictionHard:                   "memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%",
+			EvictionHard:                   "memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<15%",
 			FileCheckFrequency:             metav1.Duration{Duration: 20 * time.Second}, // overridden
 			HealthzBindAddress:             "127.0.0.1",                                 // disabled
 			HealthzPort:                    10248,                                       // disabled

diff --git a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go