Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
ba9646ed
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ba9646ed
编写于
5月 10, 2016
作者:
L
Lucas Käldström
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added error handling for certs as commented
上级
f94581f1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
5 deletion
+12
-5
cmd/localkube/cmd/start.go
cmd/localkube/cmd/start.go
+5
-1
pkg/localkube/kube2sky/kube2sky.go
pkg/localkube/kube2sky/kube2sky.go
+0
-1
pkg/localkube/localkube.go
pkg/localkube/localkube.go
+7
-3
未找到文件。
cmd/localkube/cmd/start.go
浏览文件 @
ba9646ed
...
@@ -56,7 +56,11 @@ func init() {
...
@@ -56,7 +56,11 @@ func init() {
func
SetupServer
(
s
*
localkube
.
LocalkubeServer
)
{
func
SetupServer
(
s
*
localkube
.
LocalkubeServer
)
{
s
.
GenerateCerts
()
err
:=
s
.
GenerateCerts
()
if
err
!=
nil
{
fmt
.
Println
(
"Failed to create certificates!"
)
panic
(
err
)
}
// setup etcd
// setup etcd
etcd
,
err
:=
s
.
NewEtcd
(
localkube
.
KubeEtcdClientURLs
,
localkube
.
KubeEtcdPeerURLs
,
"kubeetcd"
,
s
.
GetEtcdDataDirectory
())
etcd
,
err
:=
s
.
NewEtcd
(
localkube
.
KubeEtcdClientURLs
,
localkube
.
KubeEtcdPeerURLs
,
"kubeetcd"
,
s
.
GetEtcdDataDirectory
())
...
...
pkg/localkube/kube2sky/kube2sky.go
浏览文件 @
ba9646ed
...
@@ -36,7 +36,6 @@ import (
...
@@ -36,7 +36,6 @@ import (
etcd
"github.com/coreos/go-etcd/etcd"
etcd
"github.com/coreos/go-etcd/etcd"
"github.com/golang/glog"
"github.com/golang/glog"
skymsg
"github.com/skynetservices/skydns/msg"
skymsg
"github.com/skynetservices/skydns/msg"
//flag "github.com/spf13/pflag"
kapi
"k8s.io/kubernetes/pkg/api"
kapi
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/endpoints"
"k8s.io/kubernetes/pkg/api/endpoints"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/unversioned"
...
...
pkg/localkube/localkube.go
浏览文件 @
ba9646ed
...
@@ -82,11 +82,11 @@ func (lk LocalkubeServer) GetHostIP() (net.IP, error) {
...
@@ -82,11 +82,11 @@ func (lk LocalkubeServer) GetHostIP() (net.IP, error) {
return
utilnet
.
ChooseBindAddress
(
net
.
ParseIP
(
"0.0.0.0"
))
return
utilnet
.
ChooseBindAddress
(
net
.
ParseIP
(
"0.0.0.0"
))
}
}
func
(
lk
LocalkubeServer
)
GenerateCerts
()
{
func
(
lk
LocalkubeServer
)
GenerateCerts
()
error
{
if
util
.
CanReadFile
(
lk
.
GetPublicKeyCertPath
())
&&
util
.
CanReadFile
(
lk
.
GetPrivateKeyCertPath
())
{
if
util
.
CanReadFile
(
lk
.
GetPublicKeyCertPath
())
&&
util
.
CanReadFile
(
lk
.
GetPrivateKeyCertPath
())
{
fmt
.
Println
(
"Using
existing certs"
)
fmt
.
Println
(
"Using
these existing certs: "
,
lk
.
GetPublicKeyCertPath
(),
lk
.
GetPrivateKeyCertPath
()
)
return
return
nil
}
}
alternateIPs
:=
[]
net
.
IP
{
lk
.
ServiceClusterIPRange
.
IP
}
alternateIPs
:=
[]
net
.
IP
{
lk
.
ServiceClusterIPRange
.
IP
}
...
@@ -94,9 +94,13 @@ func (lk LocalkubeServer) GenerateCerts() {
...
@@ -94,9 +94,13 @@ func (lk LocalkubeServer) GenerateCerts() {
hostIP
,
err
:=
lk
.
GetHostIP
()
hostIP
,
err
:=
lk
.
GetHostIP
()
if
err
!=
nil
{
if
err
!=
nil
{
fmt
.
Println
(
"Failed to get host IP: "
,
err
)
fmt
.
Println
(
"Failed to get host IP: "
,
err
)
return
err
}
}
if
err
:=
utilcrypto
.
GenerateSelfSignedCert
(
hostIP
.
String
(),
lk
.
GetPublicKeyCertPath
(),
lk
.
GetPrivateKeyCertPath
(),
alternateIPs
,
alternateDNS
);
err
!=
nil
{
if
err
:=
utilcrypto
.
GenerateSelfSignedCert
(
hostIP
.
String
(),
lk
.
GetPublicKeyCertPath
(),
lk
.
GetPrivateKeyCertPath
(),
alternateIPs
,
alternateDNS
);
err
!=
nil
{
fmt
.
Println
(
"Failed to create certs: "
,
err
)
fmt
.
Println
(
"Failed to create certs: "
,
err
)
return
err
}
}
return
nil
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录