-
Notifications
You must be signed in to change notification settings - Fork 41.5k
Create a system container #8681
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
Make system container name configurable.
- Loading branch information
commit 9a2630ac6ed4bb0645f4668b5cdfe2a6980a71d5
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
---|---|---|
|
@@ -138,6 +138,7 @@ func NewMainKubelet( | |
containerRuntime string, | ||
mounter mount.Interface, | ||
dockerDaemonContainer string, | ||
systemContainer string, | ||
configureCBR0 bool, | ||
pods int) (*Kubelet, error) { | ||
if rootDirectory == "" { | ||
|
@@ -297,10 +298,9 @@ func NewMainKubelet( | |
return nil, fmt.Errorf("unsupported container runtime %q specified", containerRuntime) | ||
} | ||
|
||
// TODO(vmarmol): Make configurable. | ||
// Setup container manager, can fail if the devices hierarchy is not mounted | ||
// (it is required by Docker however). | ||
containerManager, err := newContainerManager(dockerDaemonContainer, "/system") | ||
containerManager, err := newContainerManager(dockerDaemonContainer, systemContainer) | ||
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. Add a comment that this can fail if devices hierarchy is not mounted. 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. Will do, this makes it depend on #8586 |
||
if err != nil { | ||
return nil, fmt.Errorf("failed to create the Container Manager: %v", err) | ||
} | ||
|
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.
Discussed offline: We should tie this to CgroupRoot.