Skip to content

[release/2.2] update runc binary to v1.3.6#13606

Merged
mxpv merged 1 commit into
containerd:release/2.2from
AkihiroSuda:runc-1.3.6-containerd-2.2
Jun 17, 2026
Merged

[release/2.2] update runc binary to v1.3.6#13606
mxpv merged 1 commit into
containerd:release/2.2from
AkihiroSuda:runc-1.3.6-containerd-2.2

Conversation

@AkihiroSuda

@AkihiroSuda AkihiroSuda commented Jun 16, 2026

Copy link
Copy Markdown
Member

@AkihiroSuda
update runc binary to v1.3.6
fc96ea6 
Signed-off-by: Akihiro Suda <[email protected]>
@AkihiroSuda

AkihiroSuda commented Jun 16, 2026

Copy link
Copy Markdown
Member Author

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Jun 16, 2026

Copy link
Copy Markdown

@AkihiroSuda: once the present PR merges, I will cherry-pick it on top of release/1.7, release/2.0, release/2.1 in new PRs and assign them to you.

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

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.

@AkihiroSuda AkihiroSuda added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Jun 16, 2026
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Jun 16, 2026
thaJeztah
thaJeztah approved these changes Jun 16, 2026
View reviewed changes

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM (assuming CI is happy)

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Jun 16, 2026
@mxpv
mxpv merged commit 699c4fb into containerd:release/2.2 Jun 17, 2026
125 of 129 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 17, 2026
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Jun 17, 2026

Copy link
Copy Markdown

@AkihiroSuda: new pull request created: #13615

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 17, 2026
Merged
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Jun 17, 2026

Copy link
Copy Markdown

@AkihiroSuda: new pull request created: #13616

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 17, 2026
Merged
@k8s-infra-cherrypick-robot

k8s-infra-cherrypick-robot commented Jun 17, 2026

Copy link
Copy Markdown

@AkihiroSuda: #13606 failed to apply on top of branch "release/2.0":

Applying: update runc binary to v1.3.6
Using index info to reconstruct a base tree...
M	script/setup/runc-version
Falling back to patching base and 3-way merge...
Auto-merging script/setup/runc-version
CONFLICT (content): Merge conflict in script/setup/runc-version
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 update runc binary to v1.3.6
Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

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.

@AkihiroSuda AkihiroSuda mentioned this pull request Jun 18, 2026
Merged
@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Jun 18, 2026
@samuelkarp samuelkarp mentioned this pull request Jun 18, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mxpv mxpv mxpv approved these changes
@thaJeztah thaJeztah thaJeztah approved these changes
@djdongjin djdongjin djdongjin approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@AkihiroSuda @k8s-infra-cherrypick-robot @mxpv @thaJeztah @djdongjin @samuelkarp @k8s-ci-robot