From 44e73384894581b87ef216e94fd27818694fd1bf Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 1 Apr 2020 15:28:44 -0700 Subject: [PATCH] fix some unit tests --- .../bootstrapper/bsutil/ktmpl/v1alpha3.go | 13 ++++++++++--- .../bootstrapper/bsutil/ktmpl/v1beta1.go | 2 +- .../bootstrapper/bsutil/ktmpl/v1beta2.go | 2 +- .../bsutil/testdata/v1.12/default.yaml | 13 ++++++++++--- .../bsutil/testdata/v1.13/default.yaml | 13 ++++++++++--- .../bsutil/testdata/v1.14/default.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.15/default.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.16/default.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.17/default.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.18/default.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.19/default.yaml | 18 ++++++++++++++++++ 11 files changed, 116 insertions(+), 23 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go index 4c534c161..8e0f9cd81 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1alpha3.go @@ -64,8 +64,15 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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%" `)) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go index 077544bb4..8fcb2cff9 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go @@ -73,7 +73,7 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -imageGCHighThresholdPercent: 70 +imageGCHighThresholdPercent: 85 evictionSoft: memory.available: "300mb" nodefs.available: "30%" diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 884444ecd..bb853da62 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -71,7 +71,7 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -imageGCHighThresholdPercent: 70 +imageGCHighThresholdPercent: 85 evictionSoft: memory.available: "300mb" nodefs.available: "30%" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml index 3c8b8b41a..d0c6be5d5 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.12/default.yaml @@ -36,7 +36,14 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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%" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml index 25d166e0d..0d90c7e43 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.13/default.yaml @@ -36,7 +36,14 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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%" \ No newline at end of file diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index 746eb9fb7..1f4b0b667 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -41,11 +41,17 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -imageGCHighThresholdPercent: 100 +imageGCHighThresholdPercent: 85 +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/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index d68ef1b1f..d4c88935d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -41,11 +41,17 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -imageGCHighThresholdPercent: 100 +imageGCHighThresholdPercent: 85 +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/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index 765a4b239..59f837c7e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -41,11 +41,17 @@ networking: --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -imageGCHighThresholdPercent: 100 +imageGCHighThresholdPercent: 85 +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/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 7651466f8..87d1907bf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -36,3 +36,21 @@ networking: dnsDomain: cluster.local podSubnet: "" serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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 \ No newline at end of file diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 6e3eefc76..400cada68 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -36,3 +36,21 @@ networking: dnsDomain: cluster.local podSubnet: "" serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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 \ No newline at end of file diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index aa884e40d..d7aff011a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -36,3 +36,21 @@ networking: dnsDomain: cluster.local podSubnet: "" serviceSubnet: 10.96.0.0/12 +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +imageGCHighThresholdPercent: 85 +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 \ No newline at end of file -- GitLab