提交 d1713ff1 编写于 作者: A Author Name 提交者: Michael Henkel

add insecure registry support for containerd runtime

上级 2c60c126
......@@ -5,6 +5,7 @@ plugin_dir = ""
disabled_plugins = []
required_plugins = []
oom_score = 0
imports = ["/etc/containerd/config.minikube.toml"]
[grpc]
address = "/run/containerd/containerd.sock"
......
......@@ -5,6 +5,7 @@ plugin_dir = ""
disabled_plugins = []
required_plugins = []
oom_score = 0
imports = ["/etc/containerd/config.minikube.toml"]
[grpc]
address = "/run/containerd/containerd.sock"
......
......@@ -218,7 +218,7 @@ func setContainerRuntimeOptions(name string, p miniProvisioner) error {
case "crio", "cri-o":
return setCrioOptions(p)
case "containerd":
return nil
return setContainerdOptions(p)
default:
_, err := p.GenerateDockerOptions(engine.DefaultPort)
return err
......@@ -249,6 +249,35 @@ 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.
先完成此消息的编辑!
想要评论请 注册