From e08423c6330dbaf6943def8396c9424b64dff434 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Tue, 11 Dec 2018 16:15:40 +0100 Subject: [PATCH] Pass network-plugin value to kubelet Previously, when "minikube start" has been invoked with "--network-plugin=<..>", the value was not passed to kubelet. Therefore, the additional param "--extra-config=kubelet.network-plugin=<..>" was required. This commit ensures that the value is being passed to kubelet, so the extra-config value is no longer needed. Signed-off-by: Martynas Pumputis --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index 04273801cd48..95b06220288b 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -299,6 +299,11 @@ func NewKubeletConfig(k8s config.KubernetesConfig) (string, error) { } extraOpts = SetContainerRuntime(extraOpts, k8s.ContainerRuntime) + + if k8s.NetworkPlugin != "" { + extraOpts["network-plugin"] = k8s.NetworkPlugin + } + extraFlags := convertToFlags(extraOpts) // parses a map of the feature gates for kubelet