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

Automated cherry pick of #11674: Add support for Docker v20.10.7 #11680

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 3, 2021

Cherry pick of #11674 on release-1.21.

#11674: Add support for Docker v20.10.7

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jun 3, 2021
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 3, 2021
@rifelpet
Copy link
Member

rifelpet commented Jun 3, 2021

The master PR didnt have the docker e2e job ran. Maybe we can make it required for changes to certain paths

@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

@rifelpet We don't really care about the Docker part, but the containerd version bundled for ARM64. The default Docker version doesn't change. Not sure when k8s will support the new 20.10.x branch.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

The idea about running some jobs when the container runtime changes is good though. I think we had it before containerd. I will make a PR for this soon.

@johngmyers
Copy link
Member

It seems a little late in the release cycle to be making these sorts of changes to 1.21. I'm particularly concerned about the change in the fallback version for ARM.
/hold

@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 Jun 3, 2021
@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

@johngmyers This is a bugfix release, not something new.

@olemarkus
Copy link
Member

I am also skeptical about doing anything that isn't absolutely critical at this time.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

So this is not critical?
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-30465

@johngmyers
Copy link
Member

A CVE could justify a late backport.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

IMHO, the risk for this is pretty small if the periodic ARM64 tests pass. This just aligns the AMD and ARM versions.

@hakman
Copy link
Member Author

hakman commented Jun 3, 2021

@johngmyers
Copy link
Member

/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 Jun 3, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2021
@hakman
Copy link
Member Author

hakman commented Jun 4, 2021

/retest

@k8s-ci-robot k8s-ci-robot merged commit 6893235 into kubernetes:release-1.21 Jun 4, 2021
@hakman hakman deleted the automated-cherry-pick-of-#11674-upstream-release-1.21 branch June 9, 2021 04:32
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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants