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.

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

merge default metadata into drop-in kubelet config #1620

Merged
merged 1 commit into from
Feb 2, 2024

Conversation

ndbaker1
Copy link
Member

@ndbaker1 ndbaker1 commented Feb 2, 2024

Issue #, if available:

Description of changes:

When using a KubeletConfiguration that lacks the metadata info like kind and apiVersion, this can cause kubelet's drop-in config merging to fail on a minimal config like:

{
  "maxPods": 2
}
E0202 20:46:59.510494   23792 run.go:74] "command failed" err=<
        failed to merge kubelet configs: failed to walk through kubelet dropin directory "drop-in-test/": failed to load kubelet dropin file, path: drop-in-test/test.conf, error: Object 'Kind' is missing in '{
            "maxPods": 2
        }
        '
 >

update the drop-in config path to merge user's data on top of default KubeletConfiguration metadata.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Testing Done

update e2e tests to reflect the absence of kind and apiVersion

See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.

Copy link
Member

@Issacwww Issacwww left a comment

Choose a reason for hiding this comment

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

LGTM

@ndbaker1 ndbaker1 merged commit 2393dfa into awslabs:al2023 Feb 2, 2024
9 checks passed
@ndbaker1 ndbaker1 deleted the fix-kind branch February 2, 2024 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants