Address review comments

Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>

Author: hakman

k8s/crds/kops.k8s.io_clusters.yaml

@@ -4411,6 +4411,11 @@ spec:
                       PodCIDR is the CIDR to use for pod IP addresses, only used in standalone mode.
                       In cluster mode, this is obtained from the master.
                     type: string
+                  podInfraContainerImage:
+                    description: |-
+                      PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
+                      DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+                    type: string
                   podManifestPath:
                     description: config is the path to the config file or directory
                       of files
@@ -4861,6 +4866,11 @@ spec:
                       PodCIDR is the CIDR to use for pod IP addresses, only used in standalone mode.
                       In cluster mode, this is obtained from the master.
                     type: string
+                  podInfraContainerImage:
+                    description: |-
+                      PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
+                      DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+                    type: string
                   podManifestPath:
                     description: config is the path to the config file or directory
                       of files

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -728,6 +728,11 @@ spec:
                       PodCIDR is the CIDR to use for pod IP addresses, only used in standalone mode.
                       In cluster mode, this is obtained from the master.
                     type: string
+                  podInfraContainerImage:
+                    description: |-
+                      PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
+                      DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+                    type: string
                   podManifestPath:
                     description: config is the path to the config file or directory
                       of files

pkg/apis/kops/componentconfig.go

@@ -57,8 +57,8 @@ type KubeletConfigSpec struct {
 	// HostnameOverride is the hostname used to identify the kubelet instead of the actual hostname.
 	HostnameOverride string `json:"hostnameOverride,omitempty" flag:"hostname-override"`
 	// PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
-	// DEPRECATED: Image garbage collector will get sandbox image information from CRI
-	PodInfraContainerImage string `json:"-"`
+	// DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+	PodInfraContainerImage string `json:"podInfraContainerImage,omitempty"`
 	// SeccompDefault enables the use of `RuntimeDefault` as the default seccomp profile for all workloads.
 	SeccompDefault *bool `json:"seccompDefault,omitempty" flag:"seccomp-default"`
 	// SeccompProfileRoot is the directory path for seccomp profiles.

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -57,8 +57,8 @@ type KubeletConfigSpec struct {
 	// HostnameOverride is the hostname used to identify the kubelet instead of the actual hostname.
 	HostnameOverride string `json:"hostnameOverride,omitempty" flag:"hostname-override"`
 	// PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
-	// DEPRECATED: Image garbage collector will get sandbox image information from CRI
-	PodInfraContainerImage string `json:"-"`
+	// DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+	PodInfraContainerImage string `json:"podInfraContainerImage,omitempty"`
 	// SeccompDefault enables the use of `RuntimeDefault` as the default seccomp profile for all workloads.
 	SeccompDefault *bool `json:"seccompDefault,omitempty" flag:"seccomp-default"`
 	// SeccompProfileRoot is the directory path for seccomp profiles.

pkg/apis/kops/v1alpha3/componentconfig.go

@@ -57,8 +57,8 @@ type KubeletConfigSpec struct {
 	// HostnameOverride is not admin-configurable.
 	HostnameOverride string `json:"-"`
 	// PodInfraContainerImage is the image whose network/ipc containers in each pod will use.
-	// DEPRECATED: Image garbage collector will get sandbox image information from CRI
-	PodInfraContainerImage string `json:"-"`
+	// DEPRECATED: Image garbage collector will get sandbox image information from CRI.
+	PodInfraContainerImage string `json:"podInfraContainerImage,omitempty"`
 	// SeccompDefault enables the use of `RuntimeDefault` as the default seccomp profile for all workloads.
 	SeccompDefault *bool `json:"seccompDefault,omitempty" flag:"seccomp-default"`
 	// SeccompProfileRoot is the directory path for seccomp profiles.

pkg/apis/kops/validation/validation.go

@@ -913,11 +913,10 @@ func validateKubelet(k *kops.KubeletConfigSpec, c *kops.Cluster, kubeletPath *fi
 		}
 
 		{
-			// Flag removed in 1.6
 			if k.PodInfraContainerImage != "" {
 				allErrs = append(allErrs, field.Forbidden(
 					kubeletPath.Child("podInfraContainerImage"),
-					"pod-infra-container-image flag was removed in 1.35, use containerd.sandboxImage instead"))
+					"pod-infra-container-image flag was deprecated in 1.29 and removed in 1.35, use containerd.sandboxImage instead"))
 			}
 		}