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

Use new nad.EnsureNetworksAnnotation() func to get NAD annotations #893

Merged

Conversation

stuggi
Copy link
Contributor

@stuggi stuggi commented Nov 13, 2024

For BGP setup there is the need to set the default gateway to the additional interface defined via the multus annotations. To allow this a user can configure ipam.gateway in the NAD. EnsureNetworksAnnotation() will override the pod network default route by reading the NAD. If ipam.gateway is defined and not "", it gets set on the networks annotation as the default-route.

Jira: https://issues.redhat.com/browse/OSPRH-8680

Depends-On: openstack-k8s-operators/lib-common#579

@stuggi stuggi requested review from olliewalsh, lmiccini, gibizer and mrkisaolamb and removed request for frenzyfriday November 13, 2024 14:12
@bogdando
Copy link
Contributor

could you please add a unit test

@stuggi
Copy link
Contributor Author

stuggi commented Nov 13, 2024

could you please add a unit test

we already have unit tests for this when I introduced it initially in https://github.com/openstack-k8s-operators/nova-operator/blob/main/test/functional/novaconductor_controller_test.go#L496 . also we have unit tests in lib-common for the func.

@stuggi stuggi marked this pull request as draft November 13, 2024 14:21
@bogdando
Copy link
Contributor

could you please add a unit test

we already have unit tests for this when I introduced it initially in https://github.com/openstack-k8s-operators/nova-operator/blob/main/test/functional/novaconductor_controller_test.go#L496 . also we have unit tests in lib-common for the func.

ok, if we don't need additional coverage for nadList, it looks good then

For BGP setup there is the need to set the default gateway
to the additional interface defined via the multus annotations.
To allow this a user can configure `ipam.gateway` in the NAD.
EnsureNetworksAnnotation() will override the pod network default
route by reading the NAD. If `ipam.gateway` is defined and not "",
it gets set on the networks annotation as the `default-route`.

Jira: https://issues.redhat.com/browse/OSPRH-8680

Depends-On: openstack-k8s-operators/lib-common#579

Signed-off-by: Martin Schuppert <[email protected]>
@stuggi stuggi marked this pull request as ready for review November 13, 2024 15:01
@openshift-ci openshift-ci bot requested a review from lewisdenny November 13, 2024 15:01
Copy link
Contributor

@mrkisaolamb mrkisaolamb left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

openshift-ci bot commented Nov 14, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrkisaolamb, stuggi

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-merge-bot openshift-merge-bot bot merged commit b95e933 into openstack-k8s-operators:main Nov 14, 2024
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