daemon, ipam: omit IPAM mode check before calling ipam.Allocator.RestoreFinished

[tklauser]

The IPAM modes which were left out of the condition (kubernetes, cluster-pool and delegated-plugin) all implement a noop RestoreFinished method in their allocator.

The kubernetes and cluster-pool modes uses hostscopeAllocator:

cilium/pkg/ipam/ipam.go

Lines 116 to 128 in e84e99f

	case ipamOption.IPAMKubernetes, ipamOption.IPAMClusterPool:
	log.WithFields(logrus.Fields{
	logfields.V4Prefix: nodeAddressing.IPv4().AllocationCIDR(),
	logfields.V6Prefix: nodeAddressing.IPv6().AllocationCIDR(),
	}).Infof("Initializing %s IPAM", c.IPAMMode())
	if c.IPv6Enabled() {
	ipam.IPv6Allocator = newHostScopeAllocator(nodeAddressing.IPv6().AllocationCIDR().IPNet)
	}
	if c.IPv4Enabled() {
	ipam.IPv4Allocator = newHostScopeAllocator(nodeAddressing.IPv4().AllocationCIDR().IPNet)
	}

and thus its noop RestoreFinished method:

cilium/pkg/ipam/hostscope.go

Lines 98 to 99 in e84e99f

	// RestoreFinished marks the status of restoration as done
	func (h *hostScopeAllocator) RestoreFinished() {}

The delegated-plugin mode uses noopAllocator:

cilium/pkg/ipam/ipam.go

Lines 147 to 154 in e84e99f

	case ipamOption.IPAMDelegatedPlugin:
	log.Info("Initializing no-op IPAM since we're using a CNI delegated plugin")
	if c.IPv6Enabled() {
	ipam.IPv6Allocator = &noOpAllocator{}
	}
	if c.IPv4Enabled() {
	ipam.IPv4Allocator = &noOpAllocator{}
	}

and thus its noop RestoreFinished method:

cilium/pkg/ipam/noop_allocator.go

Lines 42 to 43 in e84e99f

	func (n *noOpAllocator) RestoreFinished() {
	}

[tklauser]

/test

[pippolo84]

🚀