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

Retarget drop-in kubelet configuration dir feature to Alpha #121193

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Retarget drop-in kubelet configuration dir feature to Alpha #121193

merged 2 commits into from
Nov 3, 2023

Conversation

sohankunkerkar
Copy link
Contributor

@sohankunkerkar sohankunkerkar commented Oct 12, 2023 •
edited

What type of PR is this?

/kind feature
/sig node

What this PR does / why we need it:

Retarget this feature for Alpha, which includes:

  1. Fixing the existing functionality
  2. Adding an e2e test

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix overriding default KubeletConfig fields in drop-in configs if not set

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

- [KEP]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/3983-drop-in-configuration

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. sig/node Categorizes an issue or PR as relevant to SIG Node. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 12, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @sohankunkerkar. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Oct 12, 2023
@k8s-ci-robot k8s-ci-robot added area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubelet area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Oct 12, 2023
@kannon92
Copy link
Contributor

/cc
/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 12, 2023
@haircommander
Copy link
Contributor

/test pull-crio-cgroupv1-node-e2e-features
/test pull-kubernetes-cos-cgroupv1-containerd-node-e2e-features

@sohankunkerkar
Copy link
Contributor Author

/test pull-crio-cgroupv1-node-e2e-features
/test pull-kubernetes-cos-cgroupv1-containerd-node-e2e-features

@bart0sh bart0sh added this to WIP in SIG Node PR Triage Oct 13, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f6107ab49cd63043458188a16d206607886f913b

@kannon92
Copy link
Contributor

kannon92 commented Nov 3, 2023

/test pull-kubernetes-node-kubelet-serial-containerd-alpha-features

@haircommander
Copy link
Contributor

/test pull-kubernetes-conformance-kind-ga-only-parallel

@mrunalp
Copy link
Contributor

mrunalp commented Nov 3, 2023

Can you squash the two test commits?

mrunalp
mrunalp reviewed Nov 3, 2023
View reviewed changes
cmd/kubelet/app/server.go Outdated Show resolved Hide resolved
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 3, 2023 •
edited

@sohankunkerkar: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-node-swap-fedora-serial 6f4d70fbdd03c61f649982c32c143d14b7b9884d link false /test pull-kubernetes-node-swap-fedora-serial
pull-kubernetes-node-kubelet-serial-crio-cgroupv1 6f4d70fbdd03c61f649982c32c143d14b7b9884d link false /test pull-kubernetes-node-kubelet-serial-crio-cgroupv1
pull-kubernetes-node-kubelet-serial-containerd 6f4d70fbdd03c61f649982c32c143d14b7b9884d link false /test pull-kubernetes-node-kubelet-serial-containerd

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2023
@mrunalp
Copy link
Contributor

mrunalp commented Nov 3, 2023

/lgtm

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

LGTM label has been added.

Git tree hash: 4f49ac91afd19271d190b9b6bf50f9c58f667c01

sohankunkerkar and others added 2 commits November 3, 2023 17:48
@sohankunkerkar @haircommander
cmd/kubelet: fix overriding default KubeletConfig fields in drop-in c…
ee5578b 
…onfigs if not set

This commit resolves an issue where certain KubeletConfig fields, specifically:
- FileCheckFrequency
- VolumeStatsAggPeriod
- EvictionPressureTransitionPeriod
- Authorization.Mode
- EvictionHard
were inadvertently overridden when not explicitly set in drop-in configs. To retain the
original values if they were absent in the drop-in configs, mergeKubeletConfigurations
uses a JSON patch merge strategy to selectively merge configurations. It prevents essential
configuration settings from being overridden, ensuring a more predictable behavior for users.

Signed-off-by: Sohan Kunkerkar <[email protected]>
Co-authored-by: Peter Hunt <[email protected]>
@sohankunkerkar @haircommander
test/e2e_node: add e2e test for Kubeletconfig drop-in dir
ad7b9b5 
Signed-off-by: Sohan Kunkerkar <[email protected]>
Co-authored-by: Peter Hunt <[email protected]>
@mrunalp
Copy link
Contributor

mrunalp commented Nov 3, 2023

/assign @dims

@dims
Copy link
Member

dims commented Nov 3, 2023

/approve
/lgtm

the test and go mod changes are good

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, mrunalp, sohankunkerkar

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 Nov 3, 2023
@dims
Copy link
Member

dims commented Nov 3, 2023

/milestone v1.29

applying milestone as this has exception from the release team here:
https://groups.google.com/g/kubernetes-sig-release/c/uvzNhRarf6w/m/sETDPDaIAAAJ

@k8s-ci-robot k8s-ci-robot added this to the v1.29 milestone Nov 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit 953afbb into kubernetes:master Nov 3, 2023
16 of 17 checks passed
SIG Node CI/Test Board automation moved this from Archive-it to Done Nov 3, 2023
SIG Node PR Triage automation moved this from WIP to Done Nov 3, 2023
@sohankunkerkar sohankunkerkar deleted the kubelet-config-dir branch November 3, 2023 23:08
@ndbaker1 ndbaker1 mentioned this pull request Jan 30, 2024
Merged
@ndbaker1 ndbaker1 mentioned this pull request Feb 16, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benluddy benluddy benluddy left review comments

@haircommander haircommander haircommander left review comments

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@mtaufen mtaufen Awaiting requested review from mtaufen

@dims dims Awaiting requested review from dims

@kannon92 kannon92 Awaiting requested review from kannon92

@mrunalp mrunalp Awaiting requested review from mrunalp

Assignees

@dims dims

@mrunalp mrunalp

@kannon92 kannon92

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Done
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.29
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@sohankunkerkar @k8s-ci-robot @kannon92 @haircommander @ffromani @mrunalp @dims @benluddy