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

[18.03] disallow attaching ingress network#453

Merged
andrewhsu merged 2 commits intodocker-archive:18.03from
thaJeztah:18.03-swarmkit-ingress-attach
Mar 6, 2018
Merged

[18.03] disallow attaching ingress network#453
andrewhsu merged 2 commits intodocker-archive:18.03from
thaJeztah:18.03-swarmkit-ingress-attach

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Mar 6, 2018 •
edited
Loading

This PR brings in moby/swarmkit#2523; moby/swarmkit@49a9d7f...11d7b06

CLI vendoring is also updated, but did not bring in changes

@thaJeztah thaJeztah mentioned this pull request Mar 6, 2018
Merged
@thaJeztah thaJeztah added this to the 18.03.0 milestone Mar 6, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 6, 2018

ping @andrewhsu @fcrisciani @anshulpundir PTAL

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 6, 2018

1 failure on Windows; doesn't look related; https://jenkins.dockerproject.org/job/docker-ce-pr-WoW-RS1/803/console

16:15:55 ----------------------------------------------------------------------
16:15:55 FAIL: docker_cli_run_test.go:4374: DockerSuite.TestSlowStdinClosing
16:15:55 
16:15:55 docker_cli_run_test.go:4390:
16:15:55     c.Fatal("running container timed out") // cleanup in teardown
16:15:55 ... Error: running container timed out
16:15:55

thaJeztah added 2 commits March 6, 2018 17:31
@thaJeztah
Engine: bump swarmkit to 11d7b06f48bc1d73fc6d8776c3552a4b11c94301
2d690d4 
Ingress network should not be attachable

Ingress network is a special network used only to expose
ports. For this reason the network cannot be explicitly
attached during service create or service update

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
CLI bump swarmkit to 11d7b06f48bc1d73fc6d8776c3552a4b11c94301
dbe2a19 
Contains no changes for the CLI, but keeps the version
in sync with engine

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.03-swarmkit-ingress-attach branch from 32a35da to dbe2a19 Compare March 6, 2018 16:32
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 6, 2018

Rebased, to get rid of the commits from #451

fcrisciani
fcrisciani approved these changes Mar 6, 2018
View reviewed changes
Copy link
Copy Markdown

@fcrisciani fcrisciani 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
Copy link
Copy Markdown
Contributor

andrewhsu commented Mar 6, 2018

Seeing a failure only in s390x on the DockerSwarmSuite.TearDownTest from the latest commit, but had s390x success before the rebase.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 6, 2018

It's failing in the DockerSwarmSuite.TestSwarmLockUnlockCluster test; I've seen that fail in other locations (I think mostly on s390); we should probably look if there's an actual issue somewhere, but I don't think it's related to this PR.

andrewhsu
andrewhsu approved these changes Mar 6, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@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 91bb2ae into docker-archive:18.03 Mar 6, 2018
@thaJeztah thaJeztah deleted the 18.03-swarmkit-ingress-attach branch March 6, 2018 19:56
@thaJeztah thaJeztah mentioned this pull request Apr 19, 2018
Closed
docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
@tiborvass
Merge pull request #453 from tonistiigi/1903-update-buildkit
89d170e 
[19.03] vendor: update buildkit to 926935b5
Upstream-commit: bd9e7fca87d36a0ac9c28827f3ca3bb491b3b898
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
@andrewhsu
Merge pull request docker-archive#453 from thaJeztah/18.03-swarmkit-i…
c4f78ff 
…ngress-attach

[18.03] disallow attaching ingress network
docker-jenkins pushed a commit that referenced this pull request Apr 14, 2020
@silvin-lubecki
Merge pull request #453 from thaJeztah/bump_golang_1.13.10
da568e2 
Bump Golang 1.13.10
Upstream-commit: 1648bd1
Component: packaging
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
@silvin-lubecki
Merge pull request docker-archive#453 from thaJeztah/bump_golang_1.13.10
1648bd1 
Bump Golang 1.13.10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@anshulpundir anshulpundir Awaiting requested review from anshulpundir

2 more reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

@fcrisciani fcrisciani fcrisciani approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.03.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @andrewhsu @fcrisciani