Skip to content

OCPBUGS-44455: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17 #342

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
openshift-merge-bot merged 2 commits into from
Nov 28, 2024
Merged

OCPBUGS-44455: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17 #342

openshift-merge-bot merged 2 commits into from
Nov 28, 2024

Conversation

@shiftstack-merge-bot
Copy link

@shiftstack-merge-bot shiftstack-merge-bot bot commented Nov 25, 2024

No description provided.

@openshift-ci openshift-ci bot requested review from gryf and mdbooth November 25, 2024 19:38
@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 25, 2024
@openshift-ci
Copy link

openshift-ci bot commented Nov 25, 2024

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@EmilienM
Copy link
Member

EmilienM commented Nov 25, 2024

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 25, 2024
@EmilienM
Copy link
Member

EmilienM commented Nov 25, 2024

/approve
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 25, 2024
@rlobillo
Copy link

rlobillo commented Nov 26, 2024

@EmilienM Could you please help to understand the context of this one? Thanks!

@EmilienM
Copy link
Member

EmilienM commented Nov 26, 2024

@EmilienM Could you please help to understand the context of this one? Thanks!

When syncing CAPO with upstream, some assets in the the openshift directory needs to re-generated. merge-bot can now take care of it by running make merge-bot if asked. So in downstream CAPO we maintain this target so it'll generate what's needed and commit it to the PR.

@EmilienM
Better conditions for creating Floating IPs
77383e6 
When a floating is created, we need to make sure that
`OpenStackCluster.Spec.DisableExternalNetwork` is not set to `True`.
Otherwise, we'll have a nil pointer error.

* Add a check in `reconcileBastion` to check that external network is
  not disabled before creating the floating IP for the bastion.
* Add a check in `reconcileControlPlaneEndpoint` and
  `reconcileAPIServerLoadBalancer` to check that external
  network is not disabled (alongside the DisableAPIServerFloatingIP
  check) before creating the floating IP for the API server endpoint.
* Add a safeguard in `GetOrCreateFloatingIP` to return a proper error
  (instead of a nil pointer error) when
  `openStackCluster.Status.ExternalNetwork` is nil.
* Add API CEL to check that when DisableExternalNetwork is set and true,
  the bastion (if defined) doesn't have a floating IP defined and also
  that disableAPIServerFloatingIP (when set) is not False.

(cherry picked from commit 5429b4b)
@EmilienM
CARRY: make merge-bot
eacd146
@EmilienM EmilienM force-pushed the merge-bot-release-4.17 branch from 886fd31 to eacd146 Compare November 26, 2024 13:12
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2024
@EmilienM
Copy link
Member

EmilienM commented Nov 26, 2024

/retitle OCPBUGS-44455: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17

@openshift-ci openshift-ci bot changed the title Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17 OCPBUGS-44455: Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.10 into release-4.17 Nov 26, 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 Nov 26, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 26, 2024

@shiftstack-merge-bot[bot]: This pull request references Jira Issue OCPBUGS-44455, which is invalid:

  • expected the bug to be open, but it isn't
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done) instead

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:

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-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 26, 2024
@EmilienM
Copy link
Member

EmilienM commented Nov 26, 2024

/jira refresh

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

openshift-ci-robot commented Nov 26, 2024

@EmilienM: This pull request references Jira Issue OCPBUGS-44455, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-44458 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-44458 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (itbrown@redhat.com), skipping review request.

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.

@EmilienM
Copy link
Member

EmilienM commented Nov 26, 2024

/lgtm

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

openshift-ci bot commented Nov 26, 2024

@shiftstack-merge-bot[bot]: 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-sigs/prow repository. I understand the commands that are listed here.

mandre
mandre reviewed Nov 26, 2024
View reviewed changes
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 26, 2024
@openshift-ci
Copy link

openshift-ci bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, mandre

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

@rlobillo
Copy link

rlobillo commented Nov 28, 2024

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 28, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 23512b6 into openshift:release-4.17 Nov 28, 2024
@openshift-merge-bot openshift-merge-bot bot deleted the merge-bot-release-4.17 branch November 28, 2024 08:59
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2024

@shiftstack-merge-bot[bot]: Jira Issue OCPBUGS-44455: All pull requests linked via external trackers have merged:

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

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-bot
Copy link

openshift-bot commented Nov 28, 2024

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.17.0-202411280934.p0.g23512b6.assembly.stream.el9.
All builds following this will include this PR.

@openshift-ci-robot openshift-ci-robot mentioned this pull request Jun 23, 2025
Merged
@openshift-merge-robot
Copy link

openshift-merge-robot commented Jun 24, 2025

Fix included in accepted release 4.17.0-0.nightly-2025-06-23-191650

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

Reviewers

@mandre mandre mandre left review comments

@gryf gryf Awaiting requested review from gryf

@mdbooth mdbooth Awaiting requested review from mdbooth

Assignees

@mandre mandre

@EmilienM EmilienM

@rlobillo rlobillo

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@EmilienM @rlobillo @openshift-ci-robot @openshift-bot @openshift-merge-robot @mandre