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

Fix adoption_vars, only one defaultRoute #2653

Merged
merged 1 commit into from
Feb 4, 2025

Conversation

hjensas
Copy link
Contributor

@hjensas hjensas commented Jan 16, 2025

With PR#2548 support was added for multiple edpm nodesets, these may not have the same networks attached - i.e Compute and Networkere nodes have different network needs. When introducing this support the networks was made dynamic, and the defaultRoute was set for every network.

Only one network can have the defaultRoute, this caused an error when deploying the openstackdataplanenodeset.

Restore the behaviour prior to #2548 - which would only set defaultRoute for the ctlplane network.

Also, filter the cifmw_libvirt_manager_pub_net when generating networks
for edpm_nodes. cifmw_libvirt_manager_pub_net (typically named ocpbm) is
a ci-framework "management" network and should not be included in the
EDPM nodeset configs.

Jira: OSPRH-13013

@hjensas hjensas requested a review from a team as a code owner January 16, 2025 10:36
Copy link
Contributor

openshift-ci bot commented Jan 16, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign lewisdenny for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@github-actions github-actions bot marked this pull request as draft January 16, 2025 10:37
Copy link

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

@hjensas hjensas changed the title Fix automation_vars, only one defaultRoute Fix adoption_vars, only one defaultRoute Jan 16, 2025
@hjensas hjensas force-pushed the OSPRH-13013 branch 2 times, most recently from 7ccaa46 to c03c060 Compare January 22, 2025 11:20
Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fbcb266f99b9418aadbc35770666c582

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 39m 53s
podified-multinode-edpm-deployment-crc FAILURE in 1h 27m 00s
cifmw-crc-podified-edpm-baremetal FAILURE in 1h 25m 51s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 50s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 23s
✔️ build-push-container-cifmw-client SUCCESS in 21m 45s

@hjensas hjensas marked this pull request as ready for review January 29, 2025 13:04
@hjensas
Copy link
Contributor Author

hjensas commented Jan 29, 2025

recheck

Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/32c98bfd5b8d4d09863b445b3c7ea17d

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 55m 41s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 42s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 14m 13s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 30s
✔️ cifmw-pod-pre-commit SUCCESS in 9m 38s
✔️ build-push-container-cifmw-client SUCCESS in 17m 59s

@hjensas hjensas force-pushed the OSPRH-13013 branch 4 times, most recently from 9831c8c to 2ffa70a Compare January 29, 2025 19:46
@ciecierski ciecierski requested a review from cjeanner January 29, 2025 20:21
ciecierski
ciecierski previously approved these changes Jan 29, 2025
@hjensas hjensas requested a review from a team January 31, 2025 13:30
With PR# 2548 support was added for multiple edpm nodesets, these may
not have the same networks attached - i.e Compute and Networkere nodes
have different network needs. When introducing this support the
`networks` was made dynamic, and the `defaultRoute` was set for every
network.

Only one network can have the `defaultRoute`, this caused an error when
deploying the openstackdataplanenodeset.

Restore the behaviour prior to PR# 2548 - which would only set
`defaultRoute` for the `ctlplane` network.

Also, filter the cifmw_libvirt_manager_pub_net when generating networks
for edpm_nodes. cifmw_libvirt_manager_pub_net (typically named ocpbm) is
a ci-framework "management" network and should not be included in the
EDPM nodeset configs.

Jira: OSPRH-1301
@ciecierski ciecierski removed the request for review from cjeanner February 3, 2025 12:22
@ciecierski ciecierski requested a review from pablintino February 4, 2025 09:44
@ciecierski ciecierski merged commit 99f54c7 into openstack-k8s-operators:main Feb 4, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants