add host group validations for vsAddress and ipamLabel (#3316)

* add host group validations for vsAddress and ipamLabel * fix uts
F5Networks · Mar 5, 2024 · 3dc3ee6 · 3dc3ee6
1 parent 03ceb63
commit 3dc3ee6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkg/controller/worker.go b/pkg/controller/worker.go
@@ -1423,9 +1423,24 @@ func (ctlr *Controller) getAssociatedVirtualServers(
 
 		// skip the virtuals in other HostGroups
 		if vrt.Spec.HostGroup != currentVS.Spec.HostGroup {
+			if currentVS.Spec.VirtualServerAddress != "" && vrt.Spec.VirtualServerAddress != "" && currentVS.Spec.VirtualServerAddress == vrt.Spec.VirtualServerAddress {
+				log.Errorf("Multiple Virtual Servers %v, %v are configured with same VirtualServerAddress: %v", currentVS.Name, vrt.Name, vrt.Spec.VirtualServerAddress)
+				return nil
+			}
 			continue
 		}
 
+		if vrt.Spec.HostGroup != "" && currentVS.Spec.HostGroup != "" && vrt.Spec.HostGroup == currentVS.Spec.HostGroup {
+			if currentVS.Spec.VirtualServerAddress != "" && vrt.Spec.VirtualServerAddress != "" && currentVS.Spec.VirtualServerAddress != vrt.Spec.VirtualServerAddress {
+				log.Errorf("Multiple Virtual Servers %v, %v are configured with different VirtualServerAddress: %v %v", currentVS.Name, vrt.Name, currentVS.Spec.VirtualServerAddress, vrt.Spec.VirtualServerAddress)
+				return nil
+			}
+			if currentVS.Spec.IPAMLabel != "" && vrt.Spec.IPAMLabel != "" && currentVS.Spec.IPAMLabel != vrt.Spec.IPAMLabel {
+				log.Errorf("Multiple Virtual Servers %v, %v are configured with different IPAM Labels: %v %v", currentVS.Name, vrt.Name, currentVS.Spec.IPAMLabel, vrt.Spec.IPAMLabel)
+				return nil
+			}
+		}
+
 		if currentVS.Spec.HostGroup != "" && vrt.Spec.HostGroup == currentVS.Spec.HostGroup && vrt.Spec.HostGroupVirtualServerName != currentVS.Spec.HostGroupVirtualServerName {
 			log.Errorf("Same host %v is configured with different HostGroupVirtualServerNames : %v ", vrt.Spec.HostGroup, vrt.Spec.HostGroupVirtualServerName)
 			return nil

diff --git a/pkg/controller/worker_test.go b/pkg/controller/worker_test.go
@@ -651,6 +651,7 @@ var _ = Describe("Worker Tests", func() {
 				vrt2.Spec.HostGroup = "test"
 				vrt3.Spec.HostGroup = "test"
 				vrt3.Spec.Host = "test3.com"
+				vrt4.Spec.VirtualServerAddress = ""
 
 				virts := mockCtlr.getAssociatedVirtualServers(vrt2,
 					[]*cisapiv1.VirtualServer{vrt2, vrt3, vrt4},
@@ -665,6 +666,7 @@ var _ = Describe("Worker Tests", func() {
 				vrt3.Spec.HostGroup = "test"
 				vrt3.Spec.Host = "test3.com"
 				vrt3.Spec.VirtualServerAddress = ""
+				vrt4.Spec.VirtualServerAddress = ""
 
 				virts := mockCtlr.getAssociatedVirtualServers(vrt2,
 					[]*cisapiv1.VirtualServer{vrt2, vrt3, vrt4},