From 7af6adfefda8426d8f8882a79a725d75d5eb3b86 Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Wed, 1 Apr 2020 14:48:43 -0700
Subject: [PATCH] adjust eviction hard and soft for both v1beta1 and v1beta2

---
 .../bootstrapper/bsutil/ktmpl/v1beta1.go      | 14 +++++---
 .../bootstrapper/bsutil/ktmpl/v1beta2.go      | 33 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
index 1aca76201a..af861f03cc 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
@@ -73,11 +73,17 @@ networking:
 ---
 apiVersion: kubelet.config.k8s.io/v1beta1
 kind: KubeletConfiguration
-imageGCHighThresholdPercent: 100
+imageGCHighThresholdPercent: 70
+EvictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
 evictionHard:
-  nodefs.available: "0%"
-  nodefs.inodesFree: "0%"
-  imagefs.available: "0%"
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
index 50f8147d6f..dc10358dae 100644
--- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
+++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
@@ -68,4 +68,35 @@ networking:
   dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
   podSubnet: "{{.PodSubnet }}"
   serviceSubnet: {{.ServiceCIDR}}
-`))
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 70
+EvictionSoft
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"  
+---
+apiVersion: kubelet.config.k8s.io/v1beta1
+kind: KubeletConfiguration
+imageGCHighThresholdPercent: 70
+EvictionSoft:
+  memory.available: "300mb"
+  nodefs.available: "30%"
+  nodefs.inodesFree: "20%"
+  imagefs.available: "30%"
+evictionHard:
+  memory.available: "100mb"
+  nodefs.available: "10%"
+  nodefs.inodesFree: "5%"
+  imagefs.available: "10%"
+---
+apiVersion: kubeproxy.config.k8s.io/v1alpha1
+kind: KubeProxyConfiguration
+metricsBindAddress: {{.AdvertiseAddress}}:10249
+  `))