Skip to content

Conversation

@aojea
Copy link
Contributor

@aojea aojea commented Jun 7, 2020

bump cni dependencies so we can benefits from its
bugfixes and improvements

xref: containerd/go-cni#56

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 7, 2020

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 8, 2020

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 8, 2020

Build succeeded.

@aojea
Copy link
Contributor Author

aojea commented Jun 8, 2020

/hold

let's see if the cni project can tag a new version
xref kubernetes/kubernetes#91896 (comment)

@AkihiroSuda AkihiroSuda marked this pull request as draft June 9, 2020 03:21
@aojea aojea marked this pull request as ready for review July 1, 2020 16:26
@theopenlab-ci
Copy link

theopenlab-ci bot commented Jul 1, 2020

Build succeeded.

@aojea
Copy link
Contributor Author

aojea commented Jul 1, 2020

sorry for the noise, I've removed the draft option to check the CI results, but I can't find how to put this in draft mode again

k/k PR is not merged yet
kubernetes/kubernetes#91896
and mike explained that containerd may follow a differente release cadence
containerd/go-cni#56

@AkihiroSuda
Copy link
Member

@aojea What's current status?

@aojea
Copy link
Contributor Author

aojea commented Aug 4, 2020

@aojea What's current status?

Kubernetes merged it
kubernetes/kubernetes#91896

Mike lgmted the other one containerd/go-cni#56 , don't understand well the process though

@AkihiroSuda
Copy link
Member

Mike lgmted the other one containerd/go-cni#56 , don't understand well the process though

Merged and tagged as v1.0.1

@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 4, 2020

Build succeeded.

@aojea aojea force-pushed the bumpcni branch 2 times, most recently from d25f038 to 9603b5e Compare August 4, 2020 08:12
@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 4, 2020

Build succeeded.

@aojea
Copy link
Contributor Author

aojea commented Aug 11, 2020

do I need to do something else @AkihiroSuda ? :)

@AkihiroSuda
Copy link
Member

@mikebrow @dmcgowan PTAL

@AkihiroSuda AkihiroSuda added this to the 1.4 milestone Aug 11, 2020
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

looking good
Suggest merging commit changes from here: containerd/cri@35eb96d
for ipv6 updates that went into containerd/cri 's version of this install. Those changes should be here as well.
Suggest also updating containerd/cri, asynchronously, to run the full set of tests related to cni.

@mikebrow
Copy link
Member

mikebrow commented Aug 11, 2020

looking good
Suggest merging commit changes from here: containerd/cri@35eb96d
for ipv6 updates that went into containerd/cri 's version of this install. Those changes should be here as well.
Suggest also updating containerd/cri, asynchronously, to run the full set of tests related to cni.

hmmm https://github.com/containerd/containerd/pull/4465/files#diff-bc3ee81027bc2e27f4df56465b4290e1R48 Looks like @dmcgowan already did the ipv6 update for the dual stack config.

@AkihiroSuda AkihiroSuda modified the milestones: 1.4, 1.4.1 Aug 12, 2020
@AkihiroSuda
Copy link
Member

Moved to v1.4.1 milestone

@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 21, 2020

Build succeeded.

bump cni dependencies so we can benefits from its
bugfixes and improvements

Signed-off-by: Antonio Ojea <[email protected]>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Aug 21, 2020

Build succeeded.

@crosbymichael
Copy link
Member

LGTM

Thanks @aojea !

@crosbymichael crosbymichael merged commit bacf07f into containerd:master Aug 25, 2020
@estesp estesp added cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch and removed cherry-pick/1.4.x labels Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants