From 37d6c42368a3e139fb516064ff4eb9637f197c7a Mon Sep 17 00:00:00 2001 From: Chris Henzie Date: Thu, 8 May 2025 13:09:49 -0700 Subject: [PATCH] Update removal version for deprecated registry config fields Config deprecations were postponed to 2.2: https://github.com/containerd/containerd/pull/11684 Signed-off-by: Chris Henzie --- internal/cri/config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/cri/config/config.go b/internal/cri/config/config.go index ea5267e9e3..6f8f2d1282 100644 --- a/internal/cri/config/config.go +++ b/internal/cri/config/config.go @@ -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