Windows swarm fix1#2267
Closed
pradipd wants to merge 12 commits into
Closed
Conversation
|
Please sign your commits following these rules: $ git clone -b "windows_swarm_fix1" git@github.com:pradipd/swarmkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842353961680
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
pradipd
force-pushed
the
windows_swarm_fix1
branch
from
96f7033 to
7f7fba5
Compare
Codecov Report
@@ Coverage Diff @@
## master #2267 +/- ##
==========================================
+ Coverage 60.33% 60.39% +0.06%
==========================================
Files 125 125
Lines 20394 20394
==========================================
+ Hits 12304 12317 +13
+ Misses 6698 6674 -24
- Partials 1392 1403 +11 |
Collaborator
|
The panic will be fixed by #2268. Thanks for pointing that out. |
| {windows.GetInit("transparent"), "transparent"}, | ||
| {windows.GetInit("l2bridge"), "l2bridge"}, | ||
| {windows.GetInit("l2tunnel"), "l2tunnel"}, | ||
| {windows.GetInit("nat"), "nat"}, |
pradipd
commented
Jun 20, 2017
| {windows.GetInit("transparent"), "transparent"}, | ||
| {windows.GetInit("l2bridge"), "l2bridge"}, | ||
| {windows.GetInit("l2tunnel"), "l2tunnel"}, | ||
| {windows.GetInit("nat"), "nat"}, |
Contributor
Author
There was a problem hiding this comment.
FYI: @dineshgovindasamy, @msabansal , @madhanrm
Add the ability for secrets and configs to expand templates, which can
reference the following fields:
- The same set of fields available to ContainerSpec templates
({{.Service.Name}}, {{.Node.ID}}, etc)
- Environment variables: {{Env "envvar"}}
- Other secrets: {{Secret "sometarget"}}
- Other configs: {{Config "sometarget"}}
Secrets and configs can be accessed either by source (secret name) or
target (file name).
Templating of secrets/configs is optional, and is disabled by default
because it's very possible for Go template syntax to conflict with the
syntax of the payload.
The only change that will be necessary in the executor is wrapping the
DependencyGetter in NewTemplatedDependencyGetter before handing it off
to the execution backend.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This allows a templating error to fail a task. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Rename Secret, Config, and Env to lowercase variants. Replace SecretBySource/ConfigBySource with optional bysource=true arguments to "secret" and "config". Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
…e was a timing issue where during the renew, the CA server made a request to the external CA right before/right at the time of updating the root CA. By the time the external CA responded, the root had already been rotated and a different intermediate had been added to the external CA, and the URL that had been hit had already been removed from the external CA. In normal operation, RenewTLSConfig would just retry later, but the test does not retry, and hence occasionally fails. Update the test to first wait for the CA server to complete updating to the new CA. Signed-off-by: Ying Li <ying.li@docker.com>
…er info, because otherwise getting and updating would be problematic because the key is redacted but the cert is not. Signed-off-by: Ying Li <ying.li@docker.com>
Docker added support for logging plugins, this makes sure swarmkit can filter nodes for task scheduling based on available log plugins. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
…later Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This function previously could take an uninitialized NodeInfo structure and fill in whatever was missing. This is very error-prone, so remove this logic and change the only caller that relies on it to always pass in a properly initialized NodeInfo. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
…o that we can log the test name in the output. Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
pradipd
force-pushed
the
windows_swarm_fix1
branch
from
41b8b61 to
04955ca
Compare
Contributor
Author
|
Doh! I wasn't paying attention. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Adding windows support for #27082 (moby/moby#27082)
Additionally, upon testing I kept hitting a panic because usedHostPorts was nil.