Skip to content

OCPCLOUD-2565: Bump openshift/api#1256

Merged
openshift-merge-bot[bot] merged 7 commits intoopenshift:masterfrom
theobarberbany:bump-api
Jun 6, 2024
Merged

OCPCLOUD-2565: Bump openshift/api#1256
openshift-merge-bot[bot] merged 7 commits intoopenshift:masterfrom
theobarberbany:bump-api

Conversation

@theobarberbany
Copy link
Copy Markdown
Contributor

No description provided.

@theobarberbany theobarberbany changed the title Bump api Bump openshift/api May 31, 2024
@openshift-ci openshift-ci Bot requested review from elmiko and racheljpg May 31, 2024 11:55
@theobarberbany theobarberbany force-pushed the bump-api branch 3 times, most recently from a4279b0 to b69e0db Compare June 3, 2024 10:46
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2024
Comment thread hack/crds-sync.sh Outdated
Comment thread pkg/controller/vsphere/session/session_test.go Outdated
Comment thread pkg/util/conditions/conditions.go Outdated
@theobarberbany
Copy link
Copy Markdown
Contributor Author

/retest-required

Comment thread hack/crds-sync.sh Outdated
Comment thread hack/crds-sync.sh Outdated
@theobarberbany theobarberbany force-pushed the bump-api branch 2 times, most recently from 36eca23 to 3798654 Compare June 5, 2024 15:14
@JoelSpeed
Copy link
Copy Markdown
Contributor

Looks like the CRD sync needs re-running, and perhaps, clear the dir before you run it just to make sure everything is clean there?

@theobarberbany
Copy link
Copy Markdown
Contributor Author

@JoelSpeed something weird is going on with my local machine or with git, where the rename is not noticing the case change.

machine-api-operator on  bump-api via 🐳 desktop-linux via 🐹 v1.22.4 on ☁️   tbarberb@redhat.com(us-east1)
❯ ls -la install | grep Default
-rw-r--r--   1 tbarberb  staff  28058 Jun  6 12:33 0000_30_machine-api-operator_02_machine.Default.crd.yaml
-rw-r--r--   1 tbarberb  staff  36682 Jun  6 12:33 0000_30_machine-api-operator_03_machineset.Default.crd.yaml

machine-api-operator on  bump-api via 🐳 desktop-linux via 🐹 v1.22.4 on ☁️   tbarberb@redhat.com(us-east1)
❯ ls -la install | grep default

but in the git diff:

...rator_03_machineset.crd.yaml => 0000_30_machine-api-operator_03_machineset.default.crd.yaml} 

@JoelSpeed
Copy link
Copy Markdown
Contributor

Try using git rm <file>

@theobarberbany
Copy link
Copy Markdown
Contributor Author

theobarberbany commented Jun 6, 2024

This was initially done with a git rm - I'm trying removing and adding in different commits and then squashing back.

edit: seems to have worked :D

@JoelSpeed
Copy link
Copy Markdown
Contributor

/lgtm
/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2024

@theobarberbany: 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-metal-ipi-ovn-ipv6 5727c94 link false /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-metal-ipi-upgrade 5727c94 link false /test e2e-metal-ipi-upgrade
ci/prow/e2e-metal-ipi-ovn-dualstack 5727c94 link false /test e2e-metal-ipi-ovn-dualstack

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.

@JoelSpeed
Copy link
Copy Markdown
Contributor

/approve
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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 Jun 6, 2024
@JoelSpeed JoelSpeed changed the title Bump openshift/api OCPCLOUD-2565: Bump openshift/api Jun 6, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 6, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jun 6, 2024

@theobarberbany: This pull request references OCPCLOUD-2565 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.17.0" version, but no target version was set.

Details

In response to this:

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-merge-bot openshift-merge-bot Bot merged commit 148e5dc into openshift:master Jun 6, 2024
@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-machine-api-operator-container-v4.17.0-202406061914.p0.g148e5dc.assembly.stream.el9 for distgit ose-machine-api-operator.
All builds following this will include this PR.

@theobarberbany theobarberbany deleted the bump-api branch June 7, 2024 10:47
r4f4 added a commit to r4f4/installer that referenced this pull request Jul 8, 2024
Notice that we had to also bump machine-api-operator to include [1] so
it would build with the latest openshift/api.

[1] openshift/machine-api-operator#1256
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants