Merge pull request #1104 from averdagu/feat/nicMappings

Reapply "[ovn-controller] Don't create ovn-controller if nicMappings"

Author: openshift-merge-bot[bot]

config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml

@@ -97,9 +97,9 @@ spec:
           replicas: 1
           dbType: SB
           storageRequest: 10G
+      ovnController: {}
       ovnNorthd:
         replicas: 1
-      ovnController: {}
   neutron:
     template:
       databaseInstance: openstack

config/samples/nad_datacentre.yaml

@@ -0,0 +1,17 @@
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  annotations:
+  labels:
+    osp/net: data-centre
+    service: ovn-controller
+  name: datacentre
+spec:
+  config: |
+    {
+      "cniVersion": "0.3.1",
+      "name": "datacentre",
+      "type": "bridge",
+      "bridge": "ospbr",
+      "ipam": {}
+    }

pkg/openstack/ovn.go

@@ -314,6 +314,13 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
 			return false, err
 		}
 		return false, nil
+	} else if len(instance.Spec.Ovn.Template.OVNController.NicMappings) == 0 {
+		// If nicMappings is not configured there's no need to start ovn-controller
+		Log.Info("OVN Controller has no nicMappings configured, forcing ready condition to true.")
+		if _, err := EnsureDeleted(ctx, helper, OVNController); err != nil {
+			return false, err
+		}
+		return true, nil
 	}
 
 	ovnControllerSpec := &instance.Spec.Ovn.Template.OVNController

tests/functional/ctlplane/openstackoperator_controller_test.go

@@ -1620,6 +1620,11 @@ var _ = Describe("OpenStackOperator controller", func() {
 							"dbType": "SB",
 						},
 					},
+					"ovnController": map[string]interface{}{
+						"nicMappings": map[string]interface{}{
+							"datacentre": "ospbr",
+						},
+					},
 				},
 			}
 			DeferCleanup(
@@ -1670,6 +1675,37 @@ var _ = Describe("OpenStackOperator controller", func() {
 			}, timeout, interval).Should(Succeed())
 		})
 
+		It("should remove ovn-controller if nicMappings are removed", func() {
+			// Update spec
+			Eventually(func(g Gomega) {
+				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)
+				OSCtlplane.Spec.Ovn.Template.OVNController.NicMappings = nil
+				g.Expect(k8sClient.Update(ctx, OSCtlplane)).Should(Succeed())
+			}, timeout, interval).Should(Succeed())
+
+			// ovn services exist
+			Eventually(func(g Gomega) {
+				ovnNorthd := ovn.GetOVNNorthd(names.OVNNorthdName)
+				g.Expect(ovnNorthd).Should(Not(BeNil()))
+			}, timeout, interval).Should(Succeed())
+
+			// If nicMappings are not configured, ovnController shouldn't spawn
+			Eventually(func(g Gomega) {
+				instance := &ovnv1.OVNController{}
+				g.Expect(th.K8sClient.Get(th.Ctx, names.OVNControllerName, instance)).Should(Not(Succeed()))
+			}, timeout, interval).Should(Succeed())
+
+			Eventually(func(g Gomega) {
+				ovnDbServerNB := ovn.GetOVNDBCluster(names.OVNDbServerNBName)
+				g.Expect(ovnDbServerNB).Should(Not(BeNil()))
+			}, timeout, interval).Should(Succeed())
+
+			Eventually(func(g Gomega) {
+				ovnDbServerSB := ovn.GetOVNDBCluster(names.OVNDbServerSBName)
+				g.Expect(ovnDbServerSB).Should(Not(BeNil()))
+			}, timeout, interval).Should(Succeed())
+		})
+
 		It("should remove OVN resources on disable", func() {
 			Eventually(func(g Gomega) {
 				OSCtlplane := GetOpenStackControlPlane(names.OpenStackControlplaneName)

tests/functional/ctlplane/openstackversion_controller_test.go

@@ -239,6 +239,11 @@ var _ = Describe("OpenStackOperator controller", func() {
 							"dbType": "SB",
 						},
 					},
+					"ovnController": map[string]interface{}{
+						"nicMappings": map[string]interface{}{
+							"datacentre": "ospbr",
+						},
+					},
 				},
 			}
 			DeferCleanup(

tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/01-create-nic-mappings.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      oc apply -n $NAMESPACE -f ../../../../config/samples/nad_datacentre.yaml

tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-assert-deploy-openstack.yaml

@@ -0,0 +1 @@
+../../common/assert-sample-deployment.yaml

tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/02-deploy-openstack.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      oc kustomize ../../../../config/samples/base/openstackcontrolplane | oc apply -n $NAMESPACE -f -

tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-add-ovn-nic-mappings.yaml

@@ -0,0 +1,10 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+timeout: 60
+commands:
+  - script: |
+      oc patch openstackcontrolplane -n $NAMESPACE openstack --type='json' -p='[{
+        "op": "replace",
+        "path": "/spec/ovn/template/ovnController/nicMappings",
+        "value":{"datacentre":"ospbr"}
+      }]'

tests/kuttl/tests/ctlplane-basic-deployment-with-nicMappings/03-assert.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    service: ovn-controller
+status:
+  phase: Running
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    service: ovn-controller-ovs
+status:
+  phase: Running