Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump containerd and cri-tools to latest #2207

Merged
merged 3 commits into from May 14, 2021

Conversation

MaXinjian
Copy link
Contributor

Signed-off-by: Ma Xinjian maxj.fnst@fujitsu.com

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 20, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @MaXinjian. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 20, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 20, 2021
@BenTheElder
Copy link
Member

is there any particular change noteworthy in these tools?

@MaXinjian
Copy link
Contributor Author

is there any particular change noteworthy in these tools?

cri-tools #724 is meaningful

@aojea
Copy link
Contributor

aojea commented Apr 21, 2021

/ok-to-test
it is my bugfix for the port forwarding
containerd/containerd@1b05b60

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 21, 2021
@MaXinjian
Copy link
Contributor Author

/retest

@MaXinjian
Copy link
Contributor Author

ping

Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2021
@@ -28,24 +28,24 @@ ARG TARGETARCH

# Configure containerd and runc binaries from kind-ci/containerd-nightlies repository
# The repository contains latest stable releases and nightlies built for multiple architectures
ARG CONTAINERD_VERSION="1.5.0-beta.4-91-g1b05b605c"
ARG CONTAINERD_VERSION="1.5.0-rc.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2021
@aojea
Copy link
Contributor

aojea commented May 7, 2021

/lgtm

@BenTheElder do we want to handle this bump independently or should we wait for the release?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2021
@MaXinjian
Copy link
Contributor Author

/test pull-kind-e2e-kubernetes-1-20

@BenTheElder
Copy link
Member

@BenTheElder do we want to handle this bump independently or should we wait for the release?

I would like us to bump to 1.5.0 for the release
you can also do these antonio, just keep an eye on CI afterwards and maybe test it locally, sometimes it does regress for our usage.

@BenTheElder
Copy link
Member

working on the image(s) for this.

@BenTheElder
Copy link
Member

for reference @aojea:

  1. check out the PR. I use an alias in my dotfiles github-checkout-upstream-pr https://github.com/BenTheElder/dotfiles/blob/abb07d8614a96617d35de7597ec5e7b4ac502c16/.bashrc.common.inc#L42
  2. fetch upstream
  3. rebase upstream/main so we are pushing from latest
  4. make -C images/base push
  5. commit upgrading the default image
  6. push to the PR branch, instructions on github

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 13, 2021
Signed-off-by: Ma Xinjian <maxj.fnst@fujitsu.com>
@BenTheElder
Copy link
Member

sorry i've been semi-unavailable myself. mostly had time for a few breaking bugs and otherwise been ~out.

@BenTheElder
Copy link
Member

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 13, 2021
@BenTheElder
Copy link
Member

/hold
kubernetes/kubernetes#101989

we should investigate if this bumps us to runc rc93 or not, rc93 has serious performance regression with kubelet apparently that is fixed in rc94 which is still be rolled out to projects like containerd

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 13, 2021
@BenTheElder
Copy link
Member

containerd/containerd@de6db40 seems to only be at HEAD containerd/containerd#5473 and containerd 1.5.0 was definitely released with rc93, not sure if it was at rc93 in the version we already have.

@aojea
Copy link
Contributor

aojea commented May 13, 2021

👍

@BenTheElder
Copy link
Member

containerd/containerd@v1.5.0...master looks like we should just bump to HEAD instead of sticking to the nice tagged release. current head is not far ahead, looks like mostly bug fixes.

@dims
Copy link
Member

dims commented May 13, 2021

containerd 1.5.1 will roll out in a day or so @BenTheElder @aojea

@BenTheElder
Copy link
Member

containerd 1.5.1 will roll out in a day or so @BenTheElder @aojea

thanks that's good to know.
we've shipped untagged versions before to pick up fixes and we're pretty badly in need of a release.
we should probably not ship rc93 just to get a tag.

@BenTheElder
Copy link
Member

BenTheElder commented May 13, 2021

kind-ci/containerd-nightlies@fe50612 the nightly build needed to cover the 1.5 branch, updated that and kicked off an earlier build so we can pick it up (scheduled builds are nightly)

@BenTheElder
Copy link
Member

1.5.0-17-g799eef87c is now available, HEAD of release/1.5 branch.

@dims
Copy link
Member

dims commented May 14, 2021

@BenTheElder 1.5.1 is out and it uses runc rc94 !!

@BenTheElder
Copy link
Member

/lgtm
/approve
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 14, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 14, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, MaXinjian

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit daa9623 into kubernetes-sigs:main May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants