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

[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 ENGCORE-1028#369

Merged
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_bump_swarmkit
Sep 20, 2019
Merged

[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 ENGCORE-1028#369
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_bump_swarmkit

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 19, 2019 •
edited by atlassian bot
Loading

full diff: moby/swarmkit@bbe3418...f35d910

changes included:

@thaJeztah
[19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29
02465c9 
full diff: moby/swarmkit@bbe3418...f35d910

changes included:

- moby/swarmkit#2891 [19.03 backport] Remove hardcoded IPAM config subnet value for ingress network
  - backport of moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network
  - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 19.03.3 milestone Sep 19, 2019
@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 19, 2019

ping @arkodg @dperny @kolyshkin ptal

andrewhsu
andrewhsu approved these changes Sep 20, 2019
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 2399b7a into docker-archive:19.03 Sep 20, 2019
@andrewhsu andrewhsu changed the title [19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 [19.03] bump swarmkit to f35d9100f2c6ac810cc8d7de6e8f93dcc7a42d29 ENGCORE-1028 Sep 20, 2019
@thaJeztah thaJeztah deleted the 19.03_bump_swarmkit branch September 20, 2019 09:15
This was referenced Sep 21, 2019
Merged
Merged
@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 21, 2019

Looks like this broke CI (quoting @andrewhsu from a comment on an internal ticket)

From the history of PRs merged to the docker/engine 19.03 codeline:
https://ci.docker.com/public/blue/organizations/jenkins/engine/activity?branch=19.03

Looks like the TestServiceWithDefaultAddressPoolInit test started failing when #369 was merged. See error after merge to 19.03:

 --- FAIL: TestServiceWithDefaultAddressPoolInit (1.60s)
     service_test.go:398: Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/1/TestServiceWithDefaultAddressPoolInit
     daemon.go:321: [d9c735f5b777b] waiting for daemon to start
     daemon.go:339: [d9c735f5b777b] daemon started
     service_test.go:423: TestServiceWithDefaultAddressPoolInit: NetworkInspect: {Name:saanvisthiraTestServiceWithDefaultAddressPoolInit ID:skd85d6326u0vot7xj35e7w06 Created:2019-09-20 01:16:12.558779258 +0000 UTC Scope:swarm Driver:overlay EnableIPv6:false IPAM:{Driver:default Options:map[] Config:[{Subnet:20.20.1.0/24 IPRange: Gateway:20.20.1.1 AuxAddress:map[]}]} Internal:false Attachable:false Ingress:false ConfigFrom:{Network:} ConfigOnly:false Containers:map[] Options:map[com.docker.network.driver.overlay.vxlanid_list:4097] Labels:map[] Peers:[] Services:map[]}
     service_test.go:425: assertion failed: 20.20.1.0/24 (out.IPAM.Config[0].Subnet string) != 20.20.0.0/24 (string)

I did some preparations to fix this;

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

@arkodg arkodg arkodg approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

impact/changelog

Projects

None yet

Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @andrewhsu @arkodg