feat: add configurable loadbalancer network #1922

oblazek · 2024-03-05T10:15:26Z

Previously when loadbalacer was created it used the same network/subnet as the control plane nodes for the VIP. This was not always the right assumption as some users might want to be able to customize this according to their env.

This commit fixes the above by adding two fields into OpenStackClusterSpec/Status two fields network and subnets under APIServerLoadBalancer so that user can define which network/subnet to use for allocation of the loadbalancer.

apiVersion: infrastructure.cluster.x-k8s.io/v1alpha8
kind: OpenStackCluster
metadata:
  name: {{ capi_cluster_name }}
spec:
  cloudName: {{ capi_cluster_os_cloud }}
  identityRef:
    kind: Secret
    name: test3-cloud-config
  managedSecurityGroups: true
  apiServerLoadBalancer:
    enabled: true
    network:
      name: vip-net-ulab1
    subnets:
      - name: ulab1-ipv4-1
status:
  apiServerLoadBalancer:
    id: 808239dc-064f-402e-bd7d-ca667157a76c
    internalIP: 10.248.11.161
    ip: ""
    loadBalancerNetwork:
      id: 65f6a910-3968-46c0-8f72-e4f171476670
      name: vip-net-ulab1
      subnets:
      - id: 5b4e2c9b-1ab9-4510-87a4-6d2301e16e77
    name: k8s-clusterapi-cluster-test3-test3-kubeapi

Fixes: #1809

Signed-off-by: Ondrej Blazek ondrej.blazek@firma.seznam.cz

linux-foundation-easycla · 2024-03-05T10:15:32Z

The committers listed above are authorized under a signed CLA.

✅ login: oblazek / name: Ondrej Blazek (e2897fb)

k8s-ci-robot · 2024-03-05T10:15:35Z

Welcome @oblazek!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-openstack 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-openstack has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-03-05T10:15:36Z

Hi @oblazek. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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/test-infra repository.

netlify · 2024-03-05T10:15:42Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name	Link
🔨 Latest commit	`e2897fb`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/6613961c7573080009e8254f
😎 Deploy Preview	https://deploy-preview-1922--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

dulek · 2024-03-05T11:36:03Z

/ok-to-test

api/v1alpha6/conversion_test.go

dulek · 2024-03-05T11:45:18Z

api/v1alpha6/conversion_test.go

+				// None of these fields exist in v1alpha6
+				spec.APIServerLoadBalancer.Network = nil
+				spec.APIServerLoadBalancer.Subnets = nil


api/v1beta1/types.go

pkg/cloud/services/loadbalancer/loadbalancer.go

controllers/openstackcluster_controller.go

mdbooth · 2024-03-05T12:07:29Z

api/v1beta1/types.go

+	// Network defines which network should the load balancer be allocated on.
+	//+optional
+	Network *NetworkFilter `json:"network,omitempty"`
+	// Subnet defines which network(s) should the load balancer be allocated on.


I'm guessing that all these subnets must be in the same network, which is described by Network?

Is it permitted to specify Subnets without network?

yeah that's a good point, tbh we will most likely end up in specifying just the Network (by its name) and it won't matter to us which subnet will be chosen as far as I get 1 IPv4 and 1 IPv6 VIP

mdbooth

I think this is good in principal, but there are a few things to straighten out.

oblazek · 2024-03-13T14:58:23Z

this should be ready for another round

dulek

/lgtm

This looks pretty good to me, some small remarks inline.

api/v1alpha6/openstackcluster_conversion.go

api/v1alpha7/openstackcluster_conversion.go

api/v1beta1/types.go

controllers/openstackcluster_controller.go

mdbooth

A few comments, but this is close. Thanks!

controllers/openstackcluster_controller.go

mdbooth · 2024-03-20T20:16:54Z

controllers/openstackcluster_controller.go

+				return fmt.Errorf("no subnet match was found in the specified network (specified subnet: %v, available subnets: %v)", s, lbNetList[0].Subnets)
+			}
+		}
+	}


How about making the default explicit and copying in the cluster network in the else branch? Then we could just make the creation code assume it's set. We could also shortcut the lookup at the top of this function if it's already set.

I think it looks better now.

mdbooth · 2024-03-20T20:20:24Z

pkg/cloud/services/loadbalancer/loadbalancer.go

+	var vipNetworkID, vipSubnetID string
+	if openStackCluster.Status.APIServerLoadBalancer != nil {
+		if openStackCluster.Status.APIServerLoadBalancer.LoadBalancerNetwork != nil {


If we made the suggested change above where we copy in the cluster network when resolving the vip network, this block becomes unconditional. Also, when we add dual stack support here we get it in the non-custom case too, for free. You'll just want to return an error if APIServerLB or APIServerLB.Network are nil in the status, which will also mean we don't need all the nesting.

good call, should be fixed now if I am not mistaken

dulek

Just a question inline.

dulek · 2024-04-05T15:30:39Z

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/onsi/gomega v1.30.0
 	github.com/prometheus/client_golang v1.17.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/crypto v0.16.0


Why the deps bump?

probably by running some go mod tidy .. will remove

Previously when loadbalacer was created it used the same network/subnet as the control plane nodes for the VIP. This was not always the right assumption as some users might want to be able to customize this according to their env. This commit fixes the above by adding two fields into OpenStackClusterSpec/Status two fields `network` and `subnets` under `APIServerLoadBalancer` so that user can define which network/subnet to use for allocation of the loadbalancer. Signed-off-by: Ondrej Blazek <ondrej.blazek@firma.seznam.cz>

dulek

/lgtm

mdbooth · 2024-04-09T17:06:29Z

/approve

k8s-ci-robot · 2024-04-09T17:06:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, mdbooth

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:

~~OWNERS~~ [mdbooth]

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 added the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Mar 5, 2024

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Mar 5, 2024

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 5, 2024

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 5, 2024

k8s-ci-robot requested review from dulek and EmilienM March 5, 2024 10:15

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 5, 2024

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 5, 2024

dulek suggested changes Mar 5, 2024

View reviewed changes

mdbooth reviewed Mar 5, 2024

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 5, 2024

oblazek force-pushed the ob-loadbalancer-network branch 2 times, most recently from cd7ab5b to 1b68d37 Compare March 13, 2024 13:02

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2024

oblazek force-pushed the ob-loadbalancer-network branch from 1b68d37 to 96c0bb0 Compare March 13, 2024 14:06

k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Mar 13, 2024

oblazek requested review from dulek and mdbooth March 13, 2024 14:58

dulek reviewed Mar 15, 2024

View reviewed changes

api/v1alpha6/openstackcluster_conversion.go Outdated Show resolved Hide resolved

api/v1alpha7/openstackcluster_conversion.go Outdated Show resolved Hide resolved

api/v1beta1/types.go Show resolved Hide resolved

controllers/openstackcluster_controller.go Outdated Show resolved Hide resolved

k8s-ci-robot assigned dulek Mar 15, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 15, 2024

mdbooth reviewed Mar 20, 2024

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 20, 2024

oblazek force-pushed the ob-loadbalancer-network branch from 96c0bb0 to af1eccb Compare April 3, 2024 14:34

oblazek force-pushed the ob-loadbalancer-network branch from af1eccb to 884c175 Compare April 3, 2024 20:23

oblazek requested review from mdbooth and dulek April 3, 2024 21:46

dulek reviewed Apr 5, 2024

View reviewed changes

oblazek force-pushed the ob-loadbalancer-network branch from 884c175 to e2897fb Compare April 8, 2024 07:00

dulek approved these changes Apr 8, 2024

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2024

k8s-ci-robot merged commit 9aaf481 into kubernetes-sigs:main Apr 9, 2024
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add configurable loadbalancer network #1922

feat: add configurable loadbalancer network #1922

oblazek commented Mar 5, 2024

linux-foundation-easycla bot commented Mar 5, 2024 •

edited

Loading

k8s-ci-robot commented Mar 5, 2024

k8s-ci-robot commented Mar 5, 2024

netlify bot commented Mar 5, 2024 •

edited

Loading

dulek commented Mar 5, 2024

dulek Mar 5, 2024

mdbooth Mar 5, 2024

oblazek Mar 5, 2024

mdbooth left a comment

oblazek commented Mar 13, 2024

dulek left a comment

mdbooth left a comment

mdbooth Mar 20, 2024

oblazek Apr 3, 2024

mdbooth Mar 20, 2024

oblazek Apr 3, 2024

dulek left a comment

dulek Apr 5, 2024

oblazek Apr 8, 2024

oblazek Apr 8, 2024

dulek left a comment

mdbooth commented Apr 9, 2024

k8s-ci-robot commented Apr 9, 2024

feat: add configurable loadbalancer network #1922

feat: add configurable loadbalancer network #1922

Conversation

oblazek commented Mar 5, 2024

linux-foundation-easycla bot commented Mar 5, 2024 • edited Loading

k8s-ci-robot commented Mar 5, 2024

k8s-ci-robot commented Mar 5, 2024

netlify bot commented Mar 5, 2024 • edited Loading

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

dulek commented Mar 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mdbooth left a comment

Choose a reason for hiding this comment

oblazek commented Mar 13, 2024

dulek left a comment

Choose a reason for hiding this comment

mdbooth left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dulek left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dulek left a comment

Choose a reason for hiding this comment

mdbooth commented Apr 9, 2024

k8s-ci-robot commented Apr 9, 2024

linux-foundation-easycla bot commented Mar 5, 2024 •

edited

Loading

netlify bot commented Mar 5, 2024 •

edited

Loading