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

WIP: ✨, feature additions: add subnet support to external networks #2430

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: ✨, feature additions: add subnet support to external networks #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v1beta1/openstackcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ type OpenStackClusterSpec struct {
// If ExternalNetwork is not defined and there are no external networks
// the controller will proceed as though DisableExternalNetwork was set.
// +optional
ExternalNetwork *NetworkParam `json:"externalNetwork,omitempty"`
ExternalNetwork *ExternalNetworkParam `json:"externalNetwork,omitempty"`

// DisableExternalNetwork specifies whether or not to attempt to connect the cluster
// to an external network. This allows for the creation of clusters when connecting
Expand Down Expand Up @@ -208,7 +208,7 @@ type OpenStackClusterStatus struct {

// ExternalNetwork contains information about the external network used for default ingress and egress traffic.
// +optional
ExternalNetwork *NetworkStatus `json:"externalNetwork,omitempty"`
ExternalNetwork *NetworkStatusWithSubnets `json:"externalNetwork,omitempty"`

// Router describes the default cluster router
// +optional
Expand Down
10 changes: 10 additions & 0 deletions api/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ type NetworkParam struct {
Filter *NetworkFilter `json:"filter,omitempty"`
}

// ExternalNetworkParam specifies an OpenStack external network. It may be specified by either ID or Filter, but not both.
// +kubebuilder:validation:MinProperties:=1
type ExternalNetworkParam struct {
// Network specifies an OpenStack external network. It may be specified by either ID or Filter, but not both.
Network NetworkParam `json:"network"`
// Subnets specifies an list of OpenStack external network subnet. Each may be specified by either ID or Filter, but not both.
// +optional
Subnets []SubnetParam `json:"subnets,omitempty"`
}

// NetworkFilter specifies a query to select an OpenStack network. At least one property must be set.
// +kubebuilder:validation:MinProperties:=1
type NetworkFilter struct {
Expand Down
12 changes: 8 additions & 4 deletions controllers/openstackcluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,10 @@ var _ = Describe("OpenStackCluster controller", func() {
},
DisableAPIServerFloatingIP: ptr.To(true),
APIServerFixedIP: ptr.To("10.0.0.1"),
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(externalNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(externalNetworkID),
},
},
Network: &infrav1.NetworkParam{
ID: ptr.To(clusterNetworkID),
Expand Down Expand Up @@ -327,8 +329,10 @@ var _ = Describe("OpenStackCluster controller", func() {
},
DisableAPIServerFloatingIP: ptr.To(true),
APIServerFixedIP: ptr.To("10.0.0.1"),
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(externalNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(externalNetworkID),
},
},
Network: &infrav1.NetworkParam{
ID: ptr.To(clusterNetworkID),
Expand Down
9 changes: 7 additions & 2 deletions pkg/cloud/services/loadbalancer/loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,13 @@ func Test_ReconcileLoadBalancer(t *testing.T) {
},
},
Status: infrav1.OpenStackClusterStatus{
ExternalNetwork: &infrav1.NetworkStatus{
ID: "aaaaaaaa-bbbb-cccc-dddd-111111111111",
ExternalNetwork: &infrav1.NetworkStatusWithSubnets{
NetworkStatus: infrav1.NetworkStatus{
ID: "aaaaaaaa-bbbb-cccc-dddd-111111111111",
},
Subnets: []infrav1.Subnet{
{ID: "aaaaaaaa-bbbb-cccc-dddd-111111111111"},
},
},
Network: &infrav1.NetworkStatusWithSubnets{
Subnets: []infrav1.Subnet{
Expand Down
12 changes: 10 additions & 2 deletions pkg/cloud/services/networking/floatingip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,16 @@ func Test_GetOrCreateFloatingIP(t *testing.T) {
},
}
openStackCluster := &infrav1.OpenStackCluster{Status: infrav1.OpenStackClusterStatus{
ExternalNetwork: &infrav1.NetworkStatus{
ID: "",
ExternalNetwork: &infrav1.NetworkStatusWithSubnets{
NetworkStatus: infrav1.NetworkStatus{
ID: "",
},
Subnets: []infrav1.Subnet{
{
ID: "",
CIDR: "",
},
},
},
}}
for _, tt := range tests {
Expand Down
12 changes: 6 additions & 6 deletions pkg/cloud/services/networking/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@ func (s *Service) ReconcileExternalNetwork(openStackCluster *infrav1.OpenStackCl
}
} else {
var err error
network, err = s.GetNetworkByParam(openStackCluster.Spec.ExternalNetwork, ExternalNetworksOnly)
network, err = s.GetNetworkByParam(&openStackCluster.Spec.ExternalNetwork.Network, ExternalNetworksOnly)
if err != nil {
return fmt.Errorf("failed to get external network: %w", err)
}
}

openStackCluster.Status.ExternalNetwork = &infrav1.NetworkStatus{
ID: network.ID,
Name: network.Name,
Tags: network.Tags,
}
openStackCluster.Status.ExternalNetwork = &infrav1.NetworkStatusWithSubnets{}
openStackCluster.Status.ExternalNetwork.ID = network.ID
openStackCluster.Status.ExternalNetwork.Name = network.Name
openStackCluster.Status.ExternalNetwork.Tags = openStackCluster.Spec.Tags

s.scope.Logger().Info("External network found", "id", network.ID)
return nil
}
Expand Down
92 changes: 67 additions & 25 deletions pkg/cloud/services/networking/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ func Test_ReconcileNetwork(t *testing.T) {
func Test_ReconcileExternalNetwork(t *testing.T) {
fakeNetworkID := "d08803fc-2fa5-4179-b9f7-8c43d0af2fe6"
fakeNetworkname := "external-network"
fakeSubnetID := "d08803fc-2fa5-4179-b9d7-8c43d0af2fe6"
fakeCIDR := "10.0.0.0/24"

// Use gomega to match the ListOptsBuilder argument
getExternalNetwork := func(g Gomega, listOpts networks.ListOpts, ret []networks.Network) func(networks.ListOptsBuilder) ([]networks.Network, error) {
Expand All @@ -233,8 +235,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
name: "reconcile external network by ID",
openStackCluster: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
},
},
},
},
Expand All @@ -246,14 +250,24 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
},
want: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
},
},
},
Status: infrav1.OpenStackClusterStatus{
ExternalNetwork: &infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
ExternalNetwork: &infrav1.NetworkStatusWithSubnets{
NetworkStatus: infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
},
Subnets: []infrav1.Subnet{
{
ID: fakeSubnetID,
CIDR: fakeCIDR,
},
},
},
},
},
Expand All @@ -263,8 +277,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
name: "reconcile external network by name",
openStackCluster: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
},
},
},
},
Expand All @@ -279,14 +295,24 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
},
want: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
},
},
},
Status: infrav1.OpenStackClusterStatus{
ExternalNetwork: &infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
ExternalNetwork: &infrav1.NetworkStatusWithSubnets{
NetworkStatus: infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
},
Subnets: []infrav1.Subnet{
{
ID: fakeSubnetID,
CIDR: fakeCIDR,
},
},
},
},
},
Expand All @@ -296,8 +322,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
name: "reconcile external network by ID when external network by id not found",
openStackCluster: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
},
},
},
},
Expand All @@ -306,8 +334,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
},
want: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
ID: ptr.To(fakeNetworkID),
},
},
},
},
Expand All @@ -317,8 +347,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
name: "reconcile external network by ID when external network by name not found",
openStackCluster: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
},
},
},
},
Expand All @@ -328,8 +360,10 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
},
want: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{
ExternalNetwork: &infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
ExternalNetwork: &infrav1.ExternalNetworkParam{
Network: infrav1.NetworkParam{
Filter: &infrav1.NetworkFilter{Name: fakeNetworkname},
},
},
},
},
Expand Down Expand Up @@ -387,9 +421,17 @@ func Test_ReconcileExternalNetwork(t *testing.T) {
want: &infrav1.OpenStackCluster{
Spec: infrav1.OpenStackClusterSpec{},
Status: infrav1.OpenStackClusterStatus{
ExternalNetwork: &infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
ExternalNetwork: &infrav1.NetworkStatusWithSubnets{
NetworkStatus: infrav1.NetworkStatus{
ID: fakeNetworkID,
Name: fakeNetworkname,
},
Subnets: []infrav1.Subnet{
{
ID: fakeSubnetID,
CIDR: fakeCIDR,
},
},
},
},
},
Expand Down