Revert "Fix system container detection in kubelet on systemd" #26478
Conversation
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
wojtek-t
added
the
release-note-none
|
@derekwaynecarr @kubernetes/sig-node @kubernetes/rh-cluster-infra @vishh @dchen1107 |
k8s-github-robot
added
the
size/M
|
Self-merging to fix merge-bot. |
|
GCE e2e build/test failed for commit fcfaf1a. Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake. |
|
Thank you, @wojtek-t! |
k8s-github-robot
pushed a commit
that referenced
this pull request
Jun 11, 2016
Automatic merge from submit-queue Fix system container detection ```release-note Fix system container detection in kubelet on systemd. This fixed environments where CPU and Memory Accounting were not enabled on the unit that launched the kubelet or docker from reporting the root cgroup when monitoring usage stats for those components. ``` Fixes #25909 /cc @vishh @ncdc @eparis @wojtek-t - this reverts the revert #26478 This should merge when node e2e setups were updated per #26289
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reverts #25982
It seems it broke node-e2e suite.
@k8s-oncall - FYI