Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
08efbb88
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,发现更多精彩内容 >>
提交
08efbb88
编写于
2月 05, 2021
作者:
M
Michael Henkel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move containerd insecure registry config to containerd.go
上级
9ecaa576
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
34 deletion
+14
-34
deploy/iso/minikube-iso/package/containerd-bin/config.toml
deploy/iso/minikube-iso/package/containerd-bin/config.toml
+0
-1
deploy/iso/minikube-iso/package/containerd-bin/config.toml.default
...o/minikube-iso/package/containerd-bin/config.toml.default
+0
-1
pkg/minikube/cruntime/containerd.go
pkg/minikube/cruntime/containerd.go
+9
-2
pkg/minikube/cruntime/cruntime.go
pkg/minikube/cruntime/cruntime.go
+3
-0
pkg/minikube/node/start.go
pkg/minikube/node/start.go
+1
-0
pkg/provision/provision.go
pkg/provision/provision.go
+1
-30
未找到文件。
deploy/iso/minikube-iso/package/containerd-bin/config.toml
浏览文件 @
08efbb88
...
...
@@ -5,7 +5,6 @@ plugin_dir = ""
disabled_plugins
=
[]
required_plugins
=
[]
oom_score
=
0
imports
=
["/etc/containerd/config.minikube.toml"]
[grpc]
address
=
"/run/containerd/containerd.sock"
...
...
deploy/iso/minikube-iso/package/containerd-bin/config.toml.default
浏览文件 @
08efbb88
...
...
@@ -5,7 +5,6 @@ plugin_dir = ""
disabled_plugins = []
required_plugins = []
oom_score = 0
imports = ["/etc/containerd/config.minikube.toml"]
[grpc]
address = "/run/containerd/containerd.sock"
...
...
pkg/minikube/cruntime/containerd.go
浏览文件 @
08efbb88
...
...
@@ -98,6 +98,10 @@ oom_score = 0
[plugins.cri.registry.mirrors]
[plugins.cri.registry.mirrors."docker.io"]
endpoint = ["https://registry-1.docker.io"]
{{ range .InsecureRegistry -}}
[plugins.cri.registry.mirrors."{{. -}}"]
endpoint = ["http://{{. -}}"]
{{ end -}}
[plugins.diff-service]
default = ["walking"]
[plugins.linux]
...
...
@@ -122,6 +126,7 @@ type Containerd struct {
ImageRepository
string
KubernetesVersion
semver
.
Version
Init
sysinit
.
Manager
InsecureRegistry
[]
string
}
// Name is a human readable name for containerd
...
...
@@ -172,7 +177,7 @@ func (r *Containerd) Available() error {
}
// generateContainerdConfig sets up /etc/containerd/config.toml
func
generateContainerdConfig
(
cr
CommandRunner
,
imageRepository
string
,
kv
semver
.
Version
,
forceSystemd
bool
)
error
{
func
generateContainerdConfig
(
cr
CommandRunner
,
imageRepository
string
,
kv
semver
.
Version
,
forceSystemd
bool
,
insecureRegistry
[]
string
)
error
{
cPath
:=
containerdConfigFile
t
,
err
:=
template
.
New
(
"containerd.config.toml"
)
.
Parse
(
containerdConfigTemplate
)
if
err
!=
nil
{
...
...
@@ -182,9 +187,11 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve
opts
:=
struct
{
PodInfraContainerImage
string
SystemdCgroup
bool
InsecureRegistry
[]
string
}{
PodInfraContainerImage
:
pauseImage
,
SystemdCgroup
:
forceSystemd
,
InsecureRegistry
:
insecureRegistry
,
}
var
b
bytes
.
Buffer
if
err
:=
t
.
Execute
(
&
b
,
opts
);
err
!=
nil
{
...
...
@@ -207,7 +214,7 @@ func (r *Containerd) Enable(disOthers, forceSystemd bool) error {
if
err
:=
populateCRIConfig
(
r
.
Runner
,
r
.
SocketPath
());
err
!=
nil
{
return
err
}
if
err
:=
generateContainerdConfig
(
r
.
Runner
,
r
.
ImageRepository
,
r
.
KubernetesVersion
,
forceSystemd
);
err
!=
nil
{
if
err
:=
generateContainerdConfig
(
r
.
Runner
,
r
.
ImageRepository
,
r
.
KubernetesVersion
,
forceSystemd
,
r
.
InsecureRegistry
);
err
!=
nil
{
return
err
}
if
err
:=
enableIPForwarding
(
r
.
Runner
);
err
!=
nil
{
...
...
pkg/minikube/cruntime/cruntime.go
浏览文件 @
08efbb88
...
...
@@ -130,6 +130,8 @@ type Config struct {
ImageRepository
string
// KubernetesVersion Kubernetes version
KubernetesVersion
semver
.
Version
// InsecureRegistry list of insecure registries
InsecureRegistry
[]
string
}
// ListOptions are the options to use for listing containers
...
...
@@ -168,6 +170,7 @@ func New(c Config) (Manager, error) {
ImageRepository
:
c
.
ImageRepository
,
KubernetesVersion
:
c
.
KubernetesVersion
,
Init
:
sm
,
InsecureRegistry
:
c
.
InsecureRegistry
,
},
nil
default
:
return
nil
,
fmt
.
Errorf
(
"unknown runtime type: %q"
,
c
.
Type
)
...
...
pkg/minikube/node/start.go
浏览文件 @
08efbb88
...
...
@@ -244,6 +244,7 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
Runner
:
runner
,
ImageRepository
:
cc
.
KubernetesConfig
.
ImageRepository
,
KubernetesVersion
:
kv
,
InsecureRegistry
:
cc
.
InsecureRegistry
,
}
cr
,
err
:=
cruntime
.
New
(
co
)
if
err
!=
nil
{
...
...
pkg/provision/provision.go
浏览文件 @
08efbb88
...
...
@@ -218,7 +218,7 @@ func setContainerRuntimeOptions(name string, p miniProvisioner) error {
case
"crio"
,
"cri-o"
:
return
setCrioOptions
(
p
)
case
"containerd"
:
return
setContainerdOptions
(
p
)
return
nil
default
:
_
,
err
:=
p
.
GenerateDockerOptions
(
engine
.
DefaultPort
)
return
err
...
...
@@ -249,35 +249,6 @@ CRIO_MINIKUBE_OPTIONS='{{ range .EngineOptions.InsecureRegistry }}--insecure-reg
return
nil
}
func
setContainerdOptions
(
p
provision
.
SSHCommander
)
error
{
// pass through --insecure-registry
var
(
containerdConfigTmpl
=
`[plugins]
[plugins.cri]
[plugins.cri.registry]
[plugins.cri.registry.mirrors]
{{ range .EngineOptions.InsecureRegistry -}}
[plugins.cri.registry.mirrors.\"{{. -}}\"]
endpoint = [\"{{. -}}\"]
{{ end -}}`
containerdConfigPath
=
"/etc/containerd/config.minikube.toml"
)
t
,
err
:=
template
.
New
(
"containerdConfigPath"
)
.
Parse
(
containerdConfigTmpl
)
if
err
!=
nil
{
return
err
}
var
containerdConfigBuf
bytes
.
Buffer
if
err
:=
t
.
Execute
(
&
containerdConfigBuf
,
p
);
err
!=
nil
{
return
err
}
if
_
,
err
=
p
.
SSHCommand
(
fmt
.
Sprintf
(
"sudo mkdir -p %s && printf %%s
\"
%s
\"
| sudo tee %s"
,
path
.
Dir
(
containerdConfigPath
),
containerdConfigBuf
.
String
(),
containerdConfigPath
));
err
!=
nil
{
return
err
}
return
nil
}
func
rootFileSystemType
(
p
provision
.
SSHCommander
)
(
string
,
error
)
{
fs
,
err
:=
p
.
SSHCommand
(
"df --output=fstype / | tail -n 1"
)
if
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录