kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make KubeProxyOptions part of kubeadm.yaml 

Signed-off-by: Pierre Ugaz <ulm0@innersea.xyz>
pull/6876/head
Pierre Ugaz 2020-04-11 23:02:43 -04:00
parent 9ee5c0dc42
commit 0da0ba0b96
No known key found for this signature in database
GPG Key ID: F41151BDF9BE076B
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/minikube/bootstrapper/bsutil/kubeadm.go
View File

@ -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") 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 { opts := struct {
CertDir string CertDir string
ServiceCIDR string ServiceCIDR string
@ -83,8 +88,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
NoTaintMaster bool NoTaintMaster bool
NodeIP string NodeIP string
ControlPlaneAddress string ControlPlaneAddress string
KubeProxyMode string KubeProxyOptions map[string]string
// KubeProxyOptions []componentOptions
}{ }{
CertDir: vmpath.GuestKubernetesCertsDir, CertDir: vmpath.GuestKubernetesCertsDir,
ServiceCIDR: constants.DefaultServiceCIDR, ServiceCIDR: constants.DefaultServiceCIDR,
@ -104,7 +108,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
DNSDomain: k8s.DNSDomain, DNSDomain: k8s.DNSDomain,
NodeIP: n.IP, NodeIP: n.IP,
ControlPlaneAddress: cp.IP, ControlPlaneAddress: cp.IP,
KubeProxyMode: k8s.ExtraOptions.Get("mode", Kubeproxy), KubeProxyOptions: kubeProxyOpts,
} }
if k8s.ServiceCIDR != "" { if k8s.ServiceCIDR != "" {