Bump leaselocker to v0.3.0 and switch to ll.UnlockWithRetry()

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.10.0
-	github.com/swisscom/leaselocker v0.2.0
+	github.com/swisscom/leaselocker v0.3.0
 	go.uber.org/mock v0.5.2
 	go.uber.org/zap v1.27.0
 	k8s.io/api v0.33.4

go.sum

@@ -176,8 +176,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/swisscom/leaselocker v0.2.0 h1:5bmfVD7TKzRMwQl4E9La3Lfwd80cKD4JOQjeXIqrLrM=
-github.com/swisscom/leaselocker v0.2.0/go.mod h1:34qA0RtskqaqOqdrGWihIg4sinJRzNDd8kbmwhhMPO0=
+github.com/swisscom/leaselocker v0.3.0 h1:kX8Bejnk51gj6EoSJye6CXblWnHlbLyreXVlawvPd4E=
+github.com/swisscom/leaselocker v0.3.0/go.mod h1:34qA0RtskqaqOqdrGWihIg4sinJRzNDd8kbmwhhMPO0=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

internal/controller/ipaddress_controller.go

@@ -202,7 +202,7 @@ func (r *IpAddressReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 	// 3. unlock lease of parent prefix
 	if ll != nil {
-		ll.Unlock()
+		ll.UnlockWithRetry(ctx)
 	}
 
 	// 4. update status fields

internal/controller/iprange_controller.go

@@ -180,7 +180,7 @@ func (r *IpRangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	// 3. unlock lease of parent prefix
 	if ll != nil {
-		ll.Unlock()
+		ll.UnlockWithRetry(ctx)
 	}
 
 	// 4. update status fields

internal/controller/prefix_controller.go

@@ -217,7 +217,7 @@ func (r *PrefixReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 
 	/* 3. unlock lease of parent prefix */
 	if ll != nil {
-		ll.Unlock()
+		ll.UnlockWithRetry(ctx)
 	}
 
 	/* 4. update status fields */

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-apply-update/chainsaw-test.yaml

@@ -116,8 +116,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox)  # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-apply-update -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-cidr/chainsaw-test.yaml

@@ -19,8 +19,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-cidr -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldnotexisting/chainsaw-test.yaml

@@ -65,8 +65,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldnotexisting -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-customfieldwrongdatatype/chainsaw-test.yaml

@@ -65,8 +65,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-customfieldwrongdatatype -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-parentprefix/chainsaw-test.yaml

@@ -39,8 +39,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-parentprefix -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-size/chainsaw-test.yaml

@@ -19,8 +19,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-size -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-invalid-tenant/chainsaw-test.yaml

@@ -42,8 +42,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-invalid-tenant -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-prefixexhausted/chainsaw-test.yaml

@@ -147,10 +147,6 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-1 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-2 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-prefixexhausted-3 -n $NAMESPACE

tests/e2e/iprange/ipv4/iprangeclaim-ipv4-restore/chainsaw-test.yaml

@@ -198,9 +198,5 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-1 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv4-restore-2 -n $NAMESPACE

tests/e2e/iprange/ipv6/iprangeclaim-ipv6-apply-update/chainsaw-test.yaml

@@ -116,8 +116,4 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-apply-update -n $NAMESPACE

tests/e2e/iprange/ipv6/iprangeclaim-ipv6-prefixexhausted/chainsaw-test.yaml

@@ -148,10 +148,6 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-1 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-2 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-prefixexhausted-3 -n $NAMESPACE

tests/e2e/iprange/ipv6/iprangeclaim-ipv6-restore/chainsaw-test.yaml

@@ -198,9 +198,5 @@ spec:
       cleanup:
         - script:
             content: |-
-              LEASES=$(kubectl -n netbox-operator-system get lease -oname | grep -v netbox) # to be enhanced in usage of leaselocker
-              if [ -n "$LEASES" ]; then
-                echo "$LEASES" | xargs -n1 kubectl -n netbox-operator-system delete
-              fi
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-1 -n $NAMESPACE
               kubectl delete events --field-selector involvedObject.name=iprangeclaim-ipv6-restore-2 -n $NAMESPACE