From 8bcda5c7ee8b7f0eee75cfa4f8d25bf0a7f09805 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 1 Apr 2020 16:33:27 -0700 Subject: [PATCH] fix v1.18 unit test --- .../testdata/v1.18/containerd-api-port.yaml | 18 ++++++++++++++++++ .../v1.18/containerd-pod-network-cidr.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.18/containerd.yaml | 18 ++++++++++++++++++ .../testdata/v1.18/crio-options-gates.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.18/crio.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.18/default.yaml | 2 +- .../bsutil/testdata/v1.18/dns.yaml | 18 ++++++++++++++++++ .../testdata/v1.18/image-repository.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.18/options.yaml | 18 ++++++++++++++++++ 9 files changed, 145 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml index 4360299921..df3764a44a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-api-port.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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml index d714225d46..f95cafe800 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml @@ -36,3 +36,21 @@ networking: dnsDomain: cluster.local podSubnet: "192.168.32.0/20" 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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml index 64161c1b0a..d40f594d57 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml index 66dfb8c7ea..59c2b12bdf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio-options-gates.yaml @@ -46,3 +46,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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 862711d0c9..dbee9b84bd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml index 400cada689..176ea4808f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -53,4 +53,4 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -metricsBindAddress: {{.AdvertiseAddress}}:10249 \ No newline at end of file +metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml index c463026f5f..a2be08e577 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -36,3 +36,21 @@ networking: dnsDomain: 1.1.1.1 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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml index 55ca1f3421..760e9f5ff0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -37,3 +37,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: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml index 9049b3f987..3b0ff6bac3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -43,3 +43,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: 1.1.1.1:10249