From d4853b0d9d112c724bcf4ed60034021865dea036 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 1 Apr 2020 16:24:37 -0700 Subject: [PATCH] fix v1.15 unit tests --- .../bsutil/testdata/v1.15/containerd-api-port.yaml | 14 ++++++++++---- .../v1.15/containerd-pod-network-cidr.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.15/containerd.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.15/crio-options-gates.yaml | 14 ++++++++++---- .../bootstrapper/bsutil/testdata/v1.15/crio.yaml | 14 ++++++++++---- .../bootstrapper/bsutil/testdata/v1.15/dns.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.15/image-repository.yaml | 14 ++++++++++---- .../bsutil/testdata/v1.15/options.yaml | 14 ++++++++++---- 8 files changed, 80 insertions(+), 32 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml index 4e6bbead95..dbff89902e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-api-port.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/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml index 9a9a5c60f6..14b9a1e957 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd-pod-network-cidr.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/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index cacacc7e43..636ef0fa92 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.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/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml index c78edc0119..999c234227 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio-options-gates.yaml @@ -51,11 +51,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/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index 47db96b5c2..42a7f5e44e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.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/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 1e79a74a1c..801ffbe402 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.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/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml index f11df32d8b..7230fb8108 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -42,11 +42,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/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index d277ac59e6..8911e2eead 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -48,11 +48,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