cri: add deprecation warning for auths

samuelkarp · samuelkarp · commit ae8c58319d81 · 2023-11-08T23:12:25.000-08:00
Signed-off-by: Samuel Karp <samuelkarp@google.com> (cherry picked from commit 35924bc) Signed-off-by: Samuel Karp <samuelkarp@google.com>
diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go
@@ -439,7 +439,8 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) ([]deprecation.W
 			config.Auth = &auth
 			c.Registry.Configs[endpoint] = config
 		}
-		log.G(ctx).Warning("`auths` is deprecated, please use `configs` instead")
+		warnings = append(warnings, deprecation.CRIRegistryAuths)
+		log.G(ctx).Warning("`auths` is deprecated, please use `ImagePullSecrets` instead")
 	}
 
 	// Validation for stream_idle_timeout
diff --git a/pkg/cri/config/config_test.go b/pkg/cri/config/config_test.go
@@ -308,6 +308,7 @@ func TestValidateConfig(t *testing.T) {
 					},
 				},
 			},
+			warnings: []deprecation.Warning{deprecation.CRIRegistryAuths},
 		},
 		"invalid stream_idle_timeout": {
 			config: &PluginConfig{
diff --git a/pkg/deprecation/deprecation.go b/pkg/deprecation/deprecation.go
@@ -27,6 +27,8 @@ const (
 	GoPluginLibrary Warning = Prefix + "go-plugin-library"
 	// CRIRegistryMirrors is a warning for the use of the `mirrors` property
 	CRIRegistryMirrors Warning = Prefix + "cri-registry-mirrors"
+	// CRIRegistryAuths is a warning for the use of the `auths` property
+	CRIRegistryAuths Warning = Prefix + "cri-registry-auths"
 )
 
 var messages = map[Warning]string{
@@ -35,6 +37,8 @@ var messages = map[Warning]string{
 	GoPluginLibrary: "Dynamically-linked Go plugins as containerd runtimes are deprecated since containerd v2.0 and removed in containerd v2.1.",
 	CRIRegistryMirrors: "The `mirrors` property of `[plugins.\"io.containerd.grpc.v1.cri\".registry]` is deprecated since containerd v1.5 and will be removed in containerd v2.0." +
 		"Use `config_path` instead.",
+	CRIRegistryAuths: "The `auths` property of `[plugins.\"io.containerd.grpc.v1.cri\".registry]` is deprecated since containerd v1.3 and will be removed in containerd v2.0." +
+		"Use `ImagePullSecrets` instead.",
 }
 
 // Valid checks whether a given Warning is valid

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,8 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) ([]deprecation.W`
`439`	`439`	`config.Auth = &auth`
`440`	`440`	`c.Registry.Configs[endpoint] = config`
`441`	`441`	`}`
`442`		- log.G(ctx).Warning("`auths` is deprecated, please use `configs` instead")
	`442`	`+ warnings = append(warnings, deprecation.CRIRegistryAuths)`
	`443`	+ log.G(ctx).Warning("`auths` is deprecated, please use `ImagePullSecrets` instead")
`443`	`444`	`}`
`444`	`445`
`445`	`446`	`// Validation for stream_idle_timeout`