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

Promote ImageMaximumGCAge to beta #123424

Merged
merged 1 commit into from
Feb 28, 2024
Merged

Promote ImageMaximumGCAge to beta #123424

merged 1 commit into from
Feb 28, 2024

Conversation

haircommander
Copy link
Contributor

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Promote ImageMaximumGCAge feature to beta

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/issue/4210

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 21, 2024
@haircommander haircommander mentioned this pull request Feb 21, 2024
Open
8 tasks
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/test sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 21, 2024
@bart0sh bart0sh added this to Triage in SIG Node PR Triage Feb 21, 2024
@kannon92
Copy link
Contributor

PR looks good. You addressed the feedback in the review in separate PRs so I think this is good to me.

/lgtm
/assign @mrunalp @dchen1107 @SergeyKanzhelev

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b2705470e06a2364ca30af9251a73a526436f248

@kannon92 kannon92 moved this from Triage to Needs Approver in SIG Node PR Triage Feb 22, 2024
@kannon92 kannon92 moved this from Triage to PRs - Needs Approver in SIG Node CI/Test Board Feb 22, 2024
@kannon92
Copy link
Contributor

/triage accepted
since its part of a KEP
/priority important-soon
next week should be merged

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 22, 2024
@kannon92
Copy link
Contributor

/label api-review
/assign @liggitt

Very minor issue in kubelet config tests and we need api approver help.

@k8s-ci-robot k8s-ci-robot added the api-review Categorizes an issue or PR as actively needing an API review. label Feb 26, 2024
liggitt
liggitt reviewed Feb 27, 2024
View reviewed changes
pkg/features/kube_features.go Outdated
@@ -1153,7 +1154,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS

LoadBalancerIPMode: {Default: false, PreRelease: featuregate.Alpha},

ImageMaximumGCAge: {Default: false, PreRelease: featuregate.Alpha},
ImageMaximumGCAge: {Default: true, PreRelease: featuregate.Beta},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this line so it is in alphabetical order in the list of features, that helps minimize conflicts

pkg/kubelet/apis/config/validation/validation_test.go Show resolved Hide resolved
pkg/kubelet/apis/config/validation/validation_test.go Outdated
conf.ImageMaximumGCAge = metav1.Duration{Duration: 1}
return conf
},
errMsg: "invalid configuration: ImageMaximumGCAge feature gate is required for Kubelet configuration option ImageMaximumGCAge",
}, {
name: "imageMaximumGCAge should not be negative",
configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration {
conf.FeatureGates = map[string]bool{"ImageMaximumGCAge": true}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep these lines... if we have to toggle the gate back off, we don't want to have to mess with this unit test to test this behavior

pkg/kubelet/apis/config/validation/validation_test.go Outdated
conf.ImageMaximumGCAge = metav1.Duration{Duration: -1}
return conf
},
errMsg: "invalid configuration: imageMaximumGCAge -1ns must not be negative",
}, {
name: "imageMaximumGCAge should not be less than imageMinimumGCAge",
configure: func(conf *kubeletconfig.KubeletConfiguration) *kubeletconfig.KubeletConfiguration {
conf.FeatureGates = map[string]bool{"ImageMaximumGCAge": true}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

keep these lines... if we have to toggle the gate back off, we don't want to have to mess with this unit test to test this behavior

test/e2e_node/image_gc_test.go Outdated
@@ -41,7 +40,7 @@ const (
checkGCFreq time.Duration = 30 * time.Second
)

var _ = SIGDescribe("ImageGarbageCollect", framework.WithSerial(), framework.WithNodeFeature("GarbageCollect"), func() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the feature is still required, right? it just happens to be beta now

test/e2e_node/image_gc_test.go Outdated
if initialConfig.FeatureGates == nil {
initialConfig.FeatureGates = make(map[string]bool)
}
initialConfig.FeatureGates[string(kubefeatures.ImageMaximumGCAge)] = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it hurt anything to keep the feature explicitly turned on in the test?

@haircommander
Promote ImageMaximumGCAge to beta
cb39dfc 
and set to be on by default, adapting e2e tests for it

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 27, 2024
@haircommander
Copy link
Contributor Author

thanks @liggitt done!

@liggitt
Copy link
Member

liggitt commented Feb 27, 2024

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 27, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 88a6e244dd79e781c4434d51a2069fecf343b1fc

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, liggitt, mrunalp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 27, 2024
@k8s-ci-robot k8s-ci-robot merged commit cb989b8 into kubernetes:master Feb 28, 2024
15 checks passed
SIG Node CI/Test Board automation moved this from PRs - Needs Approver to Done Feb 28, 2024
SIG Node PR Triage automation moved this from Needs Approver to Done Feb 28, 2024
@k8s-ci-robot k8s-ci-robot added this to the v1.30 milestone Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims Awaiting requested review from dims

@thockin thockin Awaiting requested review from thockin

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@kannon92 kannon92 Awaiting requested review from kannon92

@liggitt liggitt Awaiting requested review from liggitt

@mrunalp mrunalp Awaiting requested review from mrunalp

@SergeyKanzhelev SergeyKanzhelev Awaiting requested review from SergeyKanzhelev

Assignees

@mrunalp mrunalp

@liggitt liggitt

@kannon92 kannon92

@dchen1107 dchen1107

@SergeyKanzhelev SergeyKanzhelev

Labels
api-review Categorizes an issue or PR as actively needing an API review. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
API Reviews
Status: API review completed, 1.30
SIG Node CI/Test Board
Done
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.30
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@haircommander @kannon92 @k8s-ci-robot @liggitt @mrunalp @dchen1107 @SergeyKanzhelev