fix: update config.tmpl

turintech · Jan 20, 2024 · 7264c76 · 7264c76
1 parent 5cdee59
commit 7264c76
Showing 1 changed file with 19 additions and 82 deletions.
diff --git a/docs/usage/advanced/cuda/config.toml.tmpl b/docs/usage/advanced/cuda/config.toml.tmpl
@@ -1,18 +1,12 @@
-version = 2
-
-[plugins."io.containerd.internal.v1.opt"]
+[plugins.opt]
  path = "{{ .NodeConfig.Containerd.Opt }}"
-[plugins."io.containerd.grpc.v1.cri"]
+
+[plugins.cri]
  stream_server_address = "127.0.0.1"
  stream_server_port = "10010"
- enable_selinux = {{ .NodeConfig.SELinux }}
- enable_unprivileged_ports = {{ .EnableUnprivileged }}
- enable_unprivileged_icmp = {{ .EnableUnprivileged }}
 
-{{- if .DisableCgroup}}
- disable_cgroup = true
-{{end}}
 {{- if .IsRunningInUserNS }}
+ disable_cgroup = true
  disable_apparmor = true
  restrict_oom_score_adj = true
 {{end}}
@@ -21,98 +15,41 @@ version = 2
  sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
 {{end}}
 
-{{- if .NodeConfig.AgentConfig.Snapshotter }}
-[plugins."io.containerd.grpc.v1.cri".containerd]
- default_runtime_name = "nvidia"
- snapshotter = "{{ .NodeConfig.AgentConfig.Snapshotter }}"
- disable_snapshot_annotations = {{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }}false{{else}}true{{end}}
-{{ if eq .NodeConfig.AgentConfig.Snapshotter "stargz" }}
-{{ if .NodeConfig.AgentConfig.ImageServiceSocket }}
-[plugins."io.containerd.snapshotter.v1.stargz"]
-cri_keychain_image_service_path = "{{ .NodeConfig.AgentConfig.ImageServiceSocket }}"
-[plugins."io.containerd.snapshotter.v1.stargz".cri_keychain]
-enable_keychain = true
-{{end}}
-{{ if .PrivateRegistryConfig }}
-{{ if .PrivateRegistryConfig.Mirrors }}
-[plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors]{{end}}
-{{range $k, $v := .PrivateRegistryConfig.Mirrors }}
-[plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors."{{$k}}"]
- endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
-{{if $v.Rewrites}}
- [plugins."io.containerd.snapshotter.v1.stargz".registry.mirrors."{{$k}}".rewrite]
-{{range $pattern, $replace := $v.Rewrites}}
- "{{$pattern}}" = "{{$replace}}"
-{{end}}
-{{end}}
-{{end}}
-{{range $k, $v := .PrivateRegistryConfig.Configs }}
-{{ if $v.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.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}}
- {{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}}
- {{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}}
-{{end}}
-{{ if $v.TLS }}
-[plugins."io.containerd.snapshotter.v1.stargz".registry.configs."{{$k}}".tls]
- {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
- {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
- {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
- {{ if $v.TLS.InsecureSkipVerify }}insecure_skip_verify = true{{end}}
-{{end}}
-{{end}}
-{{end}}
-{{end}}
-{{end}}
-
 {{- if not .NodeConfig.NoFlannel }}
-[plugins."io.containerd.grpc.v1.cri".cni]
+[plugins.cri.cni]
  bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
  conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
 {{end}}
 
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
- runtime_type = "io.containerd.runc.v2"
+[plugins.cri.containerd.runtimes.runc]
+ # ---- changed from 'io.containerd.runc.v2' for GPU support
+ runtime_type = "io.containerd.runtime.v1.linux"
 
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
- SystemdCgroup = {{ .SystemdCgroup }}
+# ---- added for GPU support
+[plugins.linux]
+ runtime = "nvidia-container-runtime"
 
 {{ if .PrivateRegistryConfig }}
 {{ if .PrivateRegistryConfig.Mirrors }}
-[plugins."io.containerd.grpc.v1.cri".registry.mirrors]{{end}}
+[plugins.cri.registry.mirrors]{{end}}
 {{range $k, $v := .PrivateRegistryConfig.Mirrors }}
-[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{$k}}"]
+[plugins.cri.registry.mirrors."{{$k}}"]
  endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
-{{if $v.Rewrites}}
- [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{$k}}".rewrite]
-{{range $pattern, $replace := $v.Rewrites}}
- "{{$pattern}}" = "{{$replace}}"
-{{end}}
-{{end}}
 {{end}}
 
 {{range $k, $v := .PrivateRegistryConfig.Configs }}
 {{ if $v.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.Password }}password = {{ printf "%q" $v.Auth.Password }}{{end}}
- {{ if $v.Auth.Auth }}auth = {{ printf "%q" $v.Auth.Auth }}{{end}}
- {{ if $v.Auth.IdentityToken }}identitytoken = {{ printf "%q" $v.Auth.IdentityToken }}{{end}}
+[plugins.cri.registry.configs."{{$k}}".auth]
+ {{ if $v.Auth.Username }}username = "{{ $v.Auth.Username }}"{{end}}
+ {{ if $v.Auth.Password }}password = "{{ $v.Auth.Password }}"{{end}}
+ {{ if $v.Auth.Auth }}auth = "{{ $v.Auth.Auth }}"{{end}}
+ {{ if $v.Auth.IdentityToken }}identitytoken = "{{ $v.Auth.IdentityToken }}"{{end}}
 {{end}}
 {{ if $v.TLS }}
-[plugins."io.containerd.grpc.v1.cri".registry.configs."{{$k}}".tls]
+[plugins.cri.registry.configs."{{$k}}".tls]
  {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
  {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
  {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
- {{ if $v.TLS.InsecureSkipVerify }}insecure_skip_verify = true{{end}}
-{{end}}
 {{end}}
 {{end}}
-
-{{range $k, $v := .ExtraRuntimes}}
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes."{{$k}}"]
- runtime_type = "{{$v.RuntimeType}}"
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes."{{$k}}".options]
- BinaryName = "{{$v.BinaryName}}"
 {{end}}