Fix missing migration for containerd registry.configs plugin namespace

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Fix missing migration for containerd registry.configs plugin namespace
06981c78 · Brad Davidson · Brad Davidson · 103e6b33 · 06981c78
Commit 06981c78 authored Feb 21, 2025 by Brad Davidson Committed by Brad Davidson Feb 20, 2025
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

templates.go pkg/agent/templates/templates.go +4 -4

No files found.
--- a/pkg/agent/templates/templates.go
+++ b/pkg/agent/templates/templates.go
@@ -198,9 +198,6 @@ state = {{ printf "%q" .NodeConfig.Containerd.State }}
  sandbox = "{{ . }}"
 {{ end }}

-[plugins.'io.containerd.cri.v1.images'.registry]
-  config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }}
-
 {{- if or .NodeConfig.AgentConfig.CNIBinDir .NodeConfig.AgentConfig.CNIConfDir }}
 [plugins.'io.containerd.cri.v1.runtime'.cni]
  {{ with .NodeConfig.AgentConfig.CNIBinDir }}bin_dir = {{ printf "%q" . }}{{ end }}
@@ -237,10 +234,13 @@ state = {{ printf "%q" .NodeConfig.Containerd.State }}
 {{ end }}
 {{ end }}

+[plugins.'io.containerd.cri.v1.images'.registry]
+  config_path = {{ printf "%q" .NodeConfig.Containerd.Registry }}
+
 {{ if .PrivateRegistryConfig }}
 {{ range $k, $v := .PrivateRegistryConfig.Configs }}
 {{ with $v.Auth }}
-[plugins.'io.containerd.grpc.v1.cri'.registry.configs.'{{ $k }}'.auth]
+[plugins.'io.containerd.cri.v1.images'.registry.configs.'{{ $k }}'.auth]
  {{ with .Username }}username = {{ printf "%q" . }}{{ end }}
  {{ with .Password }}password = {{ printf "%q" . }}{{ end }}
  {{ with .Auth }}auth = {{ printf "%q" . }}{{ end }}