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

Update Docker to v20.10.8 #12096

Merged
merged 1 commit into from
Aug 4, 2021
Merged

Conversation

hakman
Copy link
Member

@hakman hakman commented Aug 4, 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 Aug 4, 2021
@hakman
Copy link
Member Author

hakman commented Aug 4, 2021

/cc @rifelpet

@hakman
Copy link
Member Author

hakman commented Aug 4, 2021

/test pull-kops-e2e-k8s-docker

@@ -207,6 +207,7 @@ func findAllContainerdDockerMappings() map[string]string {
"1.4.3": "20.10.0",
"1.4.4": "20.10.6",
"1.4.6": "20.10.7",
"1.4.9": "20.10.8",
Copy link
Member

Choose a reason for hiding this comment

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

Should we change the value of containerdFallbackVersion?

Copy link
Member Author

Choose a reason for hiding this comment

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

I want to cherry-pick this to 1.21 without changing the fallback.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 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 Aug 4, 2021
@k8s-ci-robot k8s-ci-robot merged commit 3ee3e30 into kubernetes:master Aug 4, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Aug 4, 2021
@hakman hakman deleted the docker-20.10.8 branch August 4, 2021 04:46
k8s-ci-robot added a commit that referenced this pull request Aug 4, 2021
…-upstream-release-1.21

Automated cherry pick of #12096: Update Docker to v20.10.8
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.

None yet

3 participants