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

[containerd] add hashes for versions '1.6.32-34', 'v1.7.17-20' and make v1.7.20 default #11413

Merged

Conversation

mzaian
Copy link
Contributor

@mzaian mzaian commented Aug 1, 2024

What type of PR is this?

/kind container-managers

What this PR does / why we need it:
Add hashes for containerd versions 1.6.32-34 and 1.7.20
containerd 1.7.20 release notes https://github.com/containerd/containerd/releases/tag/v1.7.20
containerd 1.6.34 release notes https://github.com/containerd/containerd/releases/tag/v1.6.34
Update runc to v1.1.13
Make containerd 1.7.20 default

Does this PR introduce a user-facing change?:

[containerd] Make containerd 1.7.20 default
[runc] Upgrade to v1.1.13

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/container-managers Containers section in the release note cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 1, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mzaian

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 1, 2024
@mzaian
Copy link
Contributor Author

mzaian commented Aug 1, 2024

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Aug 1, 2024
@mzaian mzaian closed this Aug 2, 2024
@mzaian mzaian reopened this Aug 2, 2024
@mzaian mzaian force-pushed the update-containerd-1.7.20 branch from 06e8977 to 03e7555 Compare August 2, 2024 14:31
@mzaian mzaian requested a review from yankay August 5, 2024 09:27
@yankay
Copy link
Member

yankay commented Aug 5, 2024

Thanks @mzaian
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2024
@k8s-ci-robot k8s-ci-robot merged commit 3d1653f into kubernetes-sigs:master Aug 5, 2024
39 checks passed
@mzaian
Copy link
Contributor Author

mzaian commented Aug 5, 2024

/cherrypick release-2.25

@k8s-infra-cherrypick-robot

@mzaian: #11413 failed to apply on top of branch "release-2.25":

Applying: add hashes for versions '1.6.32-34', 'v1.7.17-20' and make v1.7.20 default
Using index info to reconstruct a base tree...
M	README.md
M	roles/kubespray-defaults/defaults/main/checksums.yml
M	roles/kubespray-defaults/defaults/main/download.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/kubespray-defaults/defaults/main/download.yml
Auto-merging roles/kubespray-defaults/defaults/main/checksums.yml
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add hashes for versions '1.6.32-34', 'v1.7.17-20' and make v1.7.20 default
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.25

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-sigs/prow repository.

@yankay yankay mentioned this pull request Aug 28, 2024
kpoxo6op pushed a commit to kpoxo6op/kubespray that referenced this pull request Dec 27, 2024
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. kind/container-managers Containers section in the release note 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants