Skip to content

K
k3s
Commit df28b12a authored by Petri Kivikangas's avatar Petri Kivikangas Committed by Brad Davidson
Browse files
Options

Convert containerd config.toml.tmpl Linux template to v2 syntax

Signed-off-by: 's avatarPetri Kivikangas <36138+Kitanotori@users.noreply.github.com> Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 2c8cb2ed
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
pkg/agent/templates/templates_linux.go
View file @ df28b12a
...@@ -8,10 +8,11 @@ import ( ...@@ -8,10 +8,11 @@ import (
) )
const ContainerdConfigTemplate = ` const ContainerdConfigTemplate = `
[plugins.opt] version = 2
path = "{{ .NodeConfig.Containerd.Opt }}"
[plugins.cri] [plugins."io.containerd.internal.v1.opt"]
path = "{{ .NodeConfig.Containerd.Opt }}"
[plugins."io.containerd.grpc.v1.cri"]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
stream_server_port = "10010" stream_server_port = "10010"
enable_selinux = {{ .NodeConfig.SELinux }} enable_selinux = {{ .NodeConfig.SELinux }}
...@@ -29,24 +30,24 @@ const ContainerdConfigTemplate = ` ...@@ -29,24 +30,24 @@ const ContainerdConfigTemplate = `
{{end}} {{end}}
{{- if .NodeConfig.AgentConfig.Snapshotter }} {{- if .NodeConfig.AgentConfig.Snapshotter }}
[plugins.cri.containerd] [plugins."io.containerd.grpc.v1.cri".containerd]
snapshotter = "{{ .NodeConfig.AgentConfig.Snapshotter }}" snapshotter = "{{ .NodeConfig.AgentConfig.Snapshotter }}"
disable_snapshot_annotations = {{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }}false{{else}}true{{end}} disable_snapshot_annotations = {{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }}false{{else}}true{{end}}
{{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }} {{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }}
{{ if .NodeConfig.AgentConfig.ImageServiceSocket }} {{ if .NodeConfig.AgentConfig.ImageServiceSocket }}
[plugins.stargz] [plugins."io.containerd.snapshotter.v1.stargz"]
cri_keychain_image_service_path = "{{ .NodeConfig.AgentConfig.ImageServiceSocket }}" cri_keychain_image_service_path = "{{ .NodeConfig.AgentConfig.ImageServiceSocket }}"
[plugins.stargz.cri_keychain] [plugins."io.containerd.snapshotter.v1.stargz".cri_keychain]
enable_keychain = true enable_keychain = true
{{end}} {{end}}
{{ if .PrivateRegistryConfig }} {{ if .PrivateRegistryConfig }}
{{ if .PrivateRegistryConfig.Mirrors }} {{ if .PrivateRegistryConfig.Mirrors }}
[plugins.stargz.registry.mirrors]{{end}} [plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors]{{end}}
{{range $k, $v := .PrivateRegistryConfig.Mirrors }} {{range $k, $v := .PrivateRegistryConfig.Mirrors }}
[plugins.stargz.registry.mirrors."{{$k}}"] [plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors."{{$k}}"]
endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}] endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
{{if $v.Rewrites}} {{if $v.Rewrites}}
[plugins.stargz.registry.mirrors."{{$k}}".rewrite] [plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors."{{$k}}".rewrite]
{{range $pattern, $replace := $v.Rewrites}} {{range $pattern, $replace := $v.Rewrites}}
"{{$pattern}}" = "{{$replace}}" "{{$pattern}}" = "{{$replace}}"
{{end}} {{end}}
...@@ -54,14 +55,14 @@ enable_keychain = true ...@@ -54,14 +55,14 @@ enable_keychain = true
{{end}} {{end}}
{{range $k, $v := .PrivateRegistryConfig.Configs }} {{range $k, $v := .PrivateRegistryConfig.Configs }}
{{ if $v.Auth }} {{ if $v.Auth }}
[plugins.stargz.registry.configs."{{$k}}".auth] [plugins."io.containerd.snapshotter.v1.stargz".registry.configs."{{$k}}".auth]
{{ if $v.Auth.Username }}username = {{ printf "%q" $v.Auth.Username }}{{end}} {{ if $v.Auth.Username }}username = {{ printf "%q" $v.Auth.Username }}{{end}}
{{ if $v.Auth.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}} {{ if $v.Auth.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}}
{{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}} {{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}}
{{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}} {{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}}
{{end}} {{end}}
{{ if $v.TLS }} {{ if $v.TLS }}
[plugins.stargz.registry.configs."{{$k}}".tls] [plugins."io.containerd.snapshotter.v1.stargz".registry.configs."{{$k}}".tls]
{{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}} {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
{{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}} {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
{{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}} {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
...@@ -73,25 +74,25 @@ enable_keychain = true ...@@ -73,25 +74,25 @@ enable_keychain = true
{{end}} {{end}}
{{- if not .NodeConfig.NoFlannel }} {{- if not .NodeConfig.NoFlannel }}
[plugins.cri.cni] [plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
{{end}} {{end}}
[plugins.cri.containerd.runtimes.runc] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2" runtime_type = "io.containerd.runc.v2"
[plugins.cri.containerd.runtimes.runc.options] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = {{ .SystemdCgroup }} SystemdCgroup = {{ .SystemdCgroup }}
{{ if .PrivateRegistryConfig }} {{ if .PrivateRegistryConfig }}
{{ if .PrivateRegistryConfig.Mirrors }} {{ if .PrivateRegistryConfig.Mirrors }}
[plugins.cri.registry.mirrors]{{end}} [plugins."io.containerd.grpc.v1.cri".registry.mirrors]{{end}}
{{range $k, $v := .PrivateRegistryConfig.Mirrors }} {{range $k, $v := .PrivateRegistryConfig.Mirrors }}
[plugins.cri.registry.mirrors."{{$k}}"] [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{$k}}"]
endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}] endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
{{if $v.Rewrites}} {{if $v.Rewrites}}
[plugins.cri.registry.mirrors."{{$k}}".rewrite] [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{$k}}".rewrite]
{{range $pattern, $replace := $v.Rewrites}} {{range $pattern, $replace := $v.Rewrites}}
"{{$pattern}}" = "{{$replace}}" "{{$pattern}}" = "{{$replace}}"
{{end}} {{end}}
...@@ -100,14 +101,14 @@ enable_keychain = true ...@@ -100,14 +101,14 @@ enable_keychain = true
{{range $k, $v := .PrivateRegistryConfig.Configs }} {{range $k, $v := .PrivateRegistryConfig.Configs }}
{{ if $v.Auth }} {{ if $v.Auth }}
[plugins.cri.registry.configs."{{$k}}".auth] [plugins."io.containerd.grpc.v1.cri".registry.configs."{{$k}}".auth]
{{ if $v.Auth.Username }}username = {{ printf "%q" $v.Auth.Username }}{{end}} {{ if $v.Auth.Username }}username = {{ printf "%q" $v.Auth.Username }}{{end}}
{{ if $v.Auth.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}} {{ if $v.Auth.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}}
{{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}} {{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}}
{{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}} {{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}}
{{end}} {{end}}
{{ if $v.TLS }} {{ if $v.TLS }}
[plugins.cri.registry.configs."{{$k}}".tls] [plugins."io.containerd.grpc.v1.cri".registry.configs."{{$k}}".tls]
{{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}} {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
{{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}} {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
{{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}} {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
...@@ -117,9 +118,9 @@ enable_keychain = true ...@@ -117,9 +118,9 @@ enable_keychain = true
{{end}} {{end}}
{{range $k, $v := .ExtraRuntimes}} {{range $k, $v := .ExtraRuntimes}}
[plugins.cri.containerd.runtimes."{{$k}}"] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes."{{$k}}"]
runtime_type = "{{$v.RuntimeType}}" runtime_type = "{{$v.RuntimeType}}"
[plugins.cri.containerd.runtimes."{{$k}}".options] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes."{{$k}}".options]
BinaryName = "{{$v.BinaryName}}" BinaryName = "{{$v.BinaryName}}"
{{end}} {{end}}
` `
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment