Merge pull request #16320 from hakman/automated-cherry-pick-of-#16318…

…-upstream-release-1.28

Automated cherry pick of #16318: added image minimum and maximum gc age

k8s/crds/kops.k8s.io_clusters.yaml

@@ -3814,6 +3814,17 @@ spec:
                       disk usage to garbage collect to.
                     format: int32
                     type: integer
+                  imageMaximumGCAge:
+                    description: 'imageMaximumGCAge is the maximum age an image can
+                      be unused before it is garbage collected. 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)'
+                    type: string
+                  imageMinimumGCAge:
+                    description: 'imageMinimumGCAge is the minimum age for an unused
+                      image before it is garbage collected. Default: "2m"'
+                    type: string
                   imagePullProgressDeadline:
                     description: ImagePullProgressDeadline is the timeout for image
                       pulls If no pulling progress is made before this deadline, the
@@ -4255,6 +4266,17 @@ spec:
                       disk usage to garbage collect to.
                     format: int32
                     type: integer
+                  imageMaximumGCAge:
+                    description: 'imageMaximumGCAge is the maximum age an image can
+                      be unused before it is garbage collected. 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)'
+                    type: string
+                  imageMinimumGCAge:
+                    description: 'imageMinimumGCAge is the minimum age for an unused
+                      image before it is garbage collected. Default: "2m"'
+                    type: string
                   imagePullProgressDeadline:
                     description: ImagePullProgressDeadline is the timeout for image
                       pulls If no pulling progress is made before this deadline, the

k8s/crds/kops.k8s.io_instancegroups.yaml

@@ -585,6 +585,17 @@ spec:
                       disk usage to garbage collect to.
                     format: int32
                     type: integer
+                  imageMaximumGCAge:
+                    description: 'imageMaximumGCAge is the maximum age an image can
+                      be unused before it is garbage collected. 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)'
+                    type: string
+                  imageMinimumGCAge:
+                    description: 'imageMinimumGCAge is the minimum age for an unused
+                      image before it is garbage collected. Default: "2m"'
+                    type: string
                   imagePullProgressDeadline:
                     description: ImagePullProgressDeadline is the timeout for image
                       pulls If no pulling progress is made before this deadline, the

pkg/apis/kops/componentconfig.go

@@ -133,6 +133,12 @@ type KubeletConfigSpec struct {
 	// and overrides the default MTU for cases where it cannot be automatically
 	// computed (such as IPSEC).
 	NetworkPluginMTU *int32 `json:"networkPluginMTU,omitempty" flag:"network-plugin-mtu"`
+	// imageMinimumGCAge is the minimum age for an unused image before it is garbage collected. Default: "2m"
+	ImageMinimumGCAge *string `json:"imageMinimumGCAge,omitempty" flag:"image-minimum-gc-age"`
+	// imageMaximumGCAge is the maximum age an image can be unused before it is garbage collected.
+	// 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 *string `json:"imageMaximumGCAge,omitempty" flag:"image-maximum-gc-age"`
 	// 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

@@ -133,6 +133,12 @@ type KubeletConfigSpec struct {
 	// and overrides the default MTU for cases where it cannot be automatically
 	// computed (such as IPSEC).
 	NetworkPluginMTU *int32 `json:"networkPluginMTU,omitempty" flag:"network-plugin-mtu"`
+	// imageMinimumGCAge is the minimum age for an unused image before it is garbage collected. Default: "2m"
+	ImageMinimumGCAge *string `json:"imageMinimumGCAge,omitempty" flag:"image-minimum-gc-age"`
+	// imageMaximumGCAge is the maximum age an image can be unused before it is garbage collected.
+	// 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 *string `json:"imageMaximumGCAge,omitempty" flag:"image-maximum-gc-age"`
 	// 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/v1alpha3/componentconfig.go

@@ -132,6 +132,12 @@ type KubeletConfigSpec struct {
 	// and overrides the default MTU for cases where it cannot be automatically
 	// computed (such as IPSEC).
 	NetworkPluginMTU *int32 `json:"networkPluginMTU,omitempty" flag:"network-plugin-mtu"`
+	// imageMinimumGCAge is the minimum age for an unused image before it is garbage collected. Default: "2m"
+	ImageMinimumGCAge *string `json:"imageMinimumGCAge,omitempty" flag:"image-minimum-gc-age"`
+	// imageMaximumGCAge is the maximum age an image can be unused before it is garbage collected.
+	// 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 *string `json:"imageMaximumGCAge,omitempty" flag:"image-maximum-gc-age"`
 	// 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"`