Skip to content

Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff#36701

Merged
anusha-ragunathan merged 1 commit intomoby:masterfrom
thaJeztah:bump-swarmkit
Apr 4, 2018
Merged

Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff#36701
anusha-ragunathan merged 1 commit intomoby:masterfrom
thaJeztah:bump-swarmkit

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 26, 2018 •
edited
Loading

Full diff: moby/swarmkit@49a9d7f...831df67

Changes included:

ping @anshulpundir @fcrisciani @stevvooe

@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 26, 2018 •
edited
Loading

whoops, forgot to add the new dependency; fixing

fixed

@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 27, 2018

Attaching to ingress network is now forbidden, so looks like there’s a test to update;

TestServiceWithIngressNetwork (1.92s)
20:31:48 	daemon.go:283: [d316291918db3] waiting for daemon to start
20:31:48 	daemon.go:315: [d316291918db3] daemon started
20:31:48 	service_test.go:94: assertion failed: error is not nil: Error response from daemon: rpc error: code = InvalidArgument desc = Service cannot be explicitly attached to the ingress network "ingress"
20:31:48 	daemon.go:273: [d316291918db3] exiting daemon

@thaJeztah thaJeztah requested a review from vdemeester as a code owner April 2, 2018 19:16
@codecov
Copy link

codecov bot commented Apr 2, 2018 •
edited
Loading

Codecov Report

Merging #36701 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #36701      +/-   ##
==========================================
+ Coverage   34.93%   34.94%   +0.01%     
==========================================
  Files         614      614              
  Lines       45645    45645              
==========================================
+ Hits        15944    15951       +7     
+ Misses      27607    27595      -12     
- Partials     2094     2099       +5

thaJeztah
thaJeztah commented Apr 2, 2018
View reviewed changes
integration/network/service_test.go Outdated
Copy link
Member Author

@thaJeztah thaJeztah Apr 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attaching services to the ingress network is no longer allowed.

Discussing with @ctelfer This test needed a container to be attached to the ingress network, which is satisfied by the service publishing a port (which implicitly attaches it to the ingress network).

@thaJeztah thaJeztah mentioned this pull request Apr 2, 2018
Closed
@thaJeztah
Bump SwarmKit to 831df67
2774965 
Changes included:

- Ingress network should not be attachable
- [manager/state] Add fernet as an option for raft encryption
- Log GRPC server errors
- Log leadership changes at manager level
- [state/raft] Increase raft ElectionTick to 10xHeartbeatTick
- Remove the containerd executor
- agent: backoff session when no remotes are available
- [ca/manager] Remove root CA key encryption support entirely
- Fix agent logging race (fixes moby/swarmkit#2576)
- Adding logic to restore networks in order

Also adds github.com/fernet/fernet-go as a new dependency

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title Bump SwarmKit to 82b9ea7031648c9c7aba4f7659b90f9fc692469d Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff Apr 2, 2018
@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 2, 2018

Updated to include the changes from #36767

Extra changes: moby/swarmkit@82b9ea7...831df67

abhi
abhi approved these changes Apr 2, 2018
View reviewed changes
Copy link
Contributor

@abhi abhi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

vdemeester
vdemeester approved these changes Apr 3, 2018
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

boaz0
boaz0 approved these changes Apr 3, 2018
View reviewed changes
Copy link
Contributor

@boaz0 boaz0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🌮

yongtang
yongtang approved these changes Apr 3, 2018
View reviewed changes
Copy link
Member

@yongtang yongtang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member Author

thaJeztah commented Apr 3, 2018

Janky failures are flaky tests: https://jenkins.dockerproject.org/job/Docker-PRs/48842/console (tracked through #36501)

19:52:28 ----------------------------------------------------------------------
19:52:28 FAIL: docker_api_swarm_service_test.go:32: DockerSwarmSuite.TestAPIServiceUpdatePort
19:52:28 
19:52:28 [d5d823d4da0c4] waiting for daemon to start
19:52:28 [d5d823d4da0c4] daemon started
19:52:28 
19:52:28 docker_api_swarm_service_test.go:38:
19:52:28     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
19:52:28 docker_utils_test.go:452:
19:52:28     c.Assert(v, checker, args...)
19:52:28 ... obtained int = 0
19:52:28 ... expected int = 1
19:52:28 
19:52:28 [d5d823d4da0c4] exiting daemon
19:52:40 

20:17:34 ----------------------------------------------------------------------
20:17:34 FAIL: docker_cli_swarm_test.go:1610: DockerSwarmSuite.TestSwarmPublishDuplicatePorts
20:17:34 
20:17:34 [d10dfa3b5f8a5] waiting for daemon to start
20:17:34 [d10dfa3b5f8a5] daemon started
20:17:34 
20:17:34 docker_cli_swarm_test.go:1618:
20:17:34     // make sure task has been deployed.
20:17:34     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
20:17:34 docker_utils_test.go:452:
20:17:34     c.Assert(v, checker, args...)
20:17:34 ... obtained int = 0
20:17:34 ... expected int = 1
20:17:34 
20:17:34 [d10dfa3b5f8a5] exiting daemon
20:17:37

@anusha-ragunathan anusha-ragunathan merged commit 094aa1a into moby:master Apr 4, 2018
@thaJeztah thaJeztah deleted the bump-swarmkit branch April 4, 2018 04:28
This was referenced Apr 4, 2018
Merged
Closed
@thaJeztah thaJeztah mentioned this pull request Apr 19, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stevvooe stevvooe Awaiting requested review from stevvooe

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

5 more reviewers

@vdemeester vdemeester vdemeester approved these changes

@abhi abhi abhi approved these changes

@boaz0 boaz0 boaz0 approved these changes

@yongtang yongtang yongtang approved these changes

@anshulpundir anshulpundir anshulpundir approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/swarm status/4-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Data race in agent logging

8 participants

@thaJeztah @vdemeester @abhi @boaz0 @yongtang @anshulpundir @GordonTheTurtle @anusha-ragunathan