✨ Support BYO dual-stack Network #1789

MaysaMacedo · 2023-12-13T13:28:25Z

What this PR does / why we need it:

This commit adds support to specify more than one existent subnet on the OpenStackCluster.

The existent OpenStackClusterSpec.Subnet field that would have the following format:

  subnet:
    id: a532beb0-c73a-4b5d-af66-3ad05b73d063

is removed in favor of the following OpenStackClusterSpec.Subnets:

  subnets:
    - id: a532beb0-c73a-4b5d-af66-3ad05b73d063

conversion from v1 alpha8 clusters that use multiple subnets won't be allowed to older releases.

TODOs:

implement conversion
includes documentation
adds unit tests

netlify · 2023-12-13T13:28:31Z

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

Name	Link
🔨 Latest commit	`2ef8ee5`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/65a960a29a821f0008d7fe51
😎 Deploy Preview	https://deploy-preview-1789--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.

k8s-ci-robot · 2023-12-13T13:28:35Z

Hi @MaysaMacedo. 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.

mdbooth · 2023-12-13T13:57:05Z

This looks great. Do you want to consider NodeCIDR -> NodeCIDRs at the same time for non-BYO?

mdbooth · 2023-12-13T15:10:47Z

/ok-to-test

@MaysaMacedo You may want to apply to join the SIG so you don't need this.

controllers/openstackcluster_controller.go

MaysaMacedo · 2023-12-19T13:27:11Z

/uncc seanschneeweiss

controllers/openstackcluster_controller.go

EmilienM · 2024-01-17T19:17:46Z

api/v1alpha7/conversion.go

@@ -383,6 +383,15 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1alpha8_OpenStackClusterSpec(in *
 		}
 	}

+	emptySubnet := SubnetFilter{}


I think it's ok but I'll tag @mdbooth on this one, he might think it's not the right way to do it.

EmilienM · 2024-01-17T21:14:38Z

Also, please run pull-cluster-api-provider-openstack-e2e-full-test job in this PR, so we can check upgrades.
Thanks

EmilienM · 2024-01-18T03:01:15Z

/test pull-cluster-api-provider-openstack-e2e-full-test

pkg/cloud/services/networking/network.go

EmilienM · 2024-01-18T03:09:28Z

This looks good to me, let's see how the e2e-full-test job works (testing upgrades).
One minor nit about unit tests but otherwise happy to LGTM.

Nice work :-)

api/v1alpha7/conversion.go

mdbooth · 2024-01-18T11:54:22Z

I couldn't understand how the conversion tests were passing without any change to the restore functions. I expected the hub->spoke->hub (e.g. v1alpha8->v1alpha7->v1alpha8) tests to fail, because when converting a slice of length 2 to a single value and back we obviously lose the second value. It turns out that the fuzzer was not generating slices of length 2, so I made a change to the relevant fuzzerfuncs to ensure that it does.

I've added 3 commits:

The first fixes a nit I mentioned
The second updates the fuzzer funcs to sometimes generate Subnets of length 2. This causes the tests to fail.
The third fixes the tests by restoring subnets beyond the first one

For convenience I pushed them directly, but please review and squash them into your other commits as appropriate.

I haven't finished reviewing yet, btw.

mdbooth · 2024-01-18T12:09:30Z

Looks good. Can you take a look at the commits I added (feel free to implement them differently!) and squash them as appropriate, and also Emilien's unit tests. Thanks!

This commit adds support to specify more than one existent subnet on the `OpenStackCluster`. The existent `OpenStackClusterSpec.Subnet` is removed in favor of `OpenStackClusterSpec.Subnets`. Co-Authored-By: Emilien Macchi <[email protected]>

This commit adds a section to the book explaining the modification of the `OpenStackClusterSpec.Subnet` API field.

mdbooth · 2024-01-18T17:38:14Z

/approve

k8s-ci-robot · 2024-01-18T17:38:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MaysaMacedo, 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

MaysaMacedo · 2024-01-18T17:43:09Z

I don't think this is urgent so lets wait until we've decided on the open conversion question.

In the meantime, can we think about how we could e2e test this? I don't think we have ipv6 support in CI for the e2e tests. Would you have time to look into that? It would be really good to be able to actually deploy a dual-stack cluster.

Sure, I can start taking a look. Note that this PR only creates dual-stack servers, there is no support for IPv6 SGs or API with IPv6. Would that be enough for the CI?

EmilienM · 2024-01-18T18:07:06Z

/lgtm

Nice work Maysa!
Feel free to unhold when CI is green.

EmilienM · 2024-01-18T18:07:14Z

/test pull-cluster-api-provider-openstack-e2e-full-test

MaysaMacedo · 2024-01-18T20:13:42Z

/hold cancel

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Dec 13, 2023

k8s-ci-robot requested review from dulek and seanschneeweiss December 13, 2023 13:28

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 13, 2023

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 Dec 13, 2023

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 13, 2023

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 Dec 13, 2023

EmilienM force-pushed the experimenting-dualstack branch from 98e4e82 to 05e7fe7 Compare December 15, 2023 20:02

MaysaMacedo force-pushed the experimenting-dualstack branch from 05e7fe7 to 477e180 Compare December 18, 2023 18:15

MaysaMacedo marked this pull request as ready for review December 18, 2023 18:38

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 18, 2023

k8s-ci-robot requested review from lentzi90 and mdbooth December 18, 2023 18:38

EmilienM reviewed Dec 18, 2023

View reviewed changes

controllers/openstackcluster_controller.go Outdated Show resolved Hide resolved

MaysaMacedo force-pushed the experimenting-dualstack branch 2 times, most recently from a47fc3c to 600a05b Compare December 19, 2023 13:25

k8s-ci-robot removed the request for review from seanschneeweiss December 19, 2023 13:27

MaysaMacedo force-pushed the experimenting-dualstack branch 3 times, most recently from a8610cf to 152dfbd Compare December 19, 2023 18:38

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 19, 2023

MaysaMacedo mentioned this pull request Dec 20, 2023

📖 Document BYO dual-stack network #1799

Closed

EmilienM reviewed Jan 17, 2024

View reviewed changes

controllers/openstackcluster_controller.go Outdated Show resolved Hide resolved

EmilienM reviewed Jan 17, 2024

View reviewed changes

controllers/openstackcluster_controller.go Outdated Show resolved Hide resolved

EmilienM reviewed Jan 17, 2024

View reviewed changes

MaysaMacedo force-pushed the experimenting-dualstack branch 3 times, most recently from 7006019 to 7f94159 Compare January 18, 2024 01:36

EmilienM reviewed Jan 18, 2024

View reviewed changes

pkg/cloud/services/networking/network.go Show resolved Hide resolved

mdbooth reviewed Jan 18, 2024

View reviewed changes

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

MaysaMacedo force-pushed the experimenting-dualstack branch from c543865 to a3caf3b Compare January 18, 2024 17:27

MaysaMacedo and others added 3 commits January 18, 2024 14:31

Support BYO dual-stack Network

341f2fb

This commit adds support to specify more than one existent subnet on the `OpenStackCluster`. The existent `OpenStackClusterSpec.Subnet` is removed in favor of `OpenStackClusterSpec.Subnets`. Co-Authored-By: Emilien Macchi <[email protected]>

Document BYO dual-stack network

29b3a88

This commit adds a section to the book explaining the modification of the `OpenStackClusterSpec.Subnet` API field.

Dual-stack: ensure fuzzer tests multiple subnets

2ef8ee5

MaysaMacedo force-pushed the experimenting-dualstack branch from a3caf3b to 2ef8ee5 Compare January 18, 2024 17:32

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

k8s-ci-robot assigned EmilienM Jan 18, 2024

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

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2024

k8s-ci-robot merged commit f90ddda into kubernetes-sigs:main Jan 18, 2024
10 checks passed

MaysaMacedo deleted the experimenting-dualstack branch January 18, 2024 20:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Support BYO dual-stack Network #1789

✨ Support BYO dual-stack Network #1789

MaysaMacedo commented Dec 13, 2023 •

edited

Loading

netlify bot commented Dec 13, 2023 •

edited

Loading

k8s-ci-robot commented Dec 13, 2023

mdbooth commented Dec 13, 2023

mdbooth commented Dec 13, 2023

MaysaMacedo commented Dec 19, 2023

EmilienM Jan 17, 2024

EmilienM commented Jan 17, 2024

EmilienM commented Jan 18, 2024

EmilienM commented Jan 18, 2024

mdbooth commented Jan 18, 2024

mdbooth commented Jan 18, 2024

mdbooth commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

MaysaMacedo commented Jan 18, 2024

EmilienM commented Jan 18, 2024

EmilienM commented Jan 18, 2024

MaysaMacedo commented Jan 18, 2024

✨ Support BYO dual-stack Network #1789

✨ Support BYO dual-stack Network #1789

Conversation

MaysaMacedo commented Dec 13, 2023 • edited Loading

netlify bot commented Dec 13, 2023 • edited Loading

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

k8s-ci-robot commented Dec 13, 2023

mdbooth commented Dec 13, 2023

mdbooth commented Dec 13, 2023

MaysaMacedo commented Dec 19, 2023

EmilienM Jan 17, 2024

Choose a reason for hiding this comment

EmilienM commented Jan 17, 2024

EmilienM commented Jan 18, 2024

EmilienM commented Jan 18, 2024

mdbooth commented Jan 18, 2024

mdbooth commented Jan 18, 2024

mdbooth commented Jan 18, 2024

k8s-ci-robot commented Jan 18, 2024

MaysaMacedo commented Jan 18, 2024

EmilienM commented Jan 18, 2024

EmilienM commented Jan 18, 2024

MaysaMacedo commented Jan 18, 2024

MaysaMacedo commented Dec 13, 2023 •

edited

Loading

netlify bot commented Dec 13, 2023 •

edited

Loading