handle nil scenario

NihaNallappagari · NihaNallappagari · commit 857294c194a2 · 2025-09-17T18:05:35.000-05:00
diff --git a/azure-ipam/ipam.go b/azure-ipam/ipam.go
@@ -136,7 +136,15 @@ func (p *IPAMPlugin) CmdAdd(args *cniSkel.CmdArgs) error {
 				Mask: net.CIDRMask(ipNet.Bits(), 128), // nolint
 			}
 		}
-		ipConfig.Gateway = (*gatewayIP)[i]
+
+		// Handle nil gatewayIP condition
+		if gatewayIP != nil && len(*gatewayIP) > i {
+			ipConfig.Gateway = (*gatewayIP)[i]
+		} else {
+			p.logger.Warn("No gateway IP returned from CNS, setting to nil", zap.Any("gatewayIP", gatewayIP), zap.Int("index", i))
+			ipConfig.Gateway = nil
+		}
+
 		cniResult.IPs[i] = ipConfig
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,15 @@ func (p IPAMPlugin) CmdAdd(args cniSkel.CmdArgs) error {`
`136`	`136`	`Mask: net.CIDRMask(ipNet.Bits(), 128), // nolint`
`137`	`137`	`}`
`138`	`138`	`}`
`139`		`- ipConfig.Gateway = (*gatewayIP)[i]`
	`139`	`+`
	`140`	`+ // Handle nil gatewayIP condition`
	`141`	`+ if gatewayIP != nil && len(*gatewayIP) > i {`
	`142`	`+ ipConfig.Gateway = (*gatewayIP)[i]`
	`143`	`+ } else {`
	`144`	`+ p.logger.Warn("No gateway IP returned from CNS, setting to nil", zap.Any("gatewayIP", gatewayIP), zap.Int("index", i))`
	`145`	`+ ipConfig.Gateway = nil`
	`146`	`+ }`
	`147`	`+`
`140`	`148`	`cniResult.IPs[i] = ipConfig`
`141`	`149`	`}`
`142`	`150`