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

WIP [18.09 backport] Bump swarmkit to a84c01f #89

Closed
wants to merge 3 commits into from

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Oct 18, 2018

18.09 backports of:

git checkout -b 18.09_backport_vndr ce-engine/18.09
git cherry-pick -s -S -x 82388d048a7f55fbcca05140bdfd747099b351c1
git cherry-pick -s -S -x 8dedcb8c516b914157d8274d5e94f0b8660cb866
git cherry-pick -s -S -x 93e1c5a5b73b80bee1ffc6b73b45fd304903dcc6
git push -u origin

conflict in vendor.conf in first commit, due to #60, which is not upstream

Tibor Vass and others added 3 commits October 18, 2018 15:10
Signed-off-by: Tibor Vass <[email protected]>
(cherry picked from commit 82388d0)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Relevant changes;

- swarmkit#2681 Handle an edge case in CA rotation where we reclaim CA service from an external CA
- swarmkit#2750 Use gometalinter; switch from x/net/context -> context

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 8dedcb8)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Anshul Pundir <[email protected]>
(cherry picked from commit 93e1c5a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Oct 18, 2018
@thaJeztah
Copy link
Member Author

ping @anshulpundir @dperny PTAL

@mavenugo
Copy link

@thaJeztah why are we pulling in all the changes in 18.09 bump ? Shouldnt we target the patches based on severity given 18.09 is in Beta phase ?

@thaJeztah
Copy link
Member Author

@mavenugo let me defer that to @anshulpundir @dperny there's no 18.09 branch yet for swarmkit, looking at the changes;

@anshulpundir
Copy link

anshulpundir commented Oct 18, 2018

#89 (comment) looks good. I agree with @thaJeztah

cc @dperny

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 changed the title [18.09 backport] Bump swarmkit to a84c01f49091167dd086c26b45dc18b38d52e4d9 [18.09 backport] Bump swarmkit to a84c01f Oct 19, 2018
@andrewhsu andrewhsu changed the title [18.09 backport] Bump swarmkit to a84c01f WIP [18.09 backport] Bump swarmkit to a84c01f Oct 19, 2018
@andrewhsu
Copy link

was told by @anshulpundir that moby/swarmkit#2768 is in works that could reduce the changeset to pull into the engine 18.09 codeline

@thaJeztah
Copy link
Member Author

Closing in favor of #94

@thaJeztah thaJeztah closed this Oct 23, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_vndr branch March 24, 2022 23:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants