Merge branch 'master' into feat/helm_chart_pod_annotations

aws · Jan 11, 2024 · cd858ba · cd858ba
2 parents 7d89202 + f91d492
commit cd858ba
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/ipamd/ipamd.go b/pkg/ipamd/ipamd.go
@@ -652,7 +652,11 @@ func (c *IPAMContext) updateIPPoolIfRequired(ctx context.Context) {
 	log.Debugf("IP stats - total IPs: %d, assigned IPs: %d, cooldown IPs: %d", stats.TotalIPs, stats.AssignedIPs, stats.CooldownIPs)
 
 	if datastorePoolTooLow {
-		c.increaseDatastorePool(ctx)
+		// Allow for rapid scale up to decrease time it takes for pod to retrieve an ip
+		// but conservative scale down to account for pod churn
+		for datastorePoolStillTooLow := datastorePoolTooLow; datastorePoolStillTooLow; datastorePoolStillTooLow, _ = c.isDatastorePoolTooLow() {
+			c.increaseDatastorePool(ctx)
+		}
 	} else if c.isDatastorePoolTooHigh(stats) {
 		c.decreaseDatastorePool(decreaseIPPoolInterval)
 	}