kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16318 from Lerentis/master 

feat: added image minimum and maximum gc age
This commit is contained in:
Kubernetes Prow Robot 2024-02-03 11:43:47 -08:00 committed by GitHub
parent 90fa037c0e 311f40245f
commit 01705a6da3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -4073,6 +4073,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
@ -4511,6 +4522,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

11
k8s/crds/kops.k8s.io_instancegroups.yaml
View File

@ -606,6 +606,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

6
pkg/apis/kops/componentconfig.go
View File

@ -130,6 +130,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"`

6
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -130,6 +130,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"`

4
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -5478,6 +5478,8 @@ func autoConvert_v1alpha2_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageMinimumGCAge = in.ImageMinimumGCAge
out.ImageMaximumGCAge = in.ImageMaximumGCAge
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
@ -5580,6 +5582,8 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageMinimumGCAge = in.ImageMinimumGCAge
out.ImageMaximumGCAge = in.ImageMaximumGCAge
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline

10
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -3993,6 +3993,16 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
*out = new(int32)
**out = **in
}
if in.ImageMinimumGCAge != nil {
in, out := &in.ImageMinimumGCAge, &out.ImageMinimumGCAge
*out = new(string)
**out = **in
}
if in.ImageMaximumGCAge != nil {
in, out := &in.ImageMaximumGCAge, &out.ImageMaximumGCAge
*out = new(string)
**out = **in
}
if in.ImageGCHighThresholdPercent != nil {
in, out := &in.ImageGCHighThresholdPercent, &out.ImageGCHighThresholdPercent
*out = new(int32)

6
pkg/apis/kops/v1alpha3/componentconfig.go
View File

@ -129,6 +129,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"`

4
pkg/apis/kops/v1alpha3/zz_generated.conversion.go generated
View File

@ -5871,6 +5871,8 @@ func autoConvert_v1alpha3_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageMinimumGCAge = in.ImageMinimumGCAge
out.ImageMaximumGCAge = in.ImageMaximumGCAge
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline
@ -5973,6 +5975,8 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha3_KubeletConfigSpec(in *kops.K
out.NonMasqueradeCIDR = in.NonMasqueradeCIDR
out.EnableCustomMetrics = in.EnableCustomMetrics
out.NetworkPluginMTU = in.NetworkPluginMTU
out.ImageMinimumGCAge = in.ImageMinimumGCAge
out.ImageMaximumGCAge = in.ImageMaximumGCAge
out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent
out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent
out.ImagePullProgressDeadline = in.ImagePullProgressDeadline

10
pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go generated
View File

@ -3967,6 +3967,16 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
*out = new(int32)
**out = **in
}
if in.ImageMinimumGCAge != nil {
in, out := &in.ImageMinimumGCAge, &out.ImageMinimumGCAge
*out = new(string)
**out = **in
}
if in.ImageMaximumGCAge != nil {
in, out := &in.ImageMaximumGCAge, &out.ImageMaximumGCAge
*out = new(string)
**out = **in
}
if in.ImageGCHighThresholdPercent != nil {
in, out := &in.ImageGCHighThresholdPercent, &out.ImageGCHighThresholdPercent
*out = new(int32)

10
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -4070,6 +4070,16 @@ func (in *KubeletConfigSpec) DeepCopyInto(out *KubeletConfigSpec) {
*out = new(int32)
**out = **in
}
if in.ImageMinimumGCAge != nil {
in, out := &in.ImageMinimumGCAge, &out.ImageMinimumGCAge
*out = new(string)
**out = **in
}
if in.ImageMaximumGCAge != nil {
in, out := &in.ImageMaximumGCAge, &out.ImageMaximumGCAge
*out = new(string)
**out = **in
}
if in.ImageGCHighThresholdPercent != nil {
in, out := &in.ImageGCHighThresholdPercent, &out.ImageGCHighThresholdPercent
*out = new(int32)