Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
cd9e4138
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,发现更多精彩内容 >>
提交
cd9e4138
编写于
10月 29, 2019
作者:
M
Medya Gh
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve code review
上级
29a015b6
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
21 addition
and
21 deletion
+21
-21
pkg/drivers/none/none.go
pkg/drivers/none/none.go
+4
-3
pkg/minikube/bootstrapper/certs.go
pkg/minikube/bootstrapper/certs.go
+3
-3
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
+2
-2
pkg/minikube/command/command_runner.go
pkg/minikube/command/command_runner.go
+2
-2
pkg/minikube/command/exec_runner.go
pkg/minikube/command/exec_runner.go
+1
-2
pkg/minikube/cruntime/containerd.go
pkg/minikube/cruntime/containerd.go
+5
-5
pkg/minikube/cruntime/crio.go
pkg/minikube/cruntime/crio.go
+2
-2
pkg/minikube/cruntime/cruntime.go
pkg/minikube/cruntime/cruntime.go
+2
-2
未找到文件。
pkg/drivers/none/none.go
浏览文件 @
cd9e4138
...
...
@@ -229,10 +229,11 @@ func stopKubelet(cr command.Runner) error {
cmd
=
exec
.
Command
(
"sudo"
,
"systemctl"
,
"show"
,
"-p"
,
"SubState"
,
"kubelet"
)
cmd
.
Stdout
=
&
out
cmd
.
Stderr
=
&
out
if
rr
,
err
:=
cr
.
RunCmd
(
cmd
);
err
!=
nil
{
rr
,
err
:=
cr
.
RunCmd
(
cmd
)
if
err
!=
nil
{
glog
.
Errorf
(
"temporary error: for %q : %v"
,
rr
.
Command
(),
err
)
}
if
!
strings
.
Contains
(
out
.
String
(),
"dead"
)
&&
!
strings
.
Contains
(
out
.
String
(),
"failed"
)
{
if
!
strings
.
Contains
(
rr
.
Stdout
.
String
(),
"dead"
)
&&
!
strings
.
Contains
(
rr
.
Std
out
.
String
(),
"failed"
)
{
return
fmt
.
Errorf
(
"unexpected kubelet state: %q"
,
out
)
}
return
nil
...
...
@@ -260,7 +261,7 @@ func checkKubelet(cr command.Runner) error {
glog
.
Infof
(
"checking for running kubelet ..."
)
c
:=
exec
.
Command
(
"systemctl"
,
"is-active"
,
"--quiet"
,
"service"
,
"kubelet"
)
if
_
,
err
:=
cr
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"check
K
ubelet"
)
return
errors
.
Wrap
(
err
,
"check
k
ubelet"
)
}
return
nil
}
pkg/minikube/bootstrapper/certs.go
浏览文件 @
cd9e4138
...
...
@@ -347,19 +347,19 @@ func configureCACerts(cr command.Runner, caCerts map[string]string) error {
_
,
err
:=
cr
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"test"
,
"-f"
,
certStorePath
))
if
err
!=
nil
{
if
_
,
err
:=
cr
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"ln"
,
"-s"
,
caCertFile
,
certStorePath
));
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"
error making symbol link for certificate
%s"
,
caCertFile
)
return
errors
.
Wrapf
(
err
,
"
create symlink for
%s"
,
caCertFile
)
}
}
if
hasSSLBinary
{
subjectHash
,
err
:=
getSubjectHash
(
cr
,
caCertFile
)
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"
error calculating subject hash for certificate
%s"
,
caCertFile
)
return
errors
.
Wrapf
(
err
,
"
calculate hash for cacert
%s"
,
caCertFile
)
}
subjectHashLink
:=
path
.
Join
(
SSLCertStoreDir
,
fmt
.
Sprintf
(
"%s.0"
,
subjectHash
))
_
,
err
=
cr
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"test"
,
"-f"
,
subjectHashLink
))
if
err
!=
nil
{
if
_
,
err
:=
cr
.
RunCmd
(
exec
.
Command
(
"sudo"
,
"ln"
,
"-s"
,
certStorePath
,
subjectHashLink
));
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"linking caCertFile %s
.
"
,
caCertFile
)
return
errors
.
Wrapf
(
err
,
"linking caCertFile %s"
,
caCertFile
)
}
}
}
...
...
pkg/minikube/bootstrapper/kubeadm/kubeadm.go
浏览文件 @
cd9e4138
...
...
@@ -642,8 +642,8 @@ func (k *Bootstrapper) UpdateCluster(cfg config.KubernetesConfig) error {
}
}
if
_
,
err
:=
k
.
c
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
"s
et -x;s
udo systemctl daemon-reload && sudo systemctl start kubelet"
));
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"starting kubelet
.
"
)
if
_
,
err
:=
k
.
c
.
RunCmd
(
exec
.
Command
(
"/bin/bash"
,
"-c"
,
"sudo systemctl daemon-reload && sudo systemctl start kubelet"
));
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"starting kubelet"
)
}
return
nil
}
...
...
pkg/minikube/command/command_runner.go
浏览文件 @
cd9e4138
...
...
@@ -36,8 +36,8 @@ type RunResult struct {
// Runner represents an interface to run commands.
type
Runner
interface
{
// RunCmd
is a new expermintal way to run commands, takes Cmd interface and returns run result
.
//
if succesfull will cause a clean up to get rid of older methods
.
// RunCmd
runs a cmd of exec.Cmd type. allowing user to set cmd.Stdin, cmd.Stdout,..
.
//
not all implementors are guaranteed to handle all the properties of cmd
.
RunCmd
(
cmd
*
exec
.
Cmd
)
(
*
RunResult
,
error
)
// Copy is a convenience method that runs a command to copy a file
...
...
pkg/minikube/command/exec_runner.go
浏览文件 @
cd9e4138
...
...
@@ -18,7 +18,6 @@ package command
import
(
"bytes"
"fmt"
"io"
"os"
"os/exec"
...
...
@@ -73,7 +72,7 @@ func (*ExecRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
rr
.
ExitCode
=
exitError
.
ExitCode
()
}
glog
.
Infof
(
"(ExecRunner) Non-zero exit: %v: %v (%s)
\n
%s"
,
rr
.
Command
(),
err
,
elapsed
,
rr
.
Output
())
err
=
errors
.
Wrapf
(
err
,
fmt
.
Sprintf
(
"stderr: %s"
,
rr
.
Stderr
.
String
()
))
err
=
errors
.
Wrapf
(
err
,
"command failed: %s
\n
stdout: %s
\n
stderr: %s"
,
cmd
,
rr
.
Stdout
.
String
(),
rr
.
Stderr
.
String
(
))
}
return
rr
,
err
}
...
...
pkg/minikube/cruntime/containerd.go
浏览文件 @
cd9e4138
...
...
@@ -161,7 +161,7 @@ func (r *Containerd) Active() bool {
// Available returns an error if it is not possible to use this runtime on a host
func
(
r
*
Containerd
)
Available
()
error
{
c
:=
exec
.
Command
(
"
command"
,
"-v
"
,
"containerd"
)
c
:=
exec
.
Command
(
"
which
"
,
"containerd"
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"check containerd availability."
)
}
...
...
@@ -207,7 +207,7 @@ func (r *Containerd) Enable(disOthers bool) error {
// Otherwise, containerd will fail API requests with 'Unimplemented'
c
:=
exec
.
Command
(
"sudo"
,
"systemctl"
,
"restart"
,
"containerd"
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"
enable containrd.
"
)
return
errors
.
Wrap
(
err
,
"
restart containerd
"
)
}
return
nil
}
...
...
@@ -216,7 +216,7 @@ func (r *Containerd) Enable(disOthers bool) error {
func
(
r
*
Containerd
)
Disable
()
error
{
c
:=
exec
.
Command
(
"sudo"
,
"systemctl"
,
"stop"
,
"containerd"
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"
disable containrd.
"
)
return
errors
.
Wrapf
(
err
,
"
stop containerd
"
)
}
return
nil
}
...
...
@@ -224,9 +224,9 @@ func (r *Containerd) Disable() error {
// LoadImage loads an image into this runtime
func
(
r
*
Containerd
)
LoadImage
(
path
string
)
error
{
glog
.
Infof
(
"Loading image: %s"
,
path
)
c
:=
exec
.
Command
(
"ctr"
,
"-n=k8s.io"
,
"images"
,
"import"
,
path
)
c
:=
exec
.
Command
(
"
sudo"
,
"
ctr"
,
"-n=k8s.io"
,
"images"
,
"import"
,
path
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"
disable containrd.
"
)
return
errors
.
Wrapf
(
err
,
"
ctr images import
"
)
}
return
nil
}
...
...
pkg/minikube/cruntime/crio.go
浏览文件 @
cd9e4138
...
...
@@ -73,7 +73,7 @@ func (r *CRIO) DefaultCNI() bool {
// Available returns an error if it is not possible to use this runtime on a host
func
(
r
*
CRIO
)
Available
()
error
{
c
:=
exec
.
Command
(
"
command"
,
"-v
"
,
"crio"
)
c
:=
exec
.
Command
(
"
which
"
,
"crio"
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"check crio available."
)
}
...
...
@@ -124,7 +124,7 @@ func (r *CRIO) LoadImage(path string) error {
glog
.
Infof
(
"Loading image: %s"
,
path
)
c
:=
exec
.
Command
(
"sudo"
,
"podman"
,
"load"
,
"-i"
,
path
)
if
_
,
err
:=
r
.
Runner
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"
LoadImage crio.
"
)
return
errors
.
Wrap
(
err
,
"
crio load image
"
)
}
return
nil
}
...
...
pkg/minikube/cruntime/cruntime.go
浏览文件 @
cd9e4138
...
...
@@ -133,12 +133,12 @@ func disableOthers(me Manager, cr CommandRunner) error {
func
enableIPForwarding
(
cr
CommandRunner
)
error
{
c
:=
exec
.
Command
(
"sudo"
,
"modprobe"
,
"br_netfilter"
)
if
_
,
err
:=
cr
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"br_netfilter
.
"
)
return
errors
.
Wrap
(
err
,
"br_netfilter"
)
}
c
=
exec
.
Command
(
"sudo"
,
"sh"
,
"-c"
,
"echo 1 > /proc/sys/net/ipv4/ip_forward"
)
if
_
,
err
:=
cr
.
RunCmd
(
c
);
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"ip_forward
.
"
)
return
errors
.
Wrapf
(
err
,
"ip_forward"
)
}
return
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录