feature: add runtime config #1366
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
Codecov Report
@@ Coverage Diff @@
## master #1366 +/- ##
==========================================
+ Coverage 40.45% 40.55% +0.09%
==========================================
Files 253 254 +1
Lines 16466 16500 +34
==========================================
+ Hits 6662 6692 +30
- Misses 8948 8949 +1
- Partials 856 859 +3
|
rudyfly
reviewed
May 25, 2018
main.go
Outdated
| @@ -106,21 +102,17 @@ func setupFlags(cmd *cobra.Command) { | |||
| flagSet.BoolVar(&cfg.EnableProfiler, "enable-profiler", false, "Set if pouchd setup profiler") | |||
| flagSet.StringVar(&cfg.Pidfile, "pidfile", "/var/run/pouch.pid", "Save daemon pid") | |||
| flagSet.IntVar(&cfg.OOMScoreAdjust, "oom-score-adj", -500, "Set the oom_score_adj for the daemon") | |||
| } | |||
| cfg.Runtimes = make(map[string]types.Runtime) | |||
There was a problem hiding this comment.
Why do alloc memory at here, NewRuntime will alloc memory
There was a problem hiding this comment.
Since we want get pointer of cfg.Runtime and cfg.Runtime should have been initialized, or use secondary pointer is ok, but seems also need one more line xx = &cfg.Runtimes, NewRuntime(&xx)
daemon/config/config.go
Outdated
| func iterateConfig(origin map[string]interface{}, config map[string]interface{}) { | ||
| for k, v := range origin { | ||
| if k == "add-runtime" { |
There was a problem hiding this comment.
Yes, for the history reason, TLS config is a map type.
allencloud
reviewed
May 29, 2018
| return rt | ||
| } | ||
|
|
||
| // Set implement Runtime as pflag.Value interface |
There was a problem hiding this comment.
I think we should add unit test for this function.
pouchrobot
added
conflict/needs-rebase
size/XL
and removed
conflict/needs-rebase
size/L
labels
|
@rudyfly @allencloud , I have update as the comment said, PTAL. |
|
CI fail because of and As already know fail test. |
1. support add-runtime in daemon 2. fix parse daemon flags twice, which make flags be set for twice 3. add runtime info in pouch info 4. fix slice-type flags merge not take effect, move merge flags operation in runDaemon, since(*cobra.Command).Execute() will do flags parse. Signed-off-by: Ace-Tang <aceapril@126.com>
|
LGTM |
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: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
operation in runDaemon, since(*cobra.Command).Execute() will do flags
parse.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews