Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
e22b605e
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,发现更多精彩内容 >>
未验证
提交
e22b605e
编写于
7月 23, 2019
作者:
A
Anders Björklund
提交者:
GitHub
7月 23, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4525 from afbjorklund/distro
Show info about the minikube linux distribution
上级
66938da6
d1cca954
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
1 deletion
+45
-1
pkg/minikube/cluster/cluster.go
pkg/minikube/cluster/cluster.go
+42
-0
pkg/minikube/out/style.go
pkg/minikube/out/style.go
+1
-0
pkg/minikube/out/style_enum.go
pkg/minikube/out/style_enum.go
+1
-0
pkg/minikube/tests/provision_mock.go
pkg/minikube/tests/provision_mock.go
+1
-1
未找到文件。
pkg/minikube/cluster/cluster.go
浏览文件 @
e22b605e
...
...
@@ -20,6 +20,7 @@ import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"math"
"net"
"os/exec"
...
...
@@ -29,6 +30,7 @@ import (
"time"
"github.com/docker/machine/libmachine"
"github.com/docker/machine/libmachine/drivers"
"github.com/docker/machine/libmachine/engine"
"github.com/docker/machine/libmachine/host"
"github.com/docker/machine/libmachine/mcnerror"
...
...
@@ -365,6 +367,40 @@ func getHostInfo() (*hostInfo, error) {
return
&
info
,
nil
}
// showLocalOsRelease shows systemd information about the current linux distribution, on the local host
func
showLocalOsRelease
()
{
osReleaseOut
,
err
:=
ioutil
.
ReadFile
(
"/etc/os-release"
)
if
err
!=
nil
{
glog
.
Errorf
(
"ReadFile: %v"
,
err
)
return
}
osReleaseInfo
,
err
:=
provision
.
NewOsRelease
(
osReleaseOut
)
if
err
!=
nil
{
glog
.
Errorf
(
"NewOsRelease: %v"
,
err
)
return
}
out
.
T
(
out
.
Provisioner
,
"OS release is {{.pretty_name}}"
,
out
.
V
{
"pretty_name"
:
osReleaseInfo
.
PrettyName
})
}
// showRemoteOsRelease shows systemd information about the current linux distribution, on the remote VM
func
showRemoteOsRelease
(
driver
drivers
.
Driver
)
{
provisioner
,
err
:=
provision
.
DetectProvisioner
(
driver
)
if
err
!=
nil
{
glog
.
Errorf
(
"DetectProvisioner: %v"
,
err
)
return
}
osReleaseInfo
,
err
:=
provisioner
.
GetOsReleaseInfo
()
if
err
!=
nil
{
glog
.
Errorf
(
"GetOsReleaseInfo: %v"
,
err
)
return
}
out
.
T
(
out
.
Provisioner
,
"Provisioned with {{.pretty_name}}"
,
out
.
V
{
"pretty_name"
:
osReleaseInfo
.
PrettyName
})
}
func
createHost
(
api
libmachine
.
API
,
config
cfg
.
MachineConfig
)
(
*
host
.
Host
,
error
)
{
if
config
.
VMDriver
==
constants
.
DriverVmwareFusion
&&
viper
.
GetBool
(
cfg
.
ShowDriverDeprecationNotification
)
{
out
.
WarningT
(
`The vmwarefusion driver is deprecated and support for it will be removed in a future release.
...
...
@@ -410,6 +446,12 @@ func createHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error
return
nil
,
errors
.
Wrap
(
err
,
"create"
)
}
if
!
localDriver
(
config
.
VMDriver
)
{
showRemoteOsRelease
(
h
.
Driver
)
}
else
{
showLocalOsRelease
()
}
if
err
:=
api
.
Save
(
h
);
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"save"
)
}
...
...
pkg/minikube/out/style.go
浏览文件 @
e22b605e
...
...
@@ -87,6 +87,7 @@ var styles = map[StyleEnum]style{
Caching
:
{
Prefix
:
"🤹 "
},
StartingVM
:
{
Prefix
:
"🔥 "
},
StartingNone
:
{
Prefix
:
"🤹 "
},
Provisioner
:
{
Prefix
:
"ℹ️ "
},
Resetting
:
{
Prefix
:
"🔄 "
},
DeletingHost
:
{
Prefix
:
"🔥 "
},
Copying
:
{
Prefix
:
"✨ "
},
...
...
pkg/minikube/out/style_enum.go
浏览文件 @
e22b605e
...
...
@@ -56,6 +56,7 @@ const (
Caching
StartingVM
StartingNone
Provisioner
Resetting
DeletingHost
Copying
...
...
pkg/minikube/tests/provision_mock.go
浏览文件 @
e22b605e
...
...
@@ -81,7 +81,7 @@ func (provisioner *MockProvisioner) SetOsReleaseInfo(info *provision.OsRelease)
// GetOsReleaseInfo gets the os-release info
func
(
provisioner
*
MockProvisioner
)
GetOsReleaseInfo
()
(
*
provision
.
OsRelease
,
error
)
{
return
nil
,
nil
return
&
provision
.
OsRelease
{}
,
nil
}
// AttemptIPContact attempts to contact an IP and port
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录