Merge pull request #318 from gthiemonge/fix-nad

Use NAD parameters to configure the Octavia resources
openstack-k8s-operators · Jun 10, 2024 · 2992026 · 2992026
2 parents 3a1a634 + d6ba3b2
commit 2992026
Show file tree

Hide file tree

Showing 17 changed files with 433 additions and 132 deletions.
diff --git a/api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml b/api/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
@@ -127,6 +127,12 @@ spec:
                 description: NodeSelector to target subset of worker nodes running
                   this service
                 type: object
+              octaviaProviderSubnetCIDR:
+                description: OctaviaProviderSubnetCIDR -
+                type: string
+              octaviaProviderSubnetGateway:
+                description: OctaviaProviderSubnetGateway -
+                type: string
               passwordSelectors:
                 default:
                   service: OctaviaPassword

diff --git a/api/bases/octavia.openstack.org_octavias.yaml b/api/bases/octavia.openstack.org_octavias.yaml
@@ -103,7 +103,6 @@ spec:
               lbMgmtNetwork:
                 default:
                   manageLbMgmtNetworks: true
-                  subnetIpVersion: 4
                 description: OctaviaLbMgmtNetworks Settings for Octavia management
                   networks
                 properties:
@@ -116,10 +115,6 @@ spec:
                   manageLbMgmtNetworks:
                     default: true
                     type: boolean
-                  subnetIpVersion:
-                    default: 4
-                    description: IP Version of the managed subnets
-                    type: integer
                 type: object
               nodeSelector:
                 additionalProperties:
@@ -585,6 +580,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -780,6 +781,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -892,6 +899,11 @@ spec:
                 - secret
                 - serviceAccount
                 type: object
+              octaviaNetworkAttachment:
+                default: octavia
+                description: OctaviaNetworkAttachment is a NetworkAttachment resource
+                  name for the Octavia Management Network
+                type: string
               octaviaWorker:
                 description: OctaviaHousekeeping - Spec definition for the Octavia
                   Housekeeping agent for the Octavia deployment
@@ -975,6 +987,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -1197,6 +1215,7 @@ spec:
             - apacheContainerImage
             - databaseInstance
             - octaviaAPI
+            - octaviaNetworkAttachment
             - rabbitMqClusterName
             - secret
             type: object

diff --git a/api/v1beta1/amphoracontroller_types.go b/api/v1beta1/amphoracontroller_types.go
@@ -143,6 +143,14 @@ type OctaviaAmphoraControllerSpecCore struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS - Parameters related to the TLS
 	TLS tls.Ca `json:"tls,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// OctaviaProviderSubnetGateway -
+	OctaviaProviderSubnetGateway string `json:"octaviaProviderSubnetGateway"`
+
+	// +kubebuilder:validation:Optional
+	// OctaviaProviderSubnetCIDR -
+	OctaviaProviderSubnetCIDR string `json:"octaviaProviderSubnetCIDR"`
 }
 
 // OctaviaAmphoraControllerStatus defines the observed state of the Octavia Amphora Controller

diff --git a/api/v1beta1/octavia_types.go b/api/v1beta1/octavia_types.go
@@ -160,7 +160,7 @@ type OctaviaSpecBase struct {
 	TenantName string `json:"tenantName"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={manageLbMgmtNetworks: true, subnetIpVersion: 4}
+	// +kubebuilder:default={manageLbMgmtNetworks: true}
 	LbMgmtNetworks OctaviaLbMgmtNetworks `json:"lbMgmtNetwork"`
 
 	// +kubebuilder:validation:Optional
@@ -192,6 +192,11 @@ type OctaviaSpecBase struct {
 	// +kubebuilder:validation:Required
 	// Apache Container Image URL
 	ApacheContainerImage string `json:"apacheContainerImage"`
+
+	// +kubebuilder:validation:Required
+	// +kubebuilder:default=octavia
+	// OctaviaNetworkAttachment is a NetworkAttachment resource name for the Octavia Management Network
+	OctaviaNetworkAttachment string `json:"octaviaNetworkAttachment"`
 }
 
 // PasswordSelector to identify the DB and AdminUser password from the Secret
@@ -213,11 +218,6 @@ type OctaviaLbMgmtNetworks struct {
 	// +kubebuilder:default=true
 	ManageLbMgmtNetworks bool `json:"manageLbMgmtNetworks,omitempty"`
 
-	// +kubebuilder:validation:Optional
-	// +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"`

diff --git a/config/crd/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml b/config/crd/bases/octavia.openstack.org_octaviaamphoracontrollers.yaml
@@ -127,6 +127,12 @@ spec:
                 description: NodeSelector to target subset of worker nodes running
                   this service
                 type: object
+              octaviaProviderSubnetCIDR:
+                description: OctaviaProviderSubnetCIDR -
+                type: string
+              octaviaProviderSubnetGateway:
+                description: OctaviaProviderSubnetGateway -
+                type: string
               passwordSelectors:
                 default:
                   service: OctaviaPassword

diff --git a/config/crd/bases/octavia.openstack.org_octavias.yaml b/config/crd/bases/octavia.openstack.org_octavias.yaml
@@ -103,7 +103,6 @@ spec:
               lbMgmtNetwork:
                 default:
                   manageLbMgmtNetworks: true
-                  subnetIpVersion: 4
                 description: OctaviaLbMgmtNetworks Settings for Octavia management
                   networks
                 properties:
@@ -116,10 +115,6 @@ spec:
                   manageLbMgmtNetworks:
                     default: true
                     type: boolean
-                  subnetIpVersion:
-                    default: 4
-                    description: IP Version of the managed subnets
-                    type: integer
                 type: object
               nodeSelector:
                 additionalProperties:
@@ -585,6 +580,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -780,6 +781,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -892,6 +899,11 @@ spec:
                 - secret
                 - serviceAccount
                 type: object
+              octaviaNetworkAttachment:
+                default: octavia
+                description: OctaviaNetworkAttachment is a NetworkAttachment resource
+                  name for the Octavia Management Network
+                type: string
               octaviaWorker:
                 description: OctaviaHousekeeping - Spec definition for the Octavia
                   Housekeeping agent for the Octavia deployment
@@ -975,6 +987,12 @@ spec:
                     description: NodeSelector to target subset of worker nodes running
                       this service
                     type: object
+                  octaviaProviderSubnetCIDR:
+                    description: OctaviaProviderSubnetCIDR -
+                    type: string
+                  octaviaProviderSubnetGateway:
+                    description: OctaviaProviderSubnetGateway -
+                    type: string
                   passwordSelectors:
                     default:
                       service: OctaviaPassword
@@ -1197,6 +1215,7 @@ spec:
             - apacheContainerImage
             - databaseInstance
             - octaviaAPI
+            - octaviaNetworkAttachment
             - rabbitMqClusterName
             - secret
             type: object

diff --git a/controllers/octavia_controller.go b/controllers/octavia_controller.go
@@ -642,13 +642,24 @@ func (r *OctaviaReconciler) reconcileNormal(ctx context.Context, instance *octav
 	// Amphora reconciliation
 	// ------------------------------------------------------------------------------------------------------------
 
+	nad, err := nad.GetNADWithName(ctx, helper, instance.Spec.OctaviaNetworkAttachment, instance.Namespace)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	networkParameters, err := octavia.GetNetworkParametersFromNAD(nad)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	// Create load balancer management network and get its Id (networkInfo is actually a struct and contains
 	// multiple details.
 	networkInfo, err := octavia.EnsureAmphoraManagementNetwork(
 		ctx,
 		instance.Namespace,
 		instance.Spec.TenantName,
 		&instance.Spec.LbMgmtNetworks,
+		networkParameters,
 		&Log,
 		helper,
 	)
@@ -1322,6 +1333,8 @@ func (r *OctaviaReconciler) amphoraControllerDaemonSetCreateOrUpdate(
 		daemonset.Spec.AmphoraCustomFlavors = instance.Spec.AmphoraCustomFlavors
 		daemonset.Spec.TLS = instance.Spec.OctaviaAPI.TLS.Ca
 		daemonset.Spec.AmphoraImageOwnerID = ampImageOwnerID
+		daemonset.Spec.OctaviaProviderSubnetGateway = networkInfo.ManagementSubnetGateway
+		daemonset.Spec.OctaviaProviderSubnetCIDR = networkInfo.ManagementSubnetCIDR
 		if len(daemonset.Spec.NodeSelector) == 0 {
 			daemonset.Spec.NodeSelector = instance.Spec.NodeSelector
 		}

diff --git a/pkg/amphoracontrollers/daemonset.go b/pkg/amphoracontrollers/daemonset.go
@@ -84,6 +84,9 @@ func DaemonSet(
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
 	envVars["CONFIG_HASH"] = env.SetValue(configHash)
 
+	envVars["MGMT_CIDR"] = env.SetValue(instance.Spec.OctaviaProviderSubnetCIDR)
+	envVars["MGMT_GATEWAY"] = env.SetValue(instance.Spec.OctaviaProviderSubnetGateway)
+
 	// Add the CA bundle
 	if instance.Spec.TLS.CaBundleSecretName != "" {
 		volumes = append(volumes, instance.Spec.TLS.CreateVolume())