Skip to content

Revert "UPSTREAM: revert<carry>: Mark admissionregistration.k8s.io/v1beta1 as deprecated."" #2448

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
merged 1 commit into from
Sep 10, 2025
Merged

Revert "UPSTREAM: revert<carry>: Mark admissionregistration.k8s.io/v1beta1 as deprecated."" #2448

merged 1 commit into from
Sep 10, 2025

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Sep 7, 2025 •
edited
Loading

Reverts #2422 now that openshift/machine-config-operator#5256 is in 4.17.39

@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 7, 2025
@openshift-ci-robot
Copy link

@sdodson: the contents of this pull request could not be automatically validated.

The following commits could not be validated and must be approved by a top-level approver:

Comment /validate-backports to re-evaluate validity of the upstream PRs, for example when they are merged upstream.

@openshift-ci openshift-ci bot requested review from deads2k and jerpeter1 September 7, 2025 04:04
@sdodson
Copy link
Member Author

sdodson commented Sep 7, 2025

/hold
I've looked over all prow jobs that ran in the past 24 hours and they upgraded from ci, nightly, or 4.17.39 builds that had the MCO fixes but we haven't yet had a 4.18 nightly that ran the periodic-ci-openshift-release-master-ci-4.18-upgrade-from-stable-4.17-e2e-gcp-ovn-rt-upgrade job that was blocking 4.18 builds from being accepted. Lets wait until we see proof that is passing and then move forward.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 7, 2025
@sdodson
Copy link
Member Author

sdodson commented Sep 8, 2025

/test e2e-aws-ovn-serial

@sdodson sdodson added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Sep 10, 2025
@sdodson
Copy link
Member Author

sdodson commented Sep 10, 2025

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 10, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: sdodson

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

@sdodson
Copy link
Member Author

sdodson commented Sep 10, 2025

/retest-required

@sdodson sdodson added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Sep 10, 2025
@sdodson
Copy link
Member Author

sdodson commented Sep 10, 2025

/verified bypass

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 10, 2025
@openshift-ci-robot
Copy link

@sdodson: The verified label has been added.

In response to this:

/verified bypass

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 openshift-eng/jira-lifecycle-plugin repository.

@sdodson sdodson removed the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Sep 10, 2025
@sdodson
Copy link
Member Author

sdodson commented Sep 10, 2025

/override ci/prow/e2e-metal-ipi-ovn-ipv6

1 similar comment
@sdodson
Copy link
Member Author

sdodson commented Sep 10, 2025

/override ci/prow/e2e-metal-ipi-ovn-ipv6

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 10, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-metal-ipi-ovn-ipv6

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-ipv6

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.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 10, 2025

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-metal-ipi-ovn-ipv6

In response to this:

/override ci/prow/e2e-metal-ipi-ovn-ipv6

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.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 10, 2025

@sdodson: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ipi-ovn-ipv6 15cb57c link unknown /test e2e-metal-ipi-ovn-ipv6

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit a06f326 into release-4.18 Sep 10, 2025
23 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-pod
This PR has been included in build openshift-enterprise-pod-container-v4.18.0-202509110203.p0.ga06f326.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-hyperkube
This PR has been included in build openshift-enterprise-hyperkube-container-v4.18.0-202509110203.p0.ga06f326.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-installer-kube-apiserver-artifacts
This PR has been included in build ose-installer-kube-apiserver-artifacts-container-v4.18.0-202509110203.p0.ga06f326.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: kube-proxy
This PR has been included in build kube-proxy-container-v4.18.0-202509110203.p0.ga06f326.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

Assignees

@kasturinarra kasturinarra

@zhouying7780 zhouying7780

@xingxingxia xingxingxia

@lyman9966 lyman9966

@duanwei33 duanwei33

@wangke19 wangke19

@gangwgr gangwgr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@sdodson @openshift-ci-robot @openshift-bot @kasturinarra @zhouying7780 @xingxingxia @lyman9966 @duanwei33 @wangke19 @gangwgr