Merge pull request #302 from beagles/availability_zones

Add support for AZs when creating network resources

Author: openshift-merge-bot[bot]

api/bases/octavia.openstack.org_octavias.yaml

@@ -107,6 +107,12 @@ spec:
                 description: OctaviaLbMgmtNetworks Settings for Octavia management
                   networks
                 properties:
+                  availabilityZones:
+                    description: Availability zones for the octavia management network
+                      resources
+                    items:
+                      type: string
+                    type: array
                   manageLbMgmtNetworks:
                     default: true
                     type: boolean

api/v1beta1/octavia_types.go

@@ -217,6 +217,10 @@ type OctaviaLbMgmtNetworks struct {
 	// +kubebuilder:default=4
 	// IP Version of the managed subnets
 	SubnetIPVersion int `json:"subnetIpVersion,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// Availability zones for the octavia management network resources
+	AvailabilityZones []string `json:"availabilityZones,omitempty"`
 }
 
 // OctaviaAmphoraFlavor Settings for custom Amphora flavors

api/v1beta1/zz_generated.deepcopy.go

@@ -107,6 +107,12 @@ spec:
                 description: OctaviaLbMgmtNetworks Settings for Octavia management
                   networks
                 properties:
+                  availabilityZones:
+                    description: Availability zones for the octavia management network
+                      resources
+                    items:
+                      type: string
+                    type: array
                   manageLbMgmtNetworks:
                     default: true
                     type: boolean

config/crd/bases/octavia.openstack.org_octavias.yaml

@@ -312,7 +312,7 @@ func ensureProvSubnet(client *gophercloud.ServiceClient, providerNetwork *networ
 	return ensureSubnet(client, 4, createOpts, log)
 }
 
-func ensureProvNetwork(client *gophercloud.ServiceClient, serviceTenantID string, log *logr.Logger) (
+func ensureProvNetwork(client *gophercloud.ServiceClient, netDetails *octaviav1.OctaviaLbMgmtNetworks, serviceTenantID string, log *logr.Logger) (
 	*networks.Network, error) {
 	_, err := getNetwork(client, LbProvNetName, serviceTenantID)
 	if err != nil {
@@ -321,10 +321,11 @@ func ensureProvNetwork(client *gophercloud.ServiceClient, serviceTenantID string
 
 	asu := true
 	createOpts := networks.CreateOpts{
-		Name:         LbProvNetName,
-		Description:  LbProvNetDescription,
-		AdminStateUp: &asu,
-		TenantID:     serviceTenantID,
+		Name:                  LbProvNetName,
+		Description:           LbProvNetDescription,
+		AdminStateUp:          &asu,
+		TenantID:              serviceTenantID,
+		AvailabilityZoneHints: netDetails.AvailabilityZones,
 	}
 	provNet, err := ensureNetworkExt(client, createOpts, log, serviceTenantID)
 	if err != nil {
@@ -407,10 +408,11 @@ func ensureLbMgmtNetwork(client *gophercloud.ServiceClient, networkDetails *octa
 
 	asu := true
 	createOpts := networks.CreateOpts{
-		Name:         LbMgmtNetName,
-		Description:  LbMgmtNetDescription,
-		AdminStateUp: &asu,
-		TenantID:     serviceTenantID,
+		Name:                  LbMgmtNetName,
+		Description:           LbMgmtNetDescription,
+		AdminStateUp:          &asu,
+		TenantID:              serviceTenantID,
+		AvailabilityZoneHints: networkDetails.AvailabilityZones,
 	}
 	mgmtNetwork, err = ensureNetwork(client, createOpts, log, serviceTenantID)
 	if err != nil {
@@ -804,7 +806,7 @@ func EnsureAmphoraManagementNetwork(
 		log.Error(err, "Unable to complete configuration of octavia provider network security groups, continuing...")
 	}
 
-	providerNetwork, err := ensureProvNetwork(client, adminTenant.ID, log)
+	providerNetwork, err := ensureProvNetwork(client, netDetails, adminTenant.ID, log)
 	if err != nil {
 		return NetworkProvisioningSummary{}, err
 	}
@@ -835,9 +837,10 @@ func EnsureAmphoraManagementNetwork(
 		}
 		adminStateUp := true
 		createOpts := routers.CreateOpts{
-			Name:         LbRouterName,
-			AdminStateUp: &adminStateUp,
-			GatewayInfo:  &gatewayInfo,
+			Name:                  LbRouterName,
+			AdminStateUp:          &adminStateUp,
+			GatewayInfo:           &gatewayInfo,
+			AvailabilityZoneHints: netDetails.AvailabilityZones,
 		}
 		router, err = routers.Create(client, createOpts).Extract()
 		if err != nil {