github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cri: add deprecation warning for auths

Browse Source 
Signed-off-by: Samuel Karp <samuelkarp@google.com>
This commit is contained in:
Samuel Karp 2023-11-01 17:25:40 -07:00
parent d7cb25d770
commit 35924bccc0
No known key found for this signature in database
GPG Key ID: 997C5A3CD3167CB5
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cri/config/config.go
View File

@ -420,7 +420,8 @@ func ValidatePluginConfig(ctx context.Context, c *PluginConfig) ([]deprecation.W
config.Auth = &auth config.Auth = &auth
c.Registry.Configs[endpoint] = config 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 // Validation for stream_idle_timeout

1
pkg/cri/config/config_test.go
View File

@ -81,6 +81,7 @@ func TestValidateConfig(t *testing.T) {
}, },
}, },
}, },
warnings: []deprecation.Warning{deprecation.CRIRegistryAuths},
}, },
"invalid stream_idle_timeout": { "invalid stream_idle_timeout": {
config: &PluginConfig{ config: &PluginConfig{

4
pkg/deprecation/deprecation.go
View File

@ -27,6 +27,8 @@ const (
GoPluginLibrary Warning = Prefix + "go-plugin-library" GoPluginLibrary Warning = Prefix + "go-plugin-library"
// CRIRegistryMirrors is a warning for the use of the `mirrors` property // CRIRegistryMirrors is a warning for the use of the `mirrors` property
CRIRegistryMirrors Warning = Prefix + "cri-registry-mirrors" 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{ 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.", 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." + 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.", "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 // Valid checks whether a given Warning is valid