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.

Sign up for GitHub

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

Jump to bottom

[occm] Support Octavia load balancing method via annotation #2684

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[occm] Support Octavia load balancing method via annotation #2684

wants to merge 2 commits into from
+140 −2

Conversation

Lucasgranet
Copy link
Contributor

@Lucasgranet Lucasgranet commented Oct 2, 2024 •
edited
Loading

What this PR does / why we need it:
Adds the ability to change the LB Algorithm of an Octavia using an annotation.

This PR brings a new annotation:

loadbalancer.openstack.org/lb-method: "" # Default value: the one defined in the OCCM configuration file

Special notes for reviewers:
N/A

Release note:

[occm] Octavia - ability to change the load balancing method using an annotation.

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Oct 2, 2024
@k8s-ci-robot
Copy link
Contributor

[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 jichenjc for approval. For more information see the Kubernetes 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

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 2, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @Lucasgranet. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 2, 2024
@Lucasgranet Lucasgranet changed the title [occm] Support Octavia Prometheus endpoint creation using annotations [occm] Support Octavia load balancing method via annotation Oct 2, 2024
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 2, 2024
@nicolaslacroux
Copy link

Hello,

If you have some time, would you mind reviewing this PR please?

Thank you,

kayrus
kayrus reviewed Oct 15, 2024
View reviewed changes
Copy link
Contributor

@kayrus kayrus left a comment

Choose a reason for hiding this comment

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

Thanks for the PR. See my comments.

pkg/openstack/loadbalancer.go
Comment on lines +919 to +926
var msg string
var castErr gophercloud.ErrUnexpectedResponseCode
switch {
case errors.As(err, &castErr):
msg = fmt.Sprintf("Error updating LB method for LoadBalancer: %s", string(castErr.Body))
default:
msg = fmt.Sprintf("Error updating LB method for LoadBalancer: %s", err.Error())
}
Copy link
Contributor

Choose a reason for hiding this comment

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

we have a PreserveGopherError helper for this

pkg/openstack/loadbalancer.go
@@ -124,6 +126,7 @@ type serviceConfig struct {
lbPublicSubnetSpec *floatingSubnetSpec
nodeSelectors map[string]string
keepClientIP bool
poolLbMethod *v2pools.LBMethod
Copy link
Contributor

Choose a reason for hiding this comment

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

do we really need this to be a pointer and v2pools.LBMethod type? Let's make it a regular string and avoid type conversion useless type conversions. We can keep only one when we define pools.CreateOpts.

kayrus
kayrus reviewed Oct 15, 2024
View reviewed changes
pkg/openstack/loadbalancer.go
Comment on lines +495 to +496
func getLBMethodFromServiceAnnotation(service *corev1.Service) *v2pools.LBMethod {
lbMethodValue := getStringFromServiceAnnotation(service, ServiceAnnotationLoadBalancerLbMethod, "")
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use lbaas.opts.LBMethod as a default value?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kayrus kayrus kayrus left review comments

@mxm-tr mxm-tr mxm-tr left review comments

@FengyunPan2 FengyunPan2 Awaiting requested review from FengyunPan2

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Lucasgranet @k8s-ci-robot @nicolaslacroux @kayrus @mxm-tr