github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors after method GetDefaultHostIP was removed

Browse Source
This commit is contained in:
Evgeny L 2016-09-01 11:40:32 +03:00 committed by Ilya Dmitrichenko
parent f223d814da
commit a82c490315
No known key found for this signature in database
GPG Key ID: E7889175A6C0CEB9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubeadm/cmd/init.go
View File

@ -27,6 +27,7 @@ import (
kubemaster "k8s.io/kubernetes/pkg/kubeadm/master" kubemaster "k8s.io/kubernetes/pkg/kubeadm/master"
kubeadmutil "k8s.io/kubernetes/pkg/kubeadm/util" kubeadmutil "k8s.io/kubernetes/pkg/kubeadm/util"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
netutil "k8s.io/kubernetes/pkg/util/net"
) )
var ( 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 { func RunInit(out io.Writer, cmd *cobra.Command, args []string, params *kubeadmapi.BootstrapParams) error {
if params.Discovery.ListenIP == "" { if params.Discovery.ListenIP == "" {
ip, err := kubeadmutil.GetDefaultHostIP() ip, err := netutil.ChooseHostInterface()
if err != nil { if err != nil {
return err return err
} }
params.Discovery.ListenIP = ip params.Discovery.ListenIP = ip.String()
} }
if err := kubemaster.CreateTokenAuthFile(params); err != nil { if err := kubemaster.CreateTokenAuthFile(params); err != nil {
return err return err

2
pkg/kubeadm/cmd/manual.go
View File

@ -98,7 +98,7 @@ func NewCmdManualBootstrapInitMaster(out io.Writer, params *kubeadmapi.Bootstrap
if err != nil { if err != nil {
return fmt.Errorf("Unable to autodetect IP address [%s], please specify with --listen-ip", err) 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 { if err := kubemaster.CreateTokenAuthFile(params); err != nil {
return err return err