Skip to content

Don't overwrite Spec in IPAM PoolMonitor from NNC again after initialization #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2022
Merged

Don't overwrite Spec in IPAM PoolMonitor from NNC again after initialization #1328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cns/ipampool/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func (pm *Monitor) Start(ctx context.Context) error {
continue
}
case nnc := <-pm.nncSource: // received a new NodeNetworkConfig, extract the data from it and re-reconcile.
pm.spec = nnc.Spec
scaler := nnc.Status.Scaler

// Set SubnetName, SubnetAddressSpace and Pod Network ARM ID values to the global subnet, subnetCIDR and subnetARM variables.
Expand All @@ -105,7 +104,11 @@ func (pm *Monitor) Start(ctx context.Context) error {
pm.metastate.batch = scaler.BatchSize
pm.metastate.max = scaler.MaxIPCount
pm.metastate.minFreeCount, pm.metastate.maxFreeCount = CalculateMinFreeIPs(scaler), CalculateMaxFreeIPs(scaler)
pm.once.Do(func() { close(pm.started) }) // close the init channel the first time we receive a NodeNetworkConfig.
pm.once.Do(func() {
pm.spec = nnc.Spec // set the spec from the NNC initially (afterwards we write the Spec so we know target state).
Copy link
Member

@neaggarwMS neaggarwMS Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a log line here

Copy link
Member

@neaggarwMS neaggarwMS Apr 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also add a log line in func (pm *Monitor) Update(nnc *v1alpha.NodeNetworkConfig) error { function.

logger.Printf("[ipam-pool-monitor] set initial pool spec %+v", pm.spec)
close(pm.started) // close the init channel the first time we fully receive a NodeNetworkConfig.
})
}
// if control has flowed through the select(s) to this point, we can now reconcile.
err := pm.reconcile(ctx)
Expand Down Expand Up @@ -376,6 +379,7 @@ func (pm *Monitor) Update(nnc *v1alpha.NodeNetworkConfig) error {
// observe elapsed duration for IP pool scaling
metric.ObserverPoolScaleLatency()
}
logger.Printf("[ipam-pool-monitor] pushing NodeNetworkConfig update, allocatedIPs = %d", allocatedIPs)
pm.nncSource <- *nnc
return nil
}
Expand Down