Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a82c4903
Unverified
Commit
a82c4903
authored
Sep 01, 2016
by
Evgeny L
Committed by
Ilya Dmitrichenko
Sep 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation errors after method GetDefaultHostIP was removed
parent
f223d814
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
init.go
pkg/kubeadm/cmd/init.go
+3
-2
manual.go
pkg/kubeadm/cmd/manual.go
+1
-1
No files found.
pkg/kubeadm/cmd/init.go
View file @
a82c4903
...
...
@@ -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
...
...
pkg/kubeadm/cmd/manual.go
View file @
a82c4903
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment