Skip to content

OSASINFRA-3434: Use cluster-api-provider-openstack v0.10 and CAPO v1beta1 manifests#8021

Merged
openshift-merge-bot[bot] merged 10 commits intoopenshift:masterfrom
shiftstack:capo-master
Apr 26, 2024
Merged

OSASINFRA-3434: Use cluster-api-provider-openstack v0.10 and CAPO v1beta1 manifests#8021
openshift-merge-bot[bot] merged 10 commits intoopenshift:masterfrom
shiftstack:capo-master

Conversation

@pierreprinetti
Copy link
Member

@pierreprinetti pierreprinetti commented Feb 14, 2024

Use cluster-api-provider-openstack v0.10 and v1beta1 manifests.

@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 Feb 14, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 14, 2024

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

@pierreprinetti
Copy link
Member Author

/test e2e-openstack-ovn

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 14, 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 Feb 15, 2024
@pierreprinetti
Copy link
Member Author

/test e2e-openstack-ovn

@pierreprinetti pierreprinetti force-pushed the capo-master branch 3 times, most recently from f15b17c to a56a44c Compare February 15, 2024 14:45
@pierreprinetti
Copy link
Member Author

test regressions:
/test e2e-openstack-ovn

@pierreprinetti
Copy link
Member Author

/test e2e-openstack-ovn altinfra-e2e-openstack-capi-ovn

@pierreprinetti
Copy link
Member Author

Adapted the manifests to fit the v1alpha8 spec.

/test e2e-openstack-ovn altinfra-e2e-openstack-capi-ovn

@pierreprinetti
Copy link
Member Author

Bumped the bootstrap FIP logic to v1alpha8.

/test e2e-openstack-ovn altinfra-e2e-openstack-capi-ovn

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2024
@pierreprinetti pierreprinetti changed the title DNM: Sync CAPO to upstream/main OSASINFRA-3365: Sync CAPO to upstream/main Feb 19, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 19, 2024

@pierreprinetti: This pull request references OSASINFRA-3365 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.16.0" version, but no target version was set.

Details

In response to this:

This branch is synced with #7939, plus one commit for the CAPO bump.

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/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 19, 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 Feb 28, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 28, 2024

@pierreprinetti: This pull request references OSASINFRA-3365 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.16.0" version, but no target version was set.

Details

In response to this:

Use cluster-api-provider-openstack tip to test v1beta1 manifests.

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.

@pierreprinetti pierreprinetti force-pushed the capo-master branch 4 times, most recently from be785dc to 3edd8b0 Compare February 28, 2024 14:50
@pierreprinetti
Copy link
Member Author

/test altinfra-e2e-openstack-capi-ovn e2e-openstack-ovn

pierreprinetti and others added 9 commits April 26, 2024 11:31
Adjust debug and error messages, scope variables more tightly for
clarity.
To update the CAPO release manifest, check out CAPO locally at the
desired commit and run:

```shell
make release-manifests
```

Then copy the generated file `out/infrastructure-components.yaml` to
`data/data/cluster-api/openstack-infrastructure-components.yaml`.
This is the result of the following steps:

1. Fork cluster-api-provider-openstack and revert its go.mod to Go v1.21
2. Replace the fork in the Installer's go.mod
3. Replace imports from v1alphaX to v1beta1
4. Update manifests to use the v1beta1 spec
CAPO doesn't create server groups; it needs the server groups referred
to in Machines to be created in the PreProvision hook.
Creating a server group for just one member is a non-operation.
When using dualstack the user is required to
pre-create the VIPs Ports, so let's retrieve them
in order to attach the Floating IPs instead of trying to
create Ports with the same address.
When no external network is set on CAPO Cluster status
it's not possible to create a Floating IP for the bootstrap.
This commit fixes the issue by skipping the creation.
When using external LB the API and Ingress are managed externally,
so we shouldn't create Neutron Ports with the VIPs for API and
Ingress nor should we set those addresses in the Machines allowed
address pairs.
This commit fixes the decoding of the cluster scheduler file
by using the apropriate yaml library. Also, it enforces both
IPv4 and IPv6 remote CIDRs on the router sg rule created when the
master is schedulable.
@pierreprinetti pierreprinetti marked this pull request as ready for review April 26, 2024 09:46
@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 Apr 26, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 26, 2024

@pierreprinetti: This pull request references OSASINFRA-3434 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.16.0" version, but no target version was set.

Details

In response to this:

Use cluster-api-provider-openstack v0.10 and v1beta1 manifests.

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.

@pierreprinetti
Copy link
Member Author

/test e2e-openstack-ovn altinfra-openstack-capi-manifests altinfra-e2e-openstack-capi-ccpmso altinfra-e2e-openstack-capi-ccpmso-zone altinfra-e2e-openstack-capi-dualstack altinfra-e2e-openstack-capi-dualstack-upi altinfra-e2e-openstack-capi-externallb altinfra-e2e-openstack-capi-ovn altinfra-e2e-openstack-capi-proxy

module openshift/installer/cluster-api/providers/openstack

go 1.20
go 1.21
Copy link
Contributor

Choose a reason for hiding this comment

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

the Installer folks seems to have a guideline on splitting vendoring commits.
One commit with go.mod and go.sum change and another for the vendor update, like we did in this PR https://github.com/openshift/installer/pull/7939/commits
context #7939 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, it helps with reviewing specially when looking commit by commit in large PRs.

@pierreprinetti
Copy link
Member Author

CI looks good to me. Do you mind also having a look @MaysaMacedo @mandre? Don't be shy and slap a LGTM if you're satisfied.

@MaysaMacedo
Copy link
Contributor

/lgtm

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

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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

/retest-required

Remaining retests: 0 against base HEAD 523f573 and 2 for PR HEAD ff07510 in total

@pierreprinetti
Copy link
Member Author

/override

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 26, 2024

@pierreprinetti: /override requires failed status contexts to operate on, but none was given

Details

In response to this:

/override

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

openshift-ci bot commented Apr 26, 2024

@pierreprinetti: 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/altinfra-e2e-openstack-capi-dualstack-v6primary 7e654375083b6834e421e7aff8a98801530fe0bb link false /test altinfra-e2e-openstack-capi-dualstack-v6primary
ci/prow/altinfra-e2e-openstack-capi-nfv-intel 7e654375083b6834e421e7aff8a98801530fe0bb link false /test altinfra-e2e-openstack-capi-nfv-intel
ci/prow/okd-e2e-aws-ovn-upgrade ff07510 link false /test okd-e2e-aws-ovn-upgrade
ci/prow/e2e-openstack-proxy ff07510 link false /test e2e-openstack-proxy
ci/prow/e2e-gcp-ovn-xpn ff07510 link false /test e2e-gcp-ovn-xpn
ci/prow/altinfra-e2e-openstack-capi-proxy ff07510 link false /test altinfra-e2e-openstack-capi-proxy
ci/prow/altinfra-e2e-openstack-capi-externallb ff07510 link false /test altinfra-e2e-openstack-capi-externallb
ci/prow/e2e-gcp-ovn-shared-vpc ff07510 link false /test e2e-gcp-ovn-shared-vpc
ci/prow/altinfra-e2e-openstack-capi-dualstack ff07510 link false /test altinfra-e2e-openstack-capi-dualstack
ci/prow/altinfra-e2e-openstack-capi-dualstack-upi ff07510 link false /test altinfra-e2e-openstack-capi-dualstack-upi
ci/prow/e2e-gcp-secureboot ff07510 link false /test e2e-gcp-secureboot

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-merge-bot openshift-merge-bot bot merged commit be92db7 into openshift:master Apr 26, 2024
@pierreprinetti pierreprinetti deleted the capo-master branch April 26, 2024 23:30
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.

6 participants