From a82c4903150045b8ca60c30eaef0ad3ab05ba923 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Thu, 1 Sep 2016 11:40:32 +0300 Subject: [PATCH] Fix compilation errors after method GetDefaultHostIP was removed --- pkg/kubeadm/cmd/init.go | 5 +++-- pkg/kubeadm/cmd/manual.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubeadm/cmd/init.go b/pkg/kubeadm/cmd/init.go index 5c7a541900b..a40f32637a3 100644 --- a/pkg/kubeadm/cmd/init.go +++ b/pkg/kubeadm/cmd/init.go @@ -27,6 +27,7 @@ import ( kubemaster "k8s.io/kubernetes/pkg/kubeadm/master" kubeadmutil "k8s.io/kubernetes/pkg/kubeadm/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + netutil "k8s.io/kubernetes/pkg/util/net" ) var ( @@ -59,11 +60,11 @@ func NewCmdInit(out io.Writer, params *kubeadmapi.BootstrapParams) *cobra.Comman func RunInit(out io.Writer, cmd *cobra.Command, args []string, params *kubeadmapi.BootstrapParams) error { if params.Discovery.ListenIP == "" { - ip, err := kubeadmutil.GetDefaultHostIP() + ip, err := netutil.ChooseHostInterface() if err != nil { return err } - params.Discovery.ListenIP = ip + params.Discovery.ListenIP = ip.String() } if err := kubemaster.CreateTokenAuthFile(params); err != nil { return err diff --git a/pkg/kubeadm/cmd/manual.go b/pkg/kubeadm/cmd/manual.go index 05902986f66..aa617eba9f7 100644 --- a/pkg/kubeadm/cmd/manual.go +++ b/pkg/kubeadm/cmd/manual.go @@ -98,7 +98,7 @@ func NewCmdManualBootstrapInitMaster(out io.Writer, params *kubeadmapi.Bootstrap if err != nil { return fmt.Errorf("Unable to autodetect IP address [%s], please specify with --listen-ip", err) } - params.Discovery.ListenIP = ip + params.Discovery.ListenIP = ip.String() } if err := kubemaster.CreateTokenAuthFile(params); err != nil { return err