Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit f08871a

Browse files
thaJeztahandrewhsu
thaJeztah
authored and
andrewhsu
committed
Bump SwarmKit to 831df679a0b8a21b4dccd5791667d030642de7ff
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 <[email protected]> (cherry picked from commit 27749659d5a30999691e401a351221780a483099) Signed-off-by: Andrew Hsu <[email protected]>
1 parent 5a12e3c commit f08871a

24 files changed

Lines changed: 1147 additions & 607 deletions

File tree

‎components/engine/integration/network/service_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestServiceWithPredefinedNetwork(t *testing.T) {
5454

5555
const ingressNet = "ingress"
5656

57-
func TestServiceWithIngressNetwork(t *testing.T) {
57+
func TestServiceRemoveKeepsIngressNetwork(t *testing.T) {
5858
defer setupTest(t)()
5959
d := swarm.NewSwarm(t, testEnv)
6060
defer d.Stop(t)
@@ -75,9 +75,7 @@ func TestServiceWithIngressNetwork(t *testing.T) {
7575
poll.WaitOn(t, swarmIngressReady(client), pollSettings)
7676

7777
var instances uint64 = 1
78-
serviceName := "TestIngressService"
79-
serviceSpec := swarmServiceSpec(serviceName, instances)
80-
serviceSpec.TaskTemplate.Networks = append(serviceSpec.TaskTemplate.Networks, swarmtypes.NetworkAttachmentConfig{Target: ingressNet})
78+
serviceSpec := swarmServiceSpec(t.Name()+"-service", instances)
8179
serviceSpec.EndpointSpec = &swarmtypes.EndpointSpec{
8280
Ports: []swarmtypes.PortConfig{
8381
{

‎components/engine/vendor.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ github.com/dmcgowan/go-tar go1.10
119119
github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577
120120

121121
# cluster
122-
github.com/docker/swarmkit 49a9d7f6ba3c1925262641e694c18eb43575f74b
122+
github.com/docker/swarmkit 831df679a0b8a21b4dccd5791667d030642de7ff
123123
github.com/gogo/protobuf v0.4
124124
github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
125+
github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2
125126
github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
126127
golang.org/x/crypto 558b6879de74bc843225cde5686419267ff707ca
127128
golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb

‎components/engine/vendor/github.com/docker/swarmkit/agent/agent.go‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/agent/session.go‎

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/agent/worker.go‎

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/api/types.pb.go‎

Lines changed: 323 additions & 317 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/api/types.proto‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/ca/certificates.go‎

Lines changed: 5 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/ca/keyutils/keyutils.go‎

Lines changed: 5 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/engine/vendor/github.com/docker/swarmkit/fips/fips.go‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)