Define routes of the management network in the operator

gthiemonge · gthiemonge · commit ec3be4d2d361 · 2024-06-10T08:55:48.000Z
In case the gateway of the management network is not defined in the NAD
Select an address in the CIDR and use it for the gateway
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
@@ -580,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
@@ -775,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
@@ -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
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/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
@@ -580,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
@@ -775,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
@@ -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
diff --git a/controllers/octavia_controller.go b/controllers/octavia_controller.go
@@ -1333,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())
diff --git a/pkg/octavia/lb_mgmt_network.go b/pkg/octavia/lb_mgmt_network.go
@@ -33,12 +33,14 @@ import (
 )
 
 type NetworkProvisioningSummary struct {
-	TenantNetworkID    string
-	TenantSubnetID     string
-	TenantRouterPortID string
-	ProviderNetworkID  string
-	RouterID           string
-	SecurityGroupID    string
+	TenantNetworkID         string
+	TenantSubnetID          string
+	TenantRouterPortID      string
+	ProviderNetworkID       string
+	RouterID                string
+	SecurityGroupID         string
+	ManagementSubnetCIDR    string
+	ManagementSubnetGateway string
 }
 
 //
@@ -870,11 +872,13 @@ func EnsureAmphoraManagementNetwork(
 	}
 
 	return NetworkProvisioningSummary{
-		TenantNetworkID:    tenantNetwork.ID,
-		TenantSubnetID:     tenantSubnet.ID,
-		TenantRouterPortID: tenantRouterPort.ID,
-		ProviderNetworkID:  providerNetwork.ID,
-		RouterID:           router.ID,
-		SecurityGroupID:    lbMgmtSecurityGroupID,
+		TenantNetworkID:         tenantNetwork.ID,
+		TenantSubnetID:          tenantSubnet.ID,
+		TenantRouterPortID:      tenantRouterPort.ID,
+		ProviderNetworkID:       providerNetwork.ID,
+		RouterID:                router.ID,
+		SecurityGroupID:         lbMgmtSecurityGroupID,
+		ManagementSubnetCIDR:    networkParameters.TenantCIDR.String(),
+		ManagementSubnetGateway: networkParameters.ProviderGateway.String(),
 	}, nil
 }
diff --git a/templates/octaviaamphoracontroller/bin/octavia_controller_start.sh b/templates/octaviaamphoracontroller/bin/octavia_controller_start.sh
@@ -15,6 +15,10 @@
 # under the License.
 set -ex
 
-/usr/local/bin/container-scripts/octavia_hm_advertisement.py octavia
+/usr/local/bin/container-scripts/octavia_mgmt_subnet_route.py octavia "$MGMT_CIDR" "$MGMT_GATEWAY"
 
-exec /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf
+if [ "$1" = "octavia-health-manager" ]; then
+    /usr/local/bin/container-scripts/octavia_hm_advertisement.py octavia
+fi
+
+exec /usr/bin/$1 --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf
diff --git a/templates/octaviaamphoracontroller/bin/octavia_mgmt_subnet_route.py b/templates/octaviaamphoracontroller/bin/octavia_mgmt_subnet_route.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+#
+# Copyright 2024 Red Hat Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import sys
+import socket
+
+from pyroute2 import IPRoute
+
+try:
+    interface_name = sys.argv[1]
+    dst = sys.argv[2]
+    gateway = sys.argv[3]
+except IndexError:
+    print(f"usage: {sys.argv[0]} <interface_name> <dst> <gateway>")
+    sys.exit(1)
+
+ip = IPRoute()
+
+try:
+    idx = ip.link_lookup(ifname=interface_name)[0]
+except IndexError:
+    print(f"Cannot find interface '{interface_name}', skipping")
+    sys.exit(0)
+
+try:
+    ip.route('add', index=idx, dst=dst, gateway=gateway)
+except Exception as e:
+    print(f"Cannot set route {dst} via {gateway}: {e}")
diff --git a/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json b/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/local/bin/container-scripts/octavia_healthmanager_start.sh",
+    "command": "/usr/local/bin/container-scripts/octavia_controller_start.sh octavia-health-manager",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",
diff --git a/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json b/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf",
+    "command": "/usr/local/bin/container-scripts/octavia_controller_start.sh octavia-housekeeping",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",
diff --git a/templates/octaviaamphoracontroller/config/octavia-worker-config.json b/templates/octaviaamphoracontroller/config/octavia-worker-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf",
+    "command": "/usr/local/bin/container-scripts/octavia_controller_start.sh octavia-worker",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",

Original file line number	Diff line number	Diff line change
`@@ -1333,6 +1333,8 @@ func (r *OctaviaReconciler) amphoraControllerDaemonSetCreateOrUpdate(`
`1333`	`1333`	`daemonset.Spec.AmphoraCustomFlavors = instance.Spec.AmphoraCustomFlavors`
`1334`	`1334`	`daemonset.Spec.TLS = instance.Spec.OctaviaAPI.TLS.Ca`
`1335`	`1335`	`daemonset.Spec.AmphoraImageOwnerID = ampImageOwnerID`
	`1336`	`+ daemonset.Spec.OctaviaProviderSubnetGateway = networkInfo.ManagementSubnetGateway`
	`1337`	`+ daemonset.Spec.OctaviaProviderSubnetCIDR = networkInfo.ManagementSubnetCIDR`
`1336`	`1338`	`if len(daemonset.Spec.NodeSelector) == 0 {`
`1337`	`1339`	`daemonset.Spec.NodeSelector = instance.Spec.NodeSelector`
`1338`	`1340`	`}`