Merge pull request #12987 from k8s-infra-cherrypick-robot/cherry-pick-12617-to-release/2.2

samuelkarp · web-flow · commit 5dc7bb27ef38 · 2026-03-06T18:57:07.000-08:00
[release/2.2] fix migrated cri image config when using registry
diff --git a/internal/cri/config/config_unix.go b/internal/cri/config/config_unix.go
@@ -32,9 +32,7 @@ func DefaultImageConfig() ImageConfig {
 		Snapshotter:                defaults.DefaultSnapshotter,
 		DisableSnapshotAnnotations: true,
 		MaxConcurrentDownloads:     3,
-		Registry: Registry{
-			ConfigPath: "/etc/containerd/certs.d:/etc/docker/certs.d",
-		},
+		Registry:                   Registry{},
 		ImageDecryption: ImageDecryption{
 			KeyModel: KeyModelNode,
 		},
diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go
@@ -61,6 +61,16 @@ func init() {
 			}
 			mdb := m.(*metadata.DB)
 
+			// only set the default value of config path, if both mirrors and
+			// config path are empty and we are on Linux.
+			// This also makes sure that if the loaded config already contains both config path and mirrors
+			// the validation will fail.
+			if runtime.GOOS == "linux" {
+				if config.Registry.ConfigPath == "" && len(config.Registry.Mirrors) == 0 {
+					config.Registry.ConfigPath = "/etc/containerd/certs.d:/etc/docker/certs.d"
+				}
+			}
+
 			if warnings, err := criconfig.ValidateImageConfig(ic.Context, &config); err != nil {
 				return nil, fmt.Errorf("invalid cri image config: %w", err)
 			} else if len(warnings) > 0 {
@@ -210,18 +220,6 @@ func migrateConfig(dst, src map[string]interface{}) {
 			dst[key] = val
 		}
 	}
-	if runtime.GOOS == "linux" {
-		if value, ok := dst["registry"]; ok {
-			regMap := value.(map[string]any)
-			if configPath, ok := regMap["config_path"]; ok {
-				if configPath == "" {
-					// Fill in default from config_unix.go (DefaultImageConfig)
-					regMap["config_path"] = "/etc/containerd/certs.d:/etc/docker/certs.d"
-				}
-			}
-			dst["registry"] = regMap
-		}
-	}
 
 	containerdConf, ok := src["containerd"]
 	if !ok {
