-
Notifications
You must be signed in to change notification settings - Fork 904
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
chore: Add soft eviction setting to Bottlerocket kublet config #6390
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -128,17 +128,11 @@ func (b Bottlerocket) EphemeralBlockDevice() *string { | |
// podsPerCore will be ignored | ||
// https://github.com/bottlerocket-os/bottlerocket/issues/1721 | ||
|
||
// EvictionSoftEnabled is currently disabled for Bottlerocket AMIFamily because it does | ||
// not currently support the evictionSoft parameter passed through the kubernetes settings TOML userData | ||
// If a NodePool sets the evictionSoft value when using the Bottlerocket AMIFamily in the provider, | ||
// evictionSoft will be ignored | ||
// https://github.com/bottlerocket-os/bottlerocket/issues/1445 | ||
|
||
func (b Bottlerocket) FeatureFlags() FeatureFlags { | ||
return FeatureFlags{ | ||
UsesENILimitedMemoryOverhead: false, | ||
PodsPerCoreEnabled: false, | ||
EvictionSoftEnabled: false, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't even think we need the feature flag at all now since I believe they are all |
||
EvictionSoftEnabled: true, | ||
SupportsENILimitedPodDensity: true, | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add a test (at least a functional one) for the changes that you are making here. There may also be a change that you could make to the current E2E integration testing in our Kubelet Config suite tests that would extend eviction soft testing for BR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll try to take a look at this in the next few days