Skip to content
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.

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

OCPCLOUD-2857: Merge https://github.com/kubernetes-sigs/cluster-api:v1.9.4 (79e6731) into master #230

Merged

Conversation

cloud-team-rebase-bot[bot]
Copy link

No description provided.

sbueringer and others added 30 commits November 12, 2024 15:28
…es-to-cluster-ctrl

🌱 Add MD/MP watches to Cluster controller
…concile-external-pause

🌱 Remove paused handling from reconcileExternal
…v1beta2-condition-messages

🌱 Refine v1beta2 condition messages
…etes-sigs#11135)

* 🌱 clusterctl: add nutanix ipam provider

* 🌱 clusterctl: add nutanix runtime extensions provider

* docs: Add more info on github org prefix
…v1beta2-condition-reasons

🌱 Refine v1beta2 condition reasons
…onneciton-probe

🌱 Improve Cluster RemoteConnectionProbe condition
# Conflicts:
#	internal/controllers/cluster/cluster_controller_status.go
#	internal/controllers/cluster/cluster_controller_status_test.go
…ondition-order

🌱 Improve v1beta2 condition ordering
…achinepool-aggregation

🐛 Disable aggregation of not reported MachinePool conditions for Cluster
…v1beta2-mirror-conditions

🌱 Refine v1beta2 mirror conditions
…v1beta2-summary-order

🌱 Refine order for v1beta2 summary util
…v1beta2-aggregation-order

🌱 Refine v1beta2 aggregation order
…-improvements

🌱 Various improvements of v1beta2 conditions
…v1beta2-condition-order

🌱 Refine v1beta2 condition order
RuntimeClient is only mandatory if RuntimeSDK feature gate is enabled

Signed-off-by: Lennart Jern <[email protected]>
…time-client-nil-check

🐛 Fix RuntimeClient nil check in Cluster controller
@damdo
Copy link
Member

damdo commented Feb 10, 2025

/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 Feb 10, 2025
@damdo
Copy link
Member

damdo commented Feb 11, 2025

/retest

1 similar comment
@damdo
Copy link
Member

damdo commented Feb 13, 2025

/retest

@damdo
Copy link
Member

damdo commented Feb 13, 2025

@openshift-ci openshift-ci bot changed the title Merge https://github.com/kubernetes-sigs/cluster-api:v1.9.4 (79e6731) into master OCPCLOUD-2857: Merge https://github.com/kubernetes-sigs/cluster-api:v1.9.4 (79e6731) into master Feb 13, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 13, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 13, 2025

@cloud-team-rebase-bot[bot]: This pull request references OCPCLOUD-2857 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 task to target the "4.19.0" version, but no target version was set.

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.

@damdo
Copy link
Member

damdo commented Feb 13, 2025

This is behind the TechPreview featureset, so not on the critical path for payload stability.

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 13, 2025
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

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

openshift-ci bot commented Feb 13, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cloud-team-rebase-bot[bot], damdo

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD da8215c and 2 for PR HEAD 71e258f in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD da8215c and 2 for PR HEAD 71e258f in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD da8215c and 2 for PR HEAD 71e258f in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD da8215c and 2 for PR HEAD 71e258f in total

@mdbooth
Copy link

mdbooth commented Feb 14, 2025

I'm testing a fix for the OpenStack failure here: openshift/cluster-api-provider-openstack#357

@EmilienM
Copy link
Member

Matt's fix has merged. We can retest at the next CI promotion which contains the fix in CAPO downstream.

@damdo
Copy link
Member

damdo commented Feb 15, 2025

/retest

@mdbooth
Copy link

mdbooth commented Feb 16, 2025

This job is using 4.19.0-0.ci (verified by the release build log).

The OpenStack fix was included in 4.19.0-0.ci-2025-02-15-111027, but we haven't had a promoted release in the 4.19.0-0.ci stream since it landed. We should retest as soon as we have a promoted release image after 4.19.0-0.ci-2025-02-15-111027. We can monitor it here:
https://openshift-release.apps.ci.l2s4.p1.openshiftapps.com/#4.19.0-0.ci

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD da8215c and 2 for PR HEAD 71e258f in total

Copy link

openshift-ci bot commented Feb 17, 2025

@cloud-team-rebase-bot[bot]: all tests passed!

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 4c27763 into openshift:master Feb 17, 2025
13 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-api
This PR has been included in build ose-cluster-api-container-v4.19.0-202502171407.p0.g4c27763.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
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.