Skip to content

Commit a9a4acd

Browse files
committed
fixup! fixup! fixup! feat: ipam timestamp
1 parent c3b8a61 commit a9a4acd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

deployments/liqo/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,15 @@ ipam:
448448
graphviz: false
449449
# -- Set the interval at which the IPAM pod will synchronize it's in-memory status with the local cluster.
450450
# If you want to disable the synchronization, set the interval to 0.
451-
syncInterval: 5s
451+
syncInterval: 2m
452452
## -- Set the grace period the sync routine will wait before deleting an ip or a network.
453-
syncGracePeriod: 15s
453+
syncGracePeriod: 30s
454454
# -- The subnet used by the pods in your cluster, in CIDR notation (e.g., 10.0.0.0/16).
455455
podCIDR: ""
456456
# -- The subnet used by the services in you cluster, in CIDR notation (e.g., 172.16.0.0/16).
457457
serviceCIDR: ""
458458
# -- The subnet used for the external CIDR.
459-
externalCIDR: "10.70.0.0/27"
459+
externalCIDR: "10.70.0.0/16"
460460
# -- The subnet used for the internal CIDR.
461461
# These IPs are assigned to the Liqo internal-network interfaces.
462462
internalCIDR: "10.80.0.0/16"

pkg/consts/ipam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const (
2525
// SyncInterval is the frequency at which the IPAM should periodically sync its status.
2626
SyncInterval = 2 * time.Minute
2727
// SyncGracePeriod is the time the IPAM sync routine should wait before performing a deletion.
28-
SyncGracePeriod = 1 * time.Minute
28+
SyncGracePeriod = 30 * time.Second
2929
// NetworkNotRemappedLabelKey is the label key used to mark a Network that does not need CIDR remapping.
3030
NetworkNotRemappedLabelKey = "ipam.liqo.io/network-not-remapped"
3131
// NetworkNotRemappedLabelValue is the label value used to mark a Network that does not need CIDR remapping.

pkg/ipam/ipam.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (lipam *LiqoIPAM) IPRelease(_ context.Context, req *IPReleaseRequest) (*IPR
119119
return &IPReleaseResponse{}, fmt.Errorf("failed to parse prefix %q: %w", req.GetCidr(), err)
120120
}
121121

122-
if err := lipam.ipRelease(addr, prefix, time.Minute*30); err != nil {
122+
if err := lipam.ipRelease(addr, prefix, 0); err != nil {
123123
return &IPReleaseResponse{}, err
124124
}
125125

@@ -175,7 +175,7 @@ func (lipam *LiqoIPAM) NetworkRelease(_ context.Context, req *NetworkReleaseRequ
175175
return &NetworkReleaseResponse{}, fmt.Errorf("failed to parse prefix %q: %w", req.GetCidr(), err)
176176
}
177177

178-
if err := lipam.networkRelease(prefix, time.Minute*30); err != nil {
178+
if err := lipam.networkRelease(prefix, 0); err != nil {
179179
return &NetworkReleaseResponse{}, err
180180
}
181181

0 commit comments

Comments
 (0)