Skip to content

Commit

Permalink
Merge pull request #3442 from brb/2828-network-plugin-cni
Browse files Browse the repository at this point in the history
Pass network-plugin value to kubelet
  • Loading branch information
tstromberg authored Jan 11, 2019
2 parents c08ae00 + e08423c commit e6b60fb
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions pkg/minikube/bootstrapper/kubeadm/kubeadm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e6b60fb

Please sign in to comment.