Skip to content

OCPCLOUD-3105: Bump cluster-api to v1.11.3#453

Merged
openshift-merge-bot[bot] merged 8 commits intoopenshift:masterfrom
chrischdi:pr-capi-v1-11-bump
Dec 10, 2025
Merged

OCPCLOUD-3105: Bump cluster-api to v1.11.3#453
openshift-merge-bot[bot] merged 8 commits intoopenshift:masterfrom
chrischdi:pr-capi-v1-11-bump

Conversation

@chrischdi
Copy link
Contributor

No description provided.

for f in $(find . -iname '*.go' | grep -v vendor); do
    sed -i "" 's@sigs.k8s.io/cluster-api/api/v1beta1@sigs.k8s.io/cluster-api/api/core/v1beta1@g' "$f"
    sed -i "" 's@sigs.k8s.io/cluster-api/util/conditions/v1beta2@sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2@g' "$f"
done
@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 3, 2025
@openshift-ci openshift-ci bot requested review from mdbooth and nrb December 3, 2025 13:12
@chrischdi chrischdi changed the title [WIP] Bump cluster-api to v1.11.3 Bump cluster-api to v1.11.3 Dec 3, 2025
@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 3, 2025

go 1.24.0

replace sigs.k8s.io/cluster-api-provider-azure => github.com/damdo/cluster-api-provider-azure v0.0.0-20251202084521-c2e0e38d1e0e
Copy link
Member

Choose a reason for hiding this comment

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

This will need to change once the CAPZ PR merges: openshift/cluster-api-provider-azure#354

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.

Went through this with @chrischdi
All changes look reasonable to me

/approve
/lgtm

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

openshift-ci bot commented Dec 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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 Dec 3, 2025
@chrischdi chrischdi changed the title Bump cluster-api to v1.11.3 OCPCLOUD-3105: Bump cluster-api to v1.11.3 Dec 3, 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 Dec 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 3, 2025

@chrischdi: This pull request references OCPCLOUD-3105 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.21.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.

@damdo
Copy link
Member

damdo commented Dec 3, 2025

/test e2e-gcp-capi-techpreview e2e-vsphere-operator

1 similar comment
@damdo
Copy link
Member

damdo commented Dec 4, 2025

/test e2e-gcp-capi-techpreview e2e-vsphere-operator

@damdo
Copy link
Member

damdo commented Dec 4, 2025

/retest

1 similar comment
@damdo
Copy link
Member

damdo commented Dec 4, 2025

/retest

@sunzhaohua2
Copy link
Contributor

there is a case failed for gcp, I created a bug https://issues.redhat.com/browse/OCPBUGS-66893 and raised a pr openshift/cluster-api-provider-gcp#254 hope this is correct

[It] Cluster API GCP MachineSet should configure Confidential VM correctly Confidential Compute AMDEncryptedVirtualization [capi, disruptive] 
 GCPMachineTemplate.infrastructure.cluster.x-k8s.io "gcpmachinetemplate-cq9ts" is invalid: spec.template.spec.confidentialCompute: Unsupported value: "AMDEncryptedVirtualization": supported values: "Enabled", "Disabled"

@damdo
Copy link
Member

damdo commented Dec 6, 2025

/retest

/test e2e-aws-capi-techpreview

@damdo
Copy link
Member

damdo commented Dec 7, 2025

/retest

1 similar comment
@shellyyang1989
Copy link

/retest

@sunzhaohua2
Copy link
Contributor

sunzhaohua2 commented Dec 8, 2025

azure ci fix pr #452
e2e-gcp-capi-techpreview always timeout, I created a pr to change job's test time openshift/release#72337

@sunzhaohua2
Copy link
Contributor

/retest

@sunzhaohua2
Copy link
Contributor

/test e2e-azure-capi-techpreview

@chrischdi
Copy link
Contributor Author

openshift/cluster-capi-operator#423

May improve the test failures here.

@chrischdi
Copy link
Contributor Author

/retest

1 similar comment
@sunzhaohua2
Copy link
Contributor

/retest

@sunzhaohua2
Copy link
Contributor

/test e2e-gcp-capi-techpreview

@damdo
Copy link
Member

damdo commented Dec 10, 2025

/verified by relevant CI jobs passing

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 10, 2025
@openshift-ci-robot
Copy link

@damdo: This PR has been marked as verified by relevant CI jobs passing.

Details

In response to this:

/verified by relevant CI jobs passing

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.

@chrischdi
Copy link
Contributor Author

This test already had been green for this test
/test e2e-azure-operator

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 10, 2025

@chrischdi: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit c4fc1d7 into openshift:master Dec 10, 2025
11 checks passed
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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants