From a11177d498dce796ff1c6cf0a7dee7de2880244e Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 28 Sep 2017 08:56:47 -0500 Subject: [PATCH 1/2] UPSTREAM: 53069: Align imagefs eviction defaults with image gc defaults --- .../kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7d02dff118f3..a4f925d6b4f6 100644 --- a/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/vendor/k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -370,7 +370,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.HairpinMode = PromiscuousBridge } if obj.EvictionHard == nil { - temp := "memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%" + temp := "memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<15%" obj.EvictionHard = &temp } if obj.EvictionPressureTransitionPeriod == zeroDuration { From 243298a4e8f64bb51df9df489d40fdd142f9edcb Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 28 Sep 2017 08:57:27 -0500 Subject: [PATCH 2/2] fix up image gc settings in defaults tests --- pkg/cmd/server/kubernetes/node/node_config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/server/kubernetes/node/node_config_test.go b/pkg/cmd/server/kubernetes/node/node_config_test.go index fbabf91b577b..69e711c8bc4b 100644 --- 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