From b14db3a0b9eb5b83ddf73765eb502421c690c0e8 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Wed, 4 Mar 2020 01:56:36 -0300 Subject: [PATCH 01/13] add component configs for kubeadm v1beta2 Signed-off-by: Pierre Ugaz --- pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 095a5d3c75..bee9b4aa2b 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -69,4 +69,16 @@ networking: dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}} podSubnet: "{{.PodSubnet }}" serviceSubnet: {{.ServiceCIDR}} +--- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +--- +apiVersion: kubeproxy.config.k8s.io/v1alpha1 +kind: KubeProxyConfiguration +metricsBindAddress: {{.AdvertiseAddress}}:10249 `)) From 39b0c7935e3b9f2376c8ecd6b1e5a44e23c96ab1 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Wed, 4 Mar 2020 01:58:22 -0300 Subject: [PATCH 02/13] add kubeproxy for components validation Signed-off-by: Pierre Ugaz --- pkg/minikube/bootstrapper/bsutil/extraconfig.go | 1 + pkg/minikube/bootstrapper/bsutil/kubeadm.go | 1 + pkg/minikube/bootstrapper/bsutil/kubeadm_test.go | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 94851f6892..387b4a0302 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -50,6 +50,7 @@ var componentToKubeadmConfigKey = map[string]string{ ControllerManager: "controllerManager", Scheduler: "scheduler", Kubeadm: "kubeadm", + Kubeproxy: "kubeProxy", // The Kubelet is not configured in kubeadm, only in systemd. Kubelet: "", } diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 483ee06428..7c3a36899c 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -136,6 +136,7 @@ const ( Apiserver = "apiserver" Scheduler = "scheduler" ControllerManager = "controller-manager" + Kubeproxy = "kube-proxy" ) // InvokeKubeadm returns the invocation command for Kubeadm diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go index 4c366bd96b..ef87c48e99 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go @@ -55,6 +55,11 @@ func getExtraOpts() []config.ExtraOption { Key: "dry-run", Value: "true", }, + config.ExtraOption{ + Component: Kubeproxy, + Key: "proxy-mode", + Value: "iptables", + }, } } From f16d9f7515825605c08f002116b9ab1c00ef3d07 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Wed, 4 Mar 2020 01:58:38 -0300 Subject: [PATCH 03/13] update flags description Signed-off-by: Pierre Ugaz --- cmd/minikube/cmd/start.go | 2 +- site/content/en/docs/Reference/Commands/start.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index cd15bbeea9..80cee3652d 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -177,7 +177,7 @@ func initKubernetesFlags() { startCmd.Flags().Var(&node.ExtraOptions, "extra-config", `A set of key=value pairs that describe configuration that may be passed to different components. The key should be '.' separated, and the first part before the dot is the component to apply the configuration to. - Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler + Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, kube-proxy, scheduler Valid kubeadm parameters: `+fmt.Sprintf("%s, %s", strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmCmdParam], ", "), strings.Join(bsutil.KubeadmExtraArgsWhitelist[bsutil.KubeadmConfigParam], ","))) startCmd.Flags().String(featureGates, "", "A set of key=value pairs that describe feature gates for alpha/experimental features.") startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster") diff --git a/site/content/en/docs/Reference/Commands/start.md b/site/content/en/docs/Reference/Commands/start.md index 8c9bc178f8..11310102df 100644 --- a/site/content/en/docs/Reference/Commands/start.md +++ b/site/content/en/docs/Reference/Commands/start.md @@ -40,7 +40,7 @@ minikube start [flags] The key should be '.' separated, and the first part before the dot is the component to apply the configuration to. - Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler + Valid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, kube-proxy, scheduler Valid kubeadm parameters: ignore-preflight-errors, dry-run, kubeconfig, kubeconfig-dir, node-name, cri-socket, experimental-upload-certs, certificate-key, rootfs, pod-network-cidr From 986af1ae87008e21ed2f6062df99ab92a4747f30 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 17:25:11 -0400 Subject: [PATCH 04/13] add: mode for kubeproxy Signed-off-by: Pierre Ugaz --- .../bootstrapper/bsutil/extraconfig.go | 3 ++- .../bootstrapper/bsutil/ktmpl/v1beta2.go | 27 ++++++++++++------- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 3 +++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 637c7f8a2a..5e5c3f657d 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -50,7 +50,8 @@ var componentToKubeadmConfigKey = map[string]string{ ControllerManager: "controllerManager", Scheduler: "scheduler", Kubeadm: "kubeadm", - Kubeproxy: "kubeProxy", + // The KubeProxy is handled in different config block + Kubeproxy: "", // The Kubelet is not configured in kubeadm, only in systemd. Kubelet: "", } diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index 8655dfa7df..fd2ba56093 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -69,16 +69,25 @@ networking: podSubnet: "{{.PodSubnet }}" serviceSubnet: {{.ServiceCIDR}} --- -apiVersion: kubelet.config.k8s.io/v1beta1 -kind: KubeletConfiguration -# disable disk resource management by default -imageGCHighThresholdPercent: 100 -evictionHard: - nodefs.available: "0%" - nodefs.inodesFree: "0%" - imagefs.available: "0%" ---- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "{{.PodSubnet }}" +enableProfiling: false +{{if eq .KubeProxyMode "iptables" -}} +iptables: + masqueradeAll: false + masqueradeBit: null + minSyncPeriod: 0s + syncPeriod: 0s +{{else if eq .KubeProxyMode "ipvs" -}} +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +{{end -}} metricsBindAddress: {{.AdvertiseAddress}}:10249 +{{if .KubeProxyMode}}mode: {{.KubeProxyMode}}{{end}} +portRange: "" `)) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 5df897dbb6..7c7c7dac80 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -83,6 +83,8 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana NoTaintMaster bool NodeIP string ControlPlaneAddress string + KubeProxyMode string + // KubeProxyOptions []componentOptions }{ CertDir: vmpath.GuestKubernetesCertsDir, ServiceCIDR: constants.DefaultServiceCIDR, @@ -102,6 +104,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana DNSDomain: k8s.DNSDomain, NodeIP: n.IP, ControlPlaneAddress: cp.IP, + KubeProxyMode: k8s.ExtraOptions.Get("mode", Kubeproxy), } if k8s.ServiceCIDR != "" { From e317ecb6439da7c5f0061cdcf1bf4380fc369c89 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 17:29:44 -0400 Subject: [PATCH 05/13] add test data Signed-off-by: Pierre Ugaz --- .../bsutil/testdata/v1.17/containerd-api-port.yaml | 9 +++++++++ .../testdata/v1.17/containerd-pod-network-cidr.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 9 +++++++++ .../bsutil/testdata/v1.17/crio-options-gates.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.17/crio.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.17/default.yaml | 9 +++++++++ pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 9 +++++++++ .../bsutil/testdata/v1.17/image-repository.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.17/options.yaml | 9 +++++++++ .../bsutil/testdata/v1.18/containerd-api-port.yaml | 9 +++++++++ .../testdata/v1.18/containerd-pod-network-cidr.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 9 +++++++++ .../bsutil/testdata/v1.18/crio-options-gates.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.18/crio.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.18/default.yaml | 9 +++++++++ pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 9 +++++++++ .../bsutil/testdata/v1.18/image-repository.yaml | 9 +++++++++ .../bootstrapper/bsutil/testdata/v1.18/options.yaml | 9 +++++++++ 18 files changed, 162 insertions(+) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 43b450f5c0..08241be99d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 9cc48c0109..22bc5e98d1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index fd4f8c324d..59f7dbf58c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 658763f28f..97d48a9343 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -58,4 +58,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index f4c255c0c1..71813a27df 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 03b1632e50..2130e2de42 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index bf54c68796..9ed397def8 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 607c43532c..636cc3cb9d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -49,4 +49,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 2dfa4b76fd..618852200f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -55,4 +55,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 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 376b6dd2fa..a130db20d0 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 @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 910e9e9596..082c5acf87 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 @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 30b062ee58..d8dea48966 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 2f787eb95f..7333a08757 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 @@ -58,4 +58,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 ab798b8bf7..34d81a061e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 12ae87fcd3..173f9e2467 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 abb27ec9fb..6129d9feb7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -48,4 +48,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 c22581b268..46e11068ce 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -49,4 +49,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" 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 65e991dbce..470cea9ee2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -55,4 +55,13 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +ipvs: + excludeCIDRs: null + minSyncPeriod: 0s + scheduler: "rr" + strictARP: false + syncPeriod: 0s +mode: ipvs +portRange: "" metricsBindAddress: 1.1.1.1:10249 From c61388c08bb55fab41956f032d52356f7d87f84f Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 22:59:58 -0400 Subject: [PATCH 06/13] update testdata Signed-off-by: Pierre Ugaz --- .../bsutil/testdata/v1.17/containerd-api-port.yaml | 7 ------- .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 7 ------- .../bsutil/testdata/v1.17/crio-options-gates.yaml | 7 ------- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.17/default.yaml | 7 ------- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 7 ------- .../bsutil/testdata/v1.17/image-repository.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.17/options.yaml | 7 ------- .../bsutil/testdata/v1.18/containerd-api-port.yaml | 7 ------- .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 7 ------- .../bsutil/testdata/v1.18/crio-options-gates.yaml | 7 ------- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.18/default.yaml | 7 ------- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 7 ------- .../bsutil/testdata/v1.18/image-repository.yaml | 7 ------- .../bootstrapper/bsutil/testdata/v1.18/options.yaml | 7 ------- .../bsutil/testdata/v1.19/containerd-api-port.yaml | 2 ++ .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 2 ++ .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 2 ++ .../bsutil/testdata/v1.19/crio-options-gates.yaml | 2 ++ pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 2 ++ .../bootstrapper/bsutil/testdata/v1.19/default.yaml | 2 ++ pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 2 ++ .../bsutil/testdata/v1.19/image-repository.yaml | 2 ++ .../bootstrapper/bsutil/testdata/v1.19/options.yaml | 2 ++ 27 files changed, 18 insertions(+), 126 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 08241be99d..979928dfbe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 22bc5e98d1..2ec96da8e9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 59f7dbf58c..5dbbdb4b7f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 97d48a9343..42fa3807c3 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -59,12 +59,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 71813a27df..7b8cab8068 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index 2130e2de42..b0c09268bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index 9ed397def8..cf7cd22bcb 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index 636cc3cb9d..ab0d640d6c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -50,12 +50,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 618852200f..8cb0ee6cc7 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -56,12 +56,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 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 a130db20d0..dbef75bcfd 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 @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 082c5acf87..4ba77ecf12 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 @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 d8dea48966..e005038549 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 7333a08757..cf50d840e1 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 @@ -59,12 +59,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 34d81a061e..5b458dfe2e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 173f9e2467..afabb2afed 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 6129d9feb7..a0802a98ce 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -49,12 +49,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 46e11068ce..772f04858f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -50,12 +50,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" 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 470cea9ee2..7563bb687d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -56,12 +56,5 @@ evictionHard: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration enableProfiling: false -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s mode: ipvs -portRange: "" metricsBindAddress: 1.1.1.1:10249 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 5c7c731951..a046775630 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 @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 833a7ce604..f37a6601b7 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 @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 6e2bca9c65..975736c8ea 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 9183325cff..4efcdee2f2 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 @@ -58,4 +58,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 7c8a91362f..2a669b2310 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 efe78f9ea4..578311150a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 c771a624ee..28e246b193 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -48,4 +48,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 0d9e4b7b4a..21da1dcd46 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -49,4 +49,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs 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 c288ba36c4..d37d57a2c9 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -55,4 +55,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +enableProfiling: false +mode: ipvs metricsBindAddress: 1.1.1.1:10249 From 8c9672cf69b11bf4ace1c4673390018199f1b217 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 23:00:37 -0400 Subject: [PATCH 07/13] update template Signed-off-by: Pierre Ugaz --- .../bootstrapper/bsutil/ktmpl/v1beta1.go | 4 ++++ .../bootstrapper/bsutil/ktmpl/v1beta2.go | 20 +++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go index cbd2ec6d20..69b010f410 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go @@ -82,5 +82,9 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "{{.PodSubnet }}" metricsBindAddress: {{.AdvertiseAddress}}:10249 +{{- range $i, $val := printMapInOrder .KubeProxyOptions ": " }} +{{$val}} +{{- end}} `)) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index fd2ba56093..cf8d76bf7a 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -72,22 +72,8 @@ networking: apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration clusterCIDR: "{{.PodSubnet }}" -enableProfiling: false -{{if eq .KubeProxyMode "iptables" -}} -iptables: - masqueradeAll: false - masqueradeBit: null - minSyncPeriod: 0s - syncPeriod: 0s -{{else if eq .KubeProxyMode "ipvs" -}} -ipvs: - excludeCIDRs: null - minSyncPeriod: 0s - scheduler: "rr" - strictARP: false - syncPeriod: 0s -{{end -}} metricsBindAddress: {{.AdvertiseAddress}}:10249 -{{if .KubeProxyMode}}mode: {{.KubeProxyMode}}{{end}} -portRange: "" +{{- range $i, $val := printMapInOrder .KubeProxyOptions ": " }} +{{$val}} +{{- end}} `)) From 9ee5c0dc42dff5f8ebe6bb000a0edddb033ab112 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 23:02:12 -0400 Subject: [PATCH 08/13] keep kubeproxy config from being part of componentOptions, create func to get kube-proxy extra config outside componentOptions Signed-off-by: Pierre Ugaz --- .../bootstrapper/bsutil/extraconfig.go | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 5e5c3f657d..81e572dc15 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -51,7 +51,7 @@ var componentToKubeadmConfigKey = map[string]string{ Scheduler: "scheduler", Kubeadm: "kubeadm", // The KubeProxy is handled in different config block - Kubeproxy: "", + Kubeproxy: "kube-proxy", // The Kubelet is not configured in kubeadm, only in systemd. Kubelet: "", } @@ -180,7 +180,7 @@ func optionPairsForComponent(component string, version semver.Version, cp config return nil } -// createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm +// createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm and kube-proxy func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) ([]componentOptions, error) { extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) if err != nil { @@ -190,8 +190,11 @@ func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version se // kubeadm extra args should not be included in the kubeadm config in the extra args section (instead, they must // be inserted explicitly in the appropriate places or supplied from the command line); here we remove all of the // kubeadm extra args from the slice + // + // kube-proxy is managed under a different configuration block so it must be remove from the slice + // and inserted explicitly in the appropriate place for i, extraArgs := range extraArgsSlice { - if extraArgs.Component == Kubeadm { + if extraArgs.Component == Kubeadm || extraArgs.Component == Kubeproxy { extraArgsSlice = append(extraArgsSlice[:i], extraArgsSlice[i+1:]...) break } @@ -199,6 +202,22 @@ func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version se return extraArgsSlice, nil } +// createKubeProxyOptions generates a map of extra config for kube-proxy +func createKubeProxyOptions(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) (map[string]string, error) { + var kubeProxyOptions map[string]string + extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) + if err != nil { + return nil, err + } + + for _, extraArgs := range extraArgsSlice { + if extraArgs.Component == Kubeproxy { + kubeProxyOptions = extraArgs.ExtraArgs + } + } + return kubeProxyOptions, nil +} + func convertToFlags(opts map[string]string) string { var flags []string var keys []string From 0da0ba0b964078d833b5e51248ff534fbd07e067 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sat, 11 Apr 2020 23:02:43 -0400 Subject: [PATCH 09/13] make KubeProxyOptions part of kubeadm.yaml Signed-off-by: Pierre Ugaz --- pkg/minikube/bootstrapper/bsutil/kubeadm.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 7c7c7dac80..945921ced4 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -65,6 +65,11 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana return nil, errors.Wrap(err, "generating extra component config for kubeadm") } + kubeProxyOpts, err := createKubeProxyOptions(k8s.ExtraOptions, version, componentFeatureArgs, cp) + if err != nil { + return nil, errors.Wrap(err, "generating extra component config for kube-proxy") + } + opts := struct { CertDir string ServiceCIDR string @@ -83,8 +88,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana NoTaintMaster bool NodeIP string ControlPlaneAddress string - KubeProxyMode string - // KubeProxyOptions []componentOptions + KubeProxyOptions map[string]string }{ CertDir: vmpath.GuestKubernetesCertsDir, ServiceCIDR: constants.DefaultServiceCIDR, @@ -104,7 +108,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana DNSDomain: k8s.DNSDomain, NodeIP: n.IP, ControlPlaneAddress: cp.IP, - KubeProxyMode: k8s.ExtraOptions.Get("mode", Kubeproxy), + KubeProxyOptions: kubeProxyOpts, } if k8s.ServiceCIDR != "" { From 757f68cdc38a9ded963d01c206e17cc8da9c1c5e Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sun, 12 Apr 2020 02:05:38 -0400 Subject: [PATCH 10/13] update testdata Signed-off-by: Pierre Ugaz --- .../bsutil/testdata/v1.14/containerd-api-port.yaml | 1 + .../bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.14/containerd.yaml | 1 + .../bsutil/testdata/v1.14/crio-options-gates.yaml | 2 ++ pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.14/image-repository.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml | 2 ++ .../bsutil/testdata/v1.15/containerd-api-port.yaml | 1 + .../bsutil/testdata/v1.15/containerd-pod-network-cidr.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.15/containerd.yaml | 1 + .../bsutil/testdata/v1.15/crio-options-gates.yaml | 2 ++ pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.15/image-repository.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml | 2 ++ .../bsutil/testdata/v1.16/containerd-api-port.yaml | 1 + .../bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.16/containerd.yaml | 1 + .../bsutil/testdata/v1.16/crio-options-gates.yaml | 2 ++ pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml | 1 + .../bootstrapper/bsutil/testdata/v1.16/image-repository.yaml | 1 + pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml | 2 ++ .../bsutil/testdata/v1.17/containerd-api-port.yaml | 3 +-- .../bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.17/containerd.yaml | 3 +-- .../bsutil/testdata/v1.17/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.17/image-repository.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml | 4 ++-- .../bsutil/testdata/v1.18/containerd-api-port.yaml | 3 +-- .../bsutil/testdata/v1.18/containerd-pod-network-cidr.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.18/containerd.yaml | 3 +-- .../bsutil/testdata/v1.18/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.18/image-repository.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml | 4 ++-- .../bsutil/testdata/v1.19/containerd-api-port.yaml | 3 +-- .../bsutil/testdata/v1.19/containerd-pod-network-cidr.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.19/containerd.yaml | 3 +-- .../bsutil/testdata/v1.19/crio-options-gates.yaml | 4 ++-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml | 3 +-- .../bootstrapper/bsutil/testdata/v1.19/image-repository.yaml | 3 +-- pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml | 4 ++-- 54 files changed, 66 insertions(+), 54 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml index fc26257b55..62bceb183a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-api-port.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml index 9608b92860..2df527a653 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd-pod-network-cidr.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml index c3a54825dd..9c782e4d6d 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/containerd.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml index 7b43973e7d..71aaff1b6f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio-options-gates.yaml @@ -60,4 +60,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml index fa5b62cb02..560e8dcdca 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/crio.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml index 84f68f98fc..e2eb775d7e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/default.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml index 8791cf879f..b5fba0d518 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/dns.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml index b1c12c218e..b91009732a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/image-repository.yaml @@ -51,4 +51,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml index 72302c5654..036e43f262 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.14/options.yaml @@ -57,4 +57,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" 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 307f517ace..6bbaf18f64 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 @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 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 9a0077f387..8712c2dbc9 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 @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml index 3fee964be4..a8609951bc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/containerd.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 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 b07e909cc2..3c2dd46ad4 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 @@ -60,4 +60,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml index c30eed071b..a55385603e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/crio.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml index 99c6275ebd..a25207e88c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/default.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml index 7a41b4cd55..d356207760 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/dns.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 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 053a5977f9..56fd31213b 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/image-repository.yaml @@ -51,4 +51,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml index bac9bdd0c1..9ae56b70a4 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.15/options.yaml @@ -57,4 +57,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml index 1ac14c682a..03fb4bcccd 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-api-port.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml index 0a43dd453b..5148831ddc 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd-pod-network-cidr.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "192.168.32.0/20" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml index 13ebbb05a2..f0ff0d26c2 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/containerd.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml index 56388066f7..2c55f6585a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio-options-gates.yaml @@ -60,4 +60,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml index 70d0f5219b..b4a6891daf 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/crio.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml index fd99dfc616..303462f478 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/default.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml index 8c880bada8..29704633e0 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/dns.yaml @@ -50,4 +50,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml index 919063dda8..4b4c7e86fe 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/image-repository.yaml @@ -51,4 +51,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml index bf5753a224..f67ee28dca 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.16/options.yaml @@ -57,4 +57,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml index 979928dfbe..54ffc8fb61 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-api-port.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml index 2ec96da8e9..6c4cecbd5e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd-pod-network-cidr.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "192.168.32.0/20" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml index 5dbbdb4b7f..78958f174e 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/containerd.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml index 42fa3807c3..ccbf4d2106 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio-options-gates.yaml @@ -58,6 +58,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml index 7b8cab8068..5f29334069 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/crio.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml index b0c09268bc..db0ed79e93 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/default.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml index cf7cd22bcb..7ec9bc993a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/dns.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml index ab0d640d6c..43def839a6 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/image-repository.yaml @@ -49,6 +49,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml index 8cb0ee6cc7..c631176702 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.17/options.yaml @@ -55,6 +55,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" 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 dbef75bcfd..e99bfbf363 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 @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 4ba77ecf12..08e6262d8e 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 @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "192.168.32.0/20" 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 e005038549..cc6f07ff80 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/containerd.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 cf50d840e1..1f29fec486 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 @@ -58,6 +58,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml index 5b458dfe2e..28526e6f81 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/crio.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 afabb2afed..b76e03e83f 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/default.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 a0802a98ce..5281006871 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/dns.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 772f04858f..05ea8c05f1 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/image-repository.yaml @@ -49,6 +49,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 7563bb687d..e691389973 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.18/options.yaml @@ -55,6 +55,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" 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 a046775630..620492dc9a 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 @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 f37a6601b7..3736a27d01 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 @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "192.168.32.0/20" 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 975736c8ea..ae762d875a 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/containerd.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 4efcdee2f2..d890d1325f 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 @@ -58,6 +58,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" diff --git a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml index 2a669b2310..adf091fb3c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/crio.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 578311150a..95582ebe1c 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/default.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 28e246b193..fe79f7e993 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/dns.yaml @@ -48,6 +48,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 21da1dcd46..7114528755 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/image-repository.yaml @@ -49,6 +49,5 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" 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 d37d57a2c9..0147371635 100644 --- a/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml +++ b/pkg/minikube/bootstrapper/bsutil/testdata/v1.19/options.yaml @@ -55,6 +55,6 @@ evictionHard: --- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration -enableProfiling: false -mode: ipvs +clusterCIDR: "" metricsBindAddress: 1.1.1.1:10249 +mode: "iptables" From d91795b07012275a54cb6d5ecd4245c244ef6b1d Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sun, 12 Apr 2020 02:06:52 -0400 Subject: [PATCH 11/13] parse config right from extraOptions Signed-off-by: Pierre Ugaz --- .../bootstrapper/bsutil/extraconfig.go | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 81e572dc15..930cbd23eb 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -51,7 +51,7 @@ var componentToKubeadmConfigKey = map[string]string{ Scheduler: "scheduler", Kubeadm: "kubeadm", // The KubeProxy is handled in different config block - Kubeproxy: "kube-proxy", + Kubeproxy: "", // The Kubelet is not configured in kubeadm, only in systemd. Kubelet: "", } @@ -180,6 +180,9 @@ func optionPairsForComponent(component string, version semver.Version, cp config return nil } +// kubeadm extra args should not be included in the kubeadm config in the extra args section (instead, they must +// be inserted explicitly in the appropriate places or supplied from the command line); here we remove all of the +// kubeadm extra args from the slice // createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm and kube-proxy func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) ([]componentOptions, error) { extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) @@ -187,14 +190,8 @@ func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version se return nil, err } - // kubeadm extra args should not be included in the kubeadm config in the extra args section (instead, they must - // be inserted explicitly in the appropriate places or supplied from the command line); here we remove all of the - // kubeadm extra args from the slice - // - // kube-proxy is managed under a different configuration block so it must be remove from the slice - // and inserted explicitly in the appropriate place for i, extraArgs := range extraArgsSlice { - if extraArgs.Component == Kubeadm || extraArgs.Component == Kubeproxy { + if extraArgs.Component == Kubeadm { extraArgsSlice = append(extraArgsSlice[:i], extraArgsSlice[i+1:]...) break } @@ -203,19 +200,9 @@ func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version se } // createKubeProxyOptions generates a map of extra config for kube-proxy -func createKubeProxyOptions(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) (map[string]string, error) { - var kubeProxyOptions map[string]string - extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) - if err != nil { - return nil, err - } - - for _, extraArgs := range extraArgsSlice { - if extraArgs.Component == Kubeproxy { - kubeProxyOptions = extraArgs.ExtraArgs - } - } - return kubeProxyOptions, nil +func createKubeProxyOptions(extraOptions config.ExtraOptionSlice) map[string]string { + kubeProxyOptions := extraOptions.AsMap().Get(Kubeproxy) + return kubeProxyOptions } func convertToFlags(opts map[string]string) string { From f3c5e94d6a1798331c9c5874155f68b2c5b678fb Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Sun, 12 Apr 2020 02:07:45 -0400 Subject: [PATCH 12/13] get kube-proxy extra config Signed-off-by: Pierre Ugaz --- pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go | 9 +++++++++ pkg/minikube/bootstrapper/bsutil/kubeadm.go | 7 +------ pkg/minikube/bootstrapper/bsutil/kubeadm_test.go | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go index cf8d76bf7a..b8ed06f57e 100644 --- a/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go +++ b/pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go @@ -69,6 +69,15 @@ networking: podSubnet: "{{.PodSubnet }}" serviceSubnet: {{.ServiceCIDR}} --- +apiVersion: kubelet.config.k8s.io/v1beta1 +kind: KubeletConfiguration +# disable disk resource management by default +imageGCHighThresholdPercent: 100 +evictionHard: + nodefs.available: "0%" + nodefs.inodesFree: "0%" + imagefs.available: "0%" +--- apiVersion: kubeproxy.config.k8s.io/v1alpha1 kind: KubeProxyConfiguration clusterCIDR: "{{.PodSubnet }}" diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go index 945921ced4..673ef0f7c8 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm.go @@ -65,11 +65,6 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana return nil, errors.Wrap(err, "generating extra component config for kubeadm") } - kubeProxyOpts, err := createKubeProxyOptions(k8s.ExtraOptions, version, componentFeatureArgs, cp) - if err != nil { - return nil, errors.Wrap(err, "generating extra component config for kube-proxy") - } - opts := struct { CertDir string ServiceCIDR string @@ -108,7 +103,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana DNSDomain: k8s.DNSDomain, NodeIP: n.IP, ControlPlaneAddress: cp.IP, - KubeProxyOptions: kubeProxyOpts, + KubeProxyOptions: createKubeProxyOptions(k8s.ExtraOptions), } if k8s.ServiceCIDR != "" { diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go index cd39751c1b..0d3f22b12d 100644 --- a/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/bsutil/kubeadm_test.go @@ -57,7 +57,7 @@ func getExtraOpts() []config.ExtraOption { }, config.ExtraOption{ Component: Kubeproxy, - Key: "proxy-mode", + Key: "mode", Value: "iptables", }, } From 334d0262714ecc4f034e36dcf560a85dc33754b3 Mon Sep 17 00:00:00 2001 From: Pierre Ugaz Date: Wed, 22 Apr 2020 12:55:42 -0400 Subject: [PATCH 13/13] update description --- pkg/minikube/bootstrapper/bsutil/extraconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/bsutil/extraconfig.go b/pkg/minikube/bootstrapper/bsutil/extraconfig.go index 930cbd23eb..312038a0c4 100644 --- a/pkg/minikube/bootstrapper/bsutil/extraconfig.go +++ b/pkg/minikube/bootstrapper/bsutil/extraconfig.go @@ -183,7 +183,7 @@ func optionPairsForComponent(component string, version semver.Version, cp config // kubeadm extra args should not be included in the kubeadm config in the extra args section (instead, they must // be inserted explicitly in the appropriate places or supplied from the command line); here we remove all of the // kubeadm extra args from the slice -// createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm and kube-proxy +// createExtraComponentConfig generates a map of component to extra args for all of the components except kubeadm func createExtraComponentConfig(extraOptions config.ExtraOptionSlice, version semver.Version, componentFeatureArgs string, cp config.Node) ([]componentOptions, error) { extraArgsSlice, err := newComponentOptions(extraOptions, version, componentFeatureArgs, cp) if err != nil {