[docker] Kubernetes support (new cgroups path) #1759
Merged
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
| @@ -422,6 +422,9 @@ def _find_cgroup_filename_pattern(self): | |||
| return os.path.join('%(mountpoint)s/docker/%(id)s/%(file)s') | |||
| elif os.path.exists(stat_file_path_coreos): | |||
| return os.path.join('%(mountpoint)s/system.slice/docker-%(id)s.scope/%(file)s') | |||
| # Kubernetes, we can't test the existence of the path without the id | |||
| else: | |||
There was a problem hiding this comment.
Not sure we want an else here since it acts as a default. An elif could be interesting too don't you think? This way if the path is not found because of a problem, we'll get an exception here instead of later in the execution.
There was a problem hiding this comment.
Indeed, it was a quick fix. 😞
I updated the PR, passing a container_id to _find_cgroup_filename_pattern to be able to test the path.
degemer
force-pushed
the
quentin/kubernetes-docker
branch
from
af76c8f
to
c7ced87
Compare
|
lgtm |
|
Merging then. |
On Kubernetes, container files are directly at the top level of cgroups, instead of being in a directory (`docker` or `lxc`).
degemer
force-pushed
the
quentin/kubernetes-docker
branch
from
c7ced87
to
1d70c72
Compare
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.
On Kubernetes, container files are directly at the top level of cgroups,
instead of being in a directory (
dockerorlxc).Fixes #1748.