Merge pull request #3442 from brb/2828-network-plugin-cni

Pass network-plugin value to kubelet
2019-01-11 11:40:09 -08:00 · 2019-01-11 11:40:09 -08:00 · e6b60fb38c
parent c08ae00fb4 e08423c633
commit e6b60fb38c
1 changed files with 5 additions and 0 deletions
--- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@ -309,6 +309,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