Merge pull request #17772 from hakman/automated-cherry-pick-of-#17755-upstream-release-1.34

Automated cherry pick of #17755: Include maxParallelImagePulls field in Kubelet config

Author: k8s-ci-robot

k8s/crds/kops.k8s.io_clusters.yaml

@@ -4364,6 +4364,14 @@ spec:
                     description: LogLevel is the logging level of the kubelet
                     format: int32
                     type: integer
+                  maxParallelImagePulls:
+                    description: |-
+                      MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+                      This field cannot be set if SerializeImagePulls is true.
+                      Setting it to nil means no limit.
+                      Default: nil
+                    format: int32
+                    type: integer
                   maxPods:
                     description: MaxPods is the number of pods that can run on this
                       Kubelet.
@@ -4818,6 +4826,14 @@ spec:
                     description: LogLevel is the logging level of the kubelet
                     format: int32
                     type: integer
+                  maxParallelImagePulls:
+                    description: |-
+                      MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+                      This field cannot be set if SerializeImagePulls is true.
+                      Setting it to nil means no limit.
+                      Default: nil
+                    format: int32
+                    type: integer
                   maxPods:
                     description: MaxPods is the number of pods that can run on this
                       Kubelet.

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -679,6 +679,14 @@ spec:
                     description: LogLevel is the logging level of the kubelet
                     format: int32
                     type: integer
+                  maxParallelImagePulls:
+                    description: |-
+                      MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+                      This field cannot be set if SerializeImagePulls is true.
+                      Setting it to nil means no limit.
+                      Default: nil
+                    format: int32
+                    type: integer
                   maxPods:
                     description: MaxPods is the number of pods that can run on this
                       Kubelet.

nodeup/pkg/model/kubelet.go

@@ -255,6 +255,7 @@ func buildKubeletComponentConfig(kubeletConfig *kops.KubeletConfigSpec, provider
 	if kubeletConfig.ImageMinimumGCAge != nil {
 		componentConfig.ImageMinimumGCAge = *kubeletConfig.ImageMinimumGCAge
 	}
+	componentConfig.MaxParallelImagePulls = kubeletConfig.MaxParallelImagePulls
 	componentConfig.MemorySwap.SwapBehavior = kubeletConfig.MemorySwapBehavior
 
 	s := runtime.NewScheme()

nodeup/pkg/model/kubelet_test.go

@@ -402,6 +402,7 @@ func Test_BuildComponentConfigFile(t *testing.T) {
 		ShutdownGracePeriodCriticalPods: &metav1.Duration{Duration: 10 * time.Second},
 		ImageMaximumGCAge:               &metav1.Duration{Duration: 30 * time.Hour},
 		ImageMinimumGCAge:               &metav1.Duration{Duration: 30 * time.Minute},
+		MaxParallelImagePulls:           fi.PtrTo(int32(5)),
 	}
 
 	_, err := buildKubeletComponentConfig(&componentConfig, "")

pkg/apis/kops/componentconfig.go

@@ -137,6 +137,11 @@ type KubeletConfigSpec struct {
 	// The default of this field is "0s", which disables this field--meaning images won't be garbage
 	// collected based on being unused for too long. Default: "0s" (disabled)
 	ImageMaximumGCAge *metav1.Duration `json:"imageMaximumGCAge,omitempty"`
+	// MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+	// This field cannot be set if SerializeImagePulls is true.
+	// Setting it to nil means no limit.
+	// Default: nil
+	MaxParallelImagePulls *int32 `json:"maxParallelImagePulls,omitempty"`
 	// ImageGCHighThresholdPercent is the percent of disk usage after which
 	// image garbage collection is always run.
 	ImageGCHighThresholdPercent *int32 `json:"imageGCHighThresholdPercent,omitempty" flag:"image-gc-high-threshold"`

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -137,6 +137,11 @@ type KubeletConfigSpec struct {
 	// The default of this field is "0s", which disables this field--meaning images won't be garbage
 	// collected based on being unused for too long. Default: "0s" (disabled)
 	ImageMaximumGCAge *metav1.Duration `json:"imageMaximumGCAge,omitempty"`
+	// MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+	// This field cannot be set if SerializeImagePulls is true.
+	// Setting it to nil means no limit.
+	// Default: nil
+	MaxParallelImagePulls *int32 `json:"maxParallelImagePulls,omitempty"`
 	// ImageGCHighThresholdPercent is the percent of disk usage after which
 	// image garbage collection is always run.
 	ImageGCHighThresholdPercent *int32 `json:"imageGCHighThresholdPercent,omitempty" flag:"image-gc-high-threshold"`

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -136,6 +136,11 @@ type KubeletConfigSpec struct {
 	// The default of this field is "0s", which disables this field--meaning images won't be garbage
 	// collected based on being unused for too long. Default: "0s" (disabled)
 	ImageMaximumGCAge *metav1.Duration `json:"imageMaximumGCAge,omitempty"`
+	// MaxParallelImagePulls sets the maximum number of image pulls in parallel.
+	// This field cannot be set if SerializeImagePulls is true.
+	// Setting it to nil means no limit.
+	// Default: nil
+	MaxParallelImagePulls *int32 `json:"maxParallelImagePulls,omitempty"`
 	// ImageGCHighThresholdPercent is the percent of disk usage after which
 	// image garbage collection is always run.
 	ImageGCHighThresholdPercent *int32 `json:"imageGCHighThresholdPercent,omitempty" flag:"image-gc-high-threshold"`