Fix static IP allocation

When creating a VIP if autoallocate is set along with static IP, autoallocate is taking over precedence. Signed-off-by: Dinar Valeev <k0da@opensuse.org>
vmware · May 10, 2024 · 8c7ba27 · 8c7ba27
1 parent cf4b379
commit 8c7ba27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/internal/rest/avi_obj_vsvip.go b/internal/rest/avi_obj_vsvip.go
@@ -108,8 +108,10 @@ func (rest *RestOperations) AviVsVipBuild(vsvip_meta *nodes.AviVSVIPNode, vsCach
 			if vsvip_meta.IPAddress != "" {
 				if utils.IsV4(vsvip_meta.IPAddress) {
 					vip.IPAddress = &avimodels.IPAddr{Type: &ipType, Addr: &vsvip_meta.IPAddress}
+					vip.AutoAllocateIP = utils.BoolToPtr(false)
 				} else {
 					vip.Ip6Address = &avimodels.IPAddr{Type: &ip6Type, Addr: &vsvip_meta.IPAddress}
+					vip.AutoAllocateIP = utils.BoolToPtr(false)
 				}
 			}
 
@@ -182,8 +184,10 @@ func (rest *RestOperations) AviVsVipBuild(vsvip_meta *nodes.AviVSVIPNode, vsCach
 		if vsvip_meta.IPAddress != "" {
 			if utils.IsV4(vsvip_meta.IPAddress) {
 				vip.IPAddress = &avimodels.IPAddr{Type: &ipType, Addr: &vsvip_meta.IPAddress}
+				vip.AutoAllocateIP = utils.BoolToPtr(false)
 			} else {
 				vip.Ip6Address = &avimodels.IPAddr{Type: &ip6Type, Addr: &vsvip_meta.IPAddress}
+				vip.AutoAllocateIP = utils.BoolToPtr(false)
 			}
 		}
 

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -58,6 +58,10 @@ func IsV4(addr string) bool {
 	return v4 != nil
 }
 
+func BoolToPtr(b bool) *bool {
+	return &b
+}
+
 /*
  * Port name is either "http" or "http-suffix"
  * Following Istio named port convention