Closed kayrus closed 6 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: zetaab
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/lgtm
@jichenjc @zetaab @dulek this PR is clearly a feature, and this improvement affects only selected environments. Keeping in mind that the default behavior wasn't changed, is there a chance we can cherry-pick the fix to earlier OCCM versions?
generally only with bugs to backport.. but I think this unblock some use case so should be good backport if everyone agree
Yeah, I'm not opposed to backporting this, seems like it was highly anticipated. @stephenfin, @mdbooth, how do you look at this?
/cherry-pick release-1.30
/cherry-pick release-1.29
/cherry-pick release-1.28
@kayrus: new pull request created: #2603
@kayrus: new pull request created: #2604
@kayrus: #2601 failed to apply on top of branch "release-1.28":
Applying: POC of TargetNodeLabels selector on OpenStack LB
Applying: Fix type errors
Applying: Update implementation of getKeyValuePropertiesFromServiceAnnotation
Applying: gofmt -w -s ./pkg
Applying: Polish the code and add documentation
Using index info to reconstruct a base tree...
M docs/openstack-cloud-controller-manager/expose-applications-using-loadbalancer-type-service.md
M docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md
M pkg/openstack/loadbalancer.go
M pkg/openstack/loadbalancer_test.go
M pkg/openstack/openstack.go
M pkg/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/util/util.go
Auto-merging pkg/openstack/openstack.go
Auto-merging pkg/openstack/loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/openstack/loadbalancer_test.go
Auto-merging pkg/openstack/loadbalancer.go
Auto-merging docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md
CONFLICT (content): Merge conflict in docs/openstack-cloud-controller-manager/using-openstack-cloud-controller-manager.md
Auto-merging docs/openstack-cloud-controller-manager/expose-applications-using-loadbalancer-type-service.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 Polish the code and add documentation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
What this PR does / why we need it:
This PR adds an ability to specify loadbalancer service with a node selector.
Big thanks to @ririko-nakamura for the initial code.
A new OCCM
node-selector
option is added into the[LoadBalancer]
config section. And a newloadbalancer.openstack.org/node-selector
service annotation support is added.Which issue this PR fixes(if applicable): fixes #1770
Special notes for reviewers:
Release note: