Merge pull request openstack-k8s-operators#1103 from averdagu/revert/…

…nicMappings

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

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

pkg/openstack/ovn.go

@@ -314,13 +314,6 @@ 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,11 +1620,6 @@ var _ = Describe("OpenStackOperator controller", func() {
 							"dbType": "SB",
 						},
 					},
-					"ovnController": map[string]interface{}{
-						"nicMappings": map[string]interface{}{
-							"datacentre": "ospbr",
-						},
-					},
 				},
 			}
 			DeferCleanup(
@@ -1675,37 +1670,6 @@ 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,11 +239,6 @@ var _ = Describe("OpenStackOperator controller", func() {
 							"dbType": "SB",
 						},
 					},
-					"ovnController": map[string]interface{}{
-						"nicMappings": map[string]interface{}{
-							"datacentre": "ospbr",
-						},
-					},
 				},
 			}
 			DeferCleanup(