Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Feb 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions k8s/crds/kops.k8s.io_instancegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/kops/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/kops/v1alpha2/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pkg/apis/kops/v1alpha3/componentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading