feature: add update daemon config function #1514
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 #1514 +/- ##
==========================================
- Coverage 41.25% 41.14% -0.11%
==========================================
Files 255 257 +2
Lines 16837 16924 +87
==========================================
+ Hits 6946 6964 +18
- Misses 9024 9094 +70
+ Partials 867 866 -1
|
HusterWan
reviewed
Jun 13, 2018
cli/update_daemon.go
Outdated
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // updateDescription is used to describe update command in detail and auto generate command doc. |
There was a problem hiding this comment.
%s/update/updatedaemon ?
|
Could you tell us more about why we need this? @rudyfly |
HusterWan
reviewed
Jun 13, 2018
| } | ||
|
|
||
| // write config to file | ||
| fd, err := os.OpenFile(udc.configFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644) |
There was a problem hiding this comment.
it will overwrite the origin config?
There was a problem hiding this comment.
yes, overwrite is right.
|
@allencloud I have update the pr's description, please see |
allencloud
reviewed
Jun 13, 2018
cli/update_daemon.go
Outdated
| ) | ||
|
|
||
| // updateDescription is used to describe updatedaemon command in detail and auto generate command doc. | ||
| var daemonUpdateDescription = "Update daemon's configurations, including debug level, image proxy, label, manager white list, " + |
|
Could add integration test in z_cli_daemon_test.go, for example verify online update |
rudyfly
force-pushed
the
update-config
branch
3 times, most recently
from
c97e20a to
92fbd46
Compare
|
@Letty5411 Add |
Letty5411
reviewed
Jun 15, 2018
test/z_cli_daemon_test.go
Outdated
|
|
||
| command.PouchRun("updatedaemon", "--label", "aaa=bbb").Assert(c, icmd.Success) | ||
|
|
||
| ret := command.PouchRun("info") |
There was a problem hiding this comment.
Use: ret = RunWithSpecifiedDaemon(&cfg, "version")
Or it will send request to the default pouchd instead of the testing one.
Letty5411
reviewed
Jun 15, 2018
test/z_cli_daemon_test.go
Outdated
|
|
||
| defer cfg.KillDaemon() | ||
|
|
||
| command.PouchRun("updatedaemon", "--label", "aaa=bbb").Assert(c, icmd.Success) |
There was a problem hiding this comment.
Use: ret = RunWithSpecifiedDaemon(&cfg, "updatedaemon", "--label", "aaa=bbb")
|
LGTM |
pouchrobot
added
the
LGTM
Add update daemon config function. If pouchd is alive, it will change daemon config if it supports, and then change the config file. If pouchd is dead, it just update the daemon config file. Pouchd dead: You can specified the config file by set `--config-file` to update, more functions you can see by `pouch updatedaemon --help` Signed-off-by: Rudy Zhang <[email protected]>
This was referenced Jun 21, 2018
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.
Ⅰ. Describe what this PR did
Currently, update daemon only supports with restful api, there is no cli command,
so need add it, in addition, it only supports update with pouchd is alive, so we need
update config file when pouchd is dead.
Pouch daemon config file is json format, it's hard to modify
with shell script, so add this function to change the config file easily.
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Describe how you did it
If pouchd is alive, it will change, daemon config if it supports,
and then change the config file. If pouchd is dead, it just update
the daemon config file. Currently, online update only support
image-proxyandlabel, more options will be supported at thefollowing few prs.
pouchd offline set:
You can specified the config file by set
--config-fileto update,if pouchd is alive, you can set
--offline=trueto modify config file only,more functions you can see by
pouch updatedaemon --helpⅣ. Describe how to verify it
Online update
offline update
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang [email protected]