allow features option live reloading #37692
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
|
ptal @thaJeztah @tiborvass |
tiborvass
reviewed
Aug 30, 2018
daemon/reload.go
Outdated
| // reloadFeatures updates configuration with enabled/disabled features | ||
| func (daemon *Daemon) reloadFeatures(conf *config.Config, attributes map[string]string) { | ||
| // update corresponding configuration | ||
| if conf.IsValueSet("features") { |
There was a problem hiding this comment.
remove this if to be able to unset features ?
thaJeztah
changed the title
AntaresS
force-pushed
the
live-reload-buildkit
branch
from
ad3d477
to
2472170
Compare
Codecov Report
@@ Coverage Diff @@
## master #37692 +/- ##
=========================================
Coverage ? 36.03%
=========================================
Files ? 609
Lines ? 45063
Branches ? 0
=========================================
Hits ? 16240
Misses ? 26592
Partials ? 2231 |
AntaresS
force-pushed
the
live-reload-buildkit
branch
4 times, most recently
from
97a1f12
to
f634ae4
Compare
|
@tiborvass I've updated the PR and verified this would actually work. |
tiborvass
reviewed
Aug 30, 2018
tiborvass
reviewed
Aug 30, 2018
| @@ -7,6 +7,8 @@ import ( | |||
| "net/http" | |||
| "time" | |||
|
|
|||
| "github.com/docker/docker/api/server/router/build" | |||
|
|
|||
AntaresS
force-pushed
the
live-reload-buildkit
branch
from
f634ae4
to
c11a34e
Compare
AntaresS
changed the title
AntaresS
force-pushed
the
live-reload-buildkit
branch
from
c11a34e
to
ac14e27
Compare
|
@tonistiigi or @thaJeztah can you help review this? |
thaJeztah
requested changes
Aug 31, 2018
daemon/daemon.go
Outdated
| @@ -136,6 +136,11 @@ func (daemon *Daemon) HasExperimental() bool { | |||
| return daemon.configStore != nil && daemon.configStore.Experimental | |||
| } | |||
|
|
|||
| // GetFeatures returns the features map from configStore | |||
| func (daemon *Daemon) GetFeatures() *map[string]bool { | |||
There was a problem hiding this comment.
Better to name this Features() instead of GetFeatures(); golang convention is to not use a Get prefix for getters; https://golang.org/doc/effective_go.html#Getters
There was a problem hiding this comment.
@thaJeztah Fixed :)
Signed-off-by: Anda Xu <anda.xu@docker.com>
AntaresS
force-pushed
the
live-reload-buildkit
branch
from
ac14e27
to
58a75ce
Compare
tonistiigi
reviewed
Sep 4, 2018
| // check if the builder feature has been enabled from daemon as well. | ||
| if buildOptions.Version == types.BuilderBuildKit && br.builderVersion != "" && br.builderVersion != types.BuilderBuildKit { | ||
| if buildOptions.Version == types.BuilderBuildKit && builderVersion != "" && builderVersion != types.BuilderBuildKit { |
There was a problem hiding this comment.
@tiborvass As discussed offline, this value should only apply as a hint to the client on negotiation on ping, not override a daemon behavior.
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.
- What I did
reloadFeaturesso that the changes offeaturesfield in daemon.json can be live reloaded.featuresto the rest of places where it is being used.- How I did it
- How to verify it
First with
buildkitturned on indaemon.jsonwe hit the
/_pingendpoint to verify,Builder-Version: 2Now turn
buildkitoffand run
sudo kill -s SIGHUP <dockerd-PID>then verify with
/_pingagain, it showsBuilder-Version: 1- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)
Signed-off-by: Anda Xu anda.xu@docker.com