Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
c2175abc
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,体验更适合开发者的 AI 搜索 >>
提交
c2175abc
编写于
7月 18, 2020
作者:
J
Jose Donizetti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add static ip to kic/docker
上级
56642282
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
0 deletion
+54
-0
cmd/minikube/cmd/delete.go
cmd/minikube/cmd/delete.go
+7
-0
pkg/drivers/kic/kic.go
pkg/drivers/kic/kic.go
+11
-0
pkg/drivers/kic/oci/network.go
pkg/drivers/kic/oci/network.go
+27
-0
pkg/drivers/kic/oci/oci.go
pkg/drivers/kic/oci/oci.go
+7
-0
pkg/drivers/kic/oci/types.go
pkg/drivers/kic/oci/types.go
+2
-0
未找到文件。
cmd/minikube/cmd/delete.go
浏览文件 @
c2175abc
...
...
@@ -251,6 +251,13 @@ func deletePossibleKicLeftOver(cname string, driverName string) {
glog
.
Warningf
(
"error deleting volumes (might be okay).
\n
To see the list of volumes run: 'docker volume ls'
\n
:%v"
,
errs
)
}
// TODO: move to oci.DeleteContainer?
defaultNetwork
:=
fmt
.
Sprintf
(
"%s-network"
,
cname
)
err
=
oci
.
RemoveNetwork
(
defaultNetwork
)
if
err
!=
nil
{
glog
.
Warningf
(
"error deleting network. :%v"
,
errs
)
}
if
bin
==
oci
.
Podman
{
// podman prune does not support --filter
return
...
...
pkg/drivers/kic/kic.go
浏览文件 @
c2175abc
...
...
@@ -67,6 +67,15 @@ func NewDriver(c Config) *Driver {
// Create a host using the driver's config
func
(
d
*
Driver
)
Create
()
error
{
defaultNetwork
:=
fmt
.
Sprintf
(
"%s-network"
,
d
.
MachineName
)
defaultIPRange
:=
"192.168.39.0/24"
err
:=
oci
.
CreateNetwork
(
defaultNetwork
,
defaultIPRange
)
if
err
!=
nil
{
// use k8s network? fail?
return
err
}
params
:=
oci
.
CreateParams
{
Name
:
d
.
NodeConfig
.
MachineName
,
Image
:
d
.
NodeConfig
.
ImageDigest
,
...
...
@@ -78,6 +87,8 @@ func (d *Driver) Create() error {
ExtraArgs
:
[]
string
{
"--expose"
,
fmt
.
Sprintf
(
"%d"
,
d
.
NodeConfig
.
APIServerPort
)},
OCIBinary
:
d
.
NodeConfig
.
OCIBinary
,
APIServerPort
:
d
.
NodeConfig
.
APIServerPort
,
Network
:
defaultNetwork
,
IP
:
"192.168.39.2"
,
}
// control plane specific options
...
...
pkg/drivers/kic/oci/network.go
浏览文件 @
c2175abc
...
...
@@ -162,3 +162,30 @@ func dockerContainerIP(name string) (string, string, error) {
return
ips
[
0
],
ips
[
1
],
nil
}
// CreateNetwork creates a network
func
CreateNetwork
(
name
,
ipRange
string
)
error
{
// TODO: validate if exist?
// TODO: subnet conflict
// TODO: configure gateway explictly
subnet
:=
fmt
.
Sprintf
(
"--subnet=%s"
,
ipRange
)
_
,
err
:=
runCmd
(
exec
.
Command
(
Docker
,
"network"
,
"create"
,
"--driver=bridge"
,
subnet
,
name
))
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"error creating network"
)
}
return
nil
}
// RemoveNetwork removes a network
func
RemoveNetwork
(
name
string
)
error
{
// TODO: check if exist?
_
,
err
:=
runCmd
(
exec
.
Command
(
Docker
,
"network"
,
"remove"
,
name
))
if
err
!=
nil
{
return
errors
.
Wrapf
(
err
,
"error removing network"
)
}
return
nil
}
pkg/drivers/kic/oci/oci.go
浏览文件 @
c2175abc
...
...
@@ -142,6 +142,13 @@ func CreateContainerNode(p CreateParams) error {
"--label"
,
p
.
NodeLabel
,
}
// network
if
p
.
OCIBinary
==
Docker
&&
runtime
.
GOOS
==
"linux"
{
// for now only docker on linux
runArgs
=
append
(
runArgs
,
"--network"
,
p
.
Network
)
runArgs
=
append
(
runArgs
,
"--ip"
,
p
.
IP
)
}
// volume
if
p
.
OCIBinary
==
Podman
{
// enable execing in /var
// podman mounts var/lib with no-exec by default https://github.com/containers/libpod/issues/5103
runArgs
=
append
(
runArgs
,
"--volume"
,
fmt
.
Sprintf
(
"%s:/var:exec"
,
p
.
Name
))
...
...
pkg/drivers/kic/oci/types.go
浏览文件 @
c2175abc
...
...
@@ -48,6 +48,8 @@ type CreateParams struct {
Envs
map
[
string
]
string
// environment variables to pass to the container
ExtraArgs
[]
string
// a list of any extra option to pass to oci binary during creation time, for example --expose 8080...
OCIBinary
string
// docker or podman
Network
string
// network used by the container
IP
string
// container ip address
}
// createOpt is an option for Create
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录