Skip to content

Conversation

@sdodson
Copy link
Member

@sdodson sdodson commented Aug 20, 2025

Backports b53b9df to 4.17 to avoid the upgrade to 4.18 from complaining about v1beta1 usage which happens prior to the upgrade. I believe this should be safe because we enabled the featuregate in 4.17 and Kube API Server Operator upgrades prior to Machine Config Operator.

I believe this will however prevent us from cleanly downgrading back to 4.16, which is unsupported.

@sdodson sdodson changed the title operator: switch out VAP v1beta1 to v1 OCPBUGS-60704: operator: switch out VAP v1beta1 to v1 Aug 20, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 20, 2025
@openshift-ci-robot
Copy link
Contributor

@sdodson: This pull request references Jira Issue OCPBUGS-60704, which is invalid:

  • expected the bug to target the "4.17.z" version, but no target version was set
  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-60704 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Backports b53b9df to 4.17 to avoid the upgrade to 4.18 from complaining about v1beta1 usage

This should be safe because VAP was enabled by default in 4.17 and Kube API Server should have been upgraded prior to MCO.

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.

@djoshy
Copy link
Contributor

djoshy commented Aug 20, 2025

This might need a library-go bump to get openshift/library-go#1843; but I don't see the MCO sync calls from b53b9df in here? 🤔

@sdodson
Copy link
Member Author

sdodson commented Aug 20, 2025

Yeah I pulled just the manifest changes out as the full content from that commit failed, it'd need more picks. I'm trying to decide if this is worth pursuing or just go skip the test.

@sdodson
Copy link
Member Author

sdodson commented Aug 21, 2025

/retest-required

@sdodson sdodson added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 21, 2025
@sdodson
Copy link
Member Author

sdodson commented Aug 21, 2025

Woot, all required tests have passed. Going to push with the bump to openshift/library-go, no other changes.

@sdodson
Copy link
Member Author

sdodson commented Aug 21, 2025

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@sdodson: This pull request references Jira Issue OCPBUGS-60704, which is invalid:

  • expected the bug to target the "4.17.z" version, but no target version was set
  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-60704 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Retaining the jira/valid-bug label as it was manually added.

Details

In response to this:

/jira refresh

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.

@djoshy
Copy link
Contributor

djoshy commented Aug 21, 2025

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 21, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 21, 2025
@sdodson sdodson added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 21, 2025
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 139c1c2 and 2 for PR HEAD 4c52db9 in total

@sdodson
Copy link
Member Author

sdodson commented Aug 21, 2025

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 139c1c2 and 2 for PR HEAD 4c52db9 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 22, 2025

@sdodson: The following tests 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-gcp-op-techpreview 4c52db9 link false /test e2e-gcp-op-techpreview
ci/prow/e2e-azure-ovn-upgrade-out-of-change 4c52db9 link false /test e2e-azure-ovn-upgrade-out-of-change

Full PR test history. Your PR dashboard.

Details

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 b7c4291 into openshift:release-4.17 Aug 22, 2025
13 of 15 checks passed
@openshift-ci-robot
Copy link
Contributor

@sdodson: Jira Issue OCPBUGS-60704: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-60704 has been moved to the MODIFIED state.

Details

In response to this:

Backports b53b9df to 4.17 to avoid the upgrade to 4.18 from complaining about v1beta1 usage which happens prior to the upgrade. I believe this should be safe because we enabled the featuregate in 4.17 and Kube API Server Operator upgrades prior to Machine Config Operator.

I believe this will however prevent us from cleanly downgrading back to 4.16, which is unsupported.

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-machine-config-operator
This PR has been included in build ose-machine-config-operator-container-v4.17.0-202508201409.p0.gb7c4291.assembly.stream.el9.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.17.0-0.nightly-2025-08-22-092127

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. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.