From 72cc9cb7c1b107181bbef243b21e77e1ae769bd0 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Wed, 1 Apr 2020 16:36:08 -0700 Subject: [PATCH] fix v1.19 unit test --- .../testdata/v1.19/containerd-api-port.yaml | 18 ++++++++++++++++++ .../v1.19/containerd-pod-network-cidr.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.19/containerd.yaml | 18 ++++++++++++++++++ .../testdata/v1.19/crio-options-gates.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.19/crio.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.19/default.yaml | 2 +- .../bsutil/testdata/v1.19/dns.yaml | 18 ++++++++++++++++++ .../testdata/v1.19/image-repository.yaml | 18 ++++++++++++++++++ .../bsutil/testdata/v1.19/options.yaml | 18 ++++++++++++++++++ 9 files changed, 145 insertions(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml index c04d7a5011..156508326d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml index 980c7e94e7..68c5c7a1f8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml index 0e28179d6b..04c98cb4bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml index 326f80a61d..e9b2694f82 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index 72ea86b7bc..86c2c246ac 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml index d7aff011a4..d5e503b35b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml index b06f44e6b6..442896f730 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml index 7d8f48ca3d..5c5f4d434e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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.19/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml index 0adff142eb..99a3710185 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/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