dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-09 01:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11835 from k8s-infra-cherrypick-robot/cherry-pick-11829-to-release/2.1

Browse Source 
[release/2.1] Update removal version for deprecated registry config fields
This commit is contained in:
Akihiro Suda
2025-05-11 01:35:47 +09:00
committed by GitHub
parent 3b1062a15f 37d6c42368
commit fdac3d200a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/cri/config/config.go
View File

@@ -231,17 +231,17 @@ type Registry struct {
ConfigPath string `toml:"config_path" json:"configPath"`
// Mirrors are namespace to mirror mapping for all namespaces.
// This option will not be used when ConfigPath is provided.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.2.
// Supported in 1.x releases.
Mirrors map[string]Mirror `toml:"mirrors" json:"mirrors"`
// Configs are configs for each registry.
// The key is the domain name or IP of the registry.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.2.
// Supported in 1.x releases.
Configs map[string]RegistryConfig `toml:"configs" json:"configs"`
// Auths are registry endpoint to auth config mapping. The registry endpoint must
// be a valid url with host specified.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1.
// DEPRECATED: Use ConfigPath instead. Remove in containerd 2.2.
// Supported in 1.x releases.
Auths map[string]AuthConfig `toml:"auths" json:"auths"`
// Headers adds additional HTTP headers that get sent to all registries