Skip to content

Comments

OPNET-415: Revert the revert "Extend infra CR to store VIPs and MachineNetwork""#1695

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
mkowalski:revert-1694-revert-1593-OPNET-351
Jan 4, 2024
Merged

OPNET-415: Revert the revert "Extend infra CR to store VIPs and MachineNetwork""#1695
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
mkowalski:revert-1694-revert-1593-OPNET-351

Conversation

@mkowalski
Copy link
Contributor

In #1593 we have implemented a new API targeting OCP 4.15

In #1694 we have reverted this change as the feature has been deferred till OCP 4.16

Here we revert the revert with the desire to merge it after the 4.15 branching so that it lands in master but not in release-4.15

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 5, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 5, 2023

@mkowalski: This pull request references OPNET-415 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

Details

In response to this:

In #1593 we have implemented a new API targeting OCP 4.15

In #1694 we have reverted this change as the feature has been deferred till OCP 4.16

Here we revert the revert with the desire to merge it after the 4.15 branching so that it lands in master but not in release-4.15

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/test-infra repository.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 5, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 5, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 5, 2023

Hello @mkowalski! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 5, 2023
@mkowalski
Copy link
Contributor Author

/cc @JoelSpeed
/cc @cybertron
/hold

To unhold only after branching

@openshift-ci openshift-ci bot requested review from JoelSpeed and cybertron December 5, 2023 12:53
@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 Dec 5, 2023
@mkowalski mkowalski marked this pull request as ready for review December 11, 2023 07:53
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 11, 2023
@mkowalski
Copy link
Contributor Author

/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 Dec 11, 2023
@openshift-ci openshift-ci bot requested a review from yuqi-zhang December 11, 2023 07:54
@mkowalski mkowalski force-pushed the revert-1694-revert-1593-OPNET-351 branch 3 times, most recently from 8f4b773 to bd9f541 Compare December 11, 2023 16:26
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2023
@mkowalski mkowalski force-pushed the revert-1694-revert-1593-OPNET-351 branch from bd9f541 to db05383 Compare January 3, 2024 12:51
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 3, 2024
@mkowalski mkowalski force-pushed the revert-1694-revert-1593-OPNET-351 branch from db05383 to adf402f Compare January 3, 2024 14:26
@mkowalski
Copy link
Contributor Author

mkowalski commented Jan 3, 2024

Hey @JoelSpeed, already in 4.16, can we get this back again?

@JoelSpeed
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 3, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, mkowalski

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 Jan 3, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 053aee2 and 2 for PR HEAD adf402f in total

@mkowalski
Copy link
Contributor Author

/test e2e-aws-serial-techpreview

Failure in namespace/openshift-monitoring

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 4, 2024

@mkowalski: all tests passed!

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

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-config-api-container-v4.16.0-202401041812.p0.gc7a2d3b.assembly.stream for distgit ose-cluster-config-api.
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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants