From e24864e48e30e1009a88637d410d6c4df39c3098 Mon Sep 17 00:00:00 2001 From: Chris Henzie Date: Fri, 22 Nov 2024 15:09:39 -0800 Subject: [PATCH] Clarify release for deprecated registry field removals RELEASES.md specifies these will be removed in 2.1: https://github.com/containerd/containerd/blob/v2.0.0/RELEASES.md#deprecated-config-properties Signed-off-by: Chris Henzie --- internal/cri/config/config.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/internal/cri/config/config.go b/internal/cri/config/config.go index a5c6b1d5b..069595d9a 100644 --- a/internal/cri/config/config.go +++ b/internal/cri/config/config.go @@ -220,15 +220,18 @@ 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.0. + // DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1. + // 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. + // DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1. + // 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.0, supported in 1.x releases. + // DEPRECATED: Use ConfigPath instead. Remove in containerd 2.1. + // Supported in 1.x releases. Auths map[string]AuthConfig `toml:"auths" json:"auths"` // Headers adds additional HTTP headers that get sent to all registries Headers map[string][]string `toml:"headers" json:"headers"`