Skip to content

Postpone v2.2 deprecation items to v2.3 #12417

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.

Sign up for GitHub

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

Jump to bottom
Merged
dmcgowan merged 1 commit into from
Oct 27, 2025
Merged

Postpone v2.2 deprecation items to v2.3 #12417

dmcgowan merged 1 commit into from
Oct 27, 2025

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Oct 27, 2025

No description provided.

@AkihiroSuda AkihiroSuda added this to the 2.2 milestone Oct 27, 2025
@AkihiroSuda AkihiroSuda added impact/deprecation 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 Oct 27, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Oct 27, 2025
@AkihiroSuda AkihiroSuda mentioned this pull request Oct 27, 2025
Merged
@dosubot dosubot bot added the kind/cleanup label Oct 27, 2025
@dmcgowan
Copy link
Member

dmcgowan commented Oct 27, 2025

I'll have to follow up on what remains for the bin_dirs change. It already has a migration so we should be able to remove some of those checks. We can do that during rc.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Oct 27, 2025
@mxpv mxpv added this pull request to the merge queue Oct 27, 2025
mikebrow
mikebrow approved these changes Oct 27, 2025
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 27, 2025
@mxpv mxpv added this pull request to the merge queue Oct 27, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 27, 2025
@mxpv mxpv added this pull request to the merge queue Oct 27, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 27, 2025
@dmcgowan dmcgowan merged commit 49a177d into containerd:main Oct 27, 2025
131 of 138 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Oct 27, 2025
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Oct 27, 2025

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

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 27, 2025

@AkihiroSuda: #12417 failed to apply on top of branch "release/1.7":

Applying: Postpone v2.2 deprecation items to v2.3
Using index info to reconstruct a base tree...
M	RELEASES.md
M	pkg/deprecation/deprecation.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/deprecation/deprecation.go
CONFLICT (content): Merge conflict in pkg/deprecation/deprecation.go
Auto-merging RELEASES.md
CONFLICT (content): Merge conflict in RELEASES.md
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 advice.mergeConflict false"
Patch failed at 0001 Postpone v2.2 deprecation items to v2.3

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
Copy link
Member Author

AkihiroSuda commented Oct 28, 2025

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

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 28, 2025

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

Applying: Postpone v2.2 deprecation items to v2.3
Using index info to reconstruct a base tree...
M	RELEASES.md
M	pkg/deprecation/deprecation.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/deprecation/deprecation.go
CONFLICT (content): Merge conflict in pkg/deprecation/deprecation.go
Auto-merging RELEASES.md
CONFLICT (content): Merge conflict in RELEASES.md
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 advice.mergeConflict false"
Patch failed at 0001 Postpone v2.2 deprecation items to v2.3

In response to this:

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

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
Copy link
Member Author

AkihiroSuda commented Oct 28, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 28, 2025

@AkihiroSuda: #12417 failed to apply on top of branch "release/2.1":

Applying: Postpone v2.2 deprecation items to v2.3
Using index info to reconstruct a base tree...
M	RELEASES.md
M	pkg/deprecation/deprecation.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/deprecation/deprecation.go
Auto-merging RELEASES.md
CONFLICT (content): Merge conflict in RELEASES.md
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 advice.mergeConflict false"
Patch failed at 0001 Postpone v2.2 deprecation items to v2.3

In response to this:

/cherry-pick release/2.1

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 Oct 28, 2025
Merged
@AkihiroSuda AkihiroSuda added 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 Oct 28, 2025
@dmcgowan dmcgowan mentioned this pull request Nov 5, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@mxpv mxpv mxpv approved these changes

@mikebrow mikebrow mikebrow approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch impact/deprecation kind/cleanup size/S

Projects

Pull Request Review
Archived in project

Milestone

2.2

Development

Successfully merging this pull request may close these issues.

7 participants

@AkihiroSuda @dmcgowan @k8s-infra-cherrypick-robot @mxpv @mikebrow @fuweid @k8s-ci-robot