CRI: remove deprecated config properties (auths, configs, mirrors)#9766
CRI: remove deprecated config properties (auths, configs, mirrors)#9766AkihiroSuda wants to merge 1 commit intocontainerd:mainfrom
auths, configs, mirrors)#9766Conversation
ac75d67 to
0ec8de1
Compare
Remove the following config properties in `/etc/containerd/config.toml`: | Property Group | Property | Deprecation release | Target release for removal | Recommendation | |-------------------------------------------------|------------|---------------------|----------------------------|------------------------| |`[plugins."io.containerd.grpc.v1.cri".registry]` | `auths` | containerd v1.3 | containerd v2.0 ✅ | Use `ImagePullSecrets` | |`[plugins."io.containerd.grpc.v1.cri".registry]` | `configs` | containerd v1.5 | containerd v2.0 ✅ | Use `config_path` | |`[plugins."io.containerd.grpc.v1.cri".registry]` | `mirrors` | containerd v1.5 | containerd v2.0 ✅ | Use `config_path` | The toml properties are still kept for printing human-readable errors, but the properties will be completely removed in v2.1. Signed-off-by: Akihiro Suda <[email protected]>
0ec8de1 to
8313a1c
Compare
|
@AkihiroSuda: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
| if useConfigPath { | ||
| return warnings, errors.New("`mirrors` cannot be set when `config_path` is provided") | ||
| } | ||
| warnings = append(warnings, deprecation.CRIRegistryMirrors) |
There was a problem hiding this comment.
Can you remove deprecation.CRIRegistryMirrors?
| } | ||
|
|
||
| if len(c.Registry.Configs) != 0 { | ||
| warnings = append(warnings, deprecation.CRIRegistryConfigs) |
There was a problem hiding this comment.
Can you remove deprecation.CRIRegistryConfigs?
| config.Auth = &auth | ||
| c.Registry.Configs[endpoint] = config | ||
| } | ||
| warnings = append(warnings, deprecation.CRIRegistryAuths) |
There was a problem hiding this comment.
Can you remove deprecation.CRIRegistryAuths?
There was a problem hiding this comment.
don't have a replacement for cri auth yet..
There was a problem hiding this comment.
Looks like we have to postpone removal of legacy config, although we may disable it by default and require an env var like CONTAINERD_DEPRECATED_ENABLE_CONTAINERD14_CONFIG
We'll need the prowjob to be updated to remove its use of |
adisky
left a comment
There was a problem hiding this comment.
registry mirrors needs to be updated at following places
https://github.com/kubernetes/test-infra/blob/master/jobs/e2e_node/containerd/config.toml#L31
https://github.com/containerd/containerd/blob/main/contrib/gce/configure.sh#L226
|
PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
I guess we should postpone this to v2.1 |
|
This PR is stale because it has been open 90 days with no activity. This PR will be closed in 7 days unless new comments are made or the stale label is removed. |
|
This PR was closed because it has been stalled for 7 days with no activity. |
Note
The removal is likely going to be postponed to v2.1
Remove the following config properties in
/etc/containerd/config.toml:[plugins."io.containerd.grpc.v1.cri".registry]authsImagePullSecrets. See also #8228.[plugins."io.containerd.grpc.v1.cri".registry]configsconfig_path[plugins."io.containerd.grpc.v1.cri".registry]mirrorsconfig_pathThe toml properties are still kept for printing human-readable errors, but the properties will be completely removed in v2.1.
Depends on:
jobs/e2e_node/containerd: Migrate deprecated[plugins."io.containerd.grpc.v1.cri".registry.mirrors]toconfig_pathkubernetes/test-infra#31851