feature: add a flag of pouchd to specify whether enable CRI #1118
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
YaoZengzeng
force-pushed
the
enable-cri
branch
2 times, most recently
from
9b943da to
e1d3c47
Compare
allencloud
reviewed
Apr 12, 2018
daemon/config/config.go
Outdated
| @@ -22,6 +22,9 @@ type Config struct { | |||
| // Network config | |||
| NetworkConfg network.Config | |||
|
|
|||
| // Whether enable cri manager. | |||
| CriEnabled bool | |||
There was a problem hiding this comment.
Please add a json name for this field, since it will also be included in the config file which in json, like json:"home-dir,omitempty".
Codecov Report
@@ Coverage Diff @@
## master #1118 +/- ##
========================================
+ Coverage 15.8% 16.7% +0.9%
========================================
Files 171 165 -6
Lines 9619 8931 -688
========================================
- Hits 1520 1492 -28
+ Misses 7989 7334 -655
+ Partials 110 105 -5
|
|
@allencloud PTAL |
allencloud
reviewed
Apr 12, 2018
daemon/config/config.go
Outdated
| @@ -22,6 +22,9 @@ type Config struct { | |||
| // Network config | |||
| NetworkConfg network.Config | |||
|
|
|||
| // Whether enable cri manager. | |||
| CriEnabled bool `json:"cri-enabled,omitempty"` | |||
There was a problem hiding this comment.
I am afraid this field addition introduces some compatibility.
I see two similar fields:
CriEnabled bool `json:"cri-enabled,omitempty"`
IsLxcfsEnabled bool `json:"enable-lxcfs,omitempty"`
They are quite similar and have different. Could we change into IsCriEnabled bool json:"enable-cri,omitempty"``
There was a problem hiding this comment.
Can't agree more :) be in consistent !
Signed-off-by: YaoZengzeng <[email protected]>
|
Thanks for your work. @YaoZengzeng |
pouchrobot
added
the
LGTM
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.
Signed-off-by: YaoZengzeng [email protected]
Ⅰ. Describe what this PR did
With this PR, the CRI service of pouch will be off by default.
If we want to enable it, we could start pouchd like:
Ⅱ. Does this pull request fix one issue?
fixes #1114
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews