Merge pull request #701 from pierrecregut/fix_defer

🐛 Fix ignored errors while patching resources

controllers/ippool_controller.go

@@ -82,6 +82,7 @@ func (r *IPPoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
 		err := helper.Patch(ctx, ipamv1IPPool)
 		if err != nil {
 			metadataLog.Info("failed to Patch ipamv1IPPool")
+			rerr = err
 		}
 	}()
 

ipam/ippool_manager.go

@@ -209,16 +209,21 @@ func (m *IPPoolManager) UpdateAddresses(ctx context.Context) (int, error) {
 
 func (m *IPPoolManager) updateAddress(ctx context.Context,
 	addressClaim *ipamv1.IPClaim, addresses map[ipamv1.IPAddressStr]string,
-) (map[ipamv1.IPAddressStr]string, error) {
+) (_ map[ipamv1.IPAddressStr]string, rerr error) {
 	helper, err := patch.NewHelper(addressClaim, m.client)
 	if err != nil {
 		return addresses, errors.Wrap(err, "failed to init patch helper")
 	}
+	deleted := false
 	// Always patch addressClaim exiting this function so we can persist any changes.
 	defer func() {
+		if deleted {
+			return
+		}
 		err := helper.Patch(ctx, addressClaim)
 		if err != nil {
 			m.Log.Error(err, "failed to Patch IPClaim")
+			rerr = err
 		}
 	}()
 
@@ -243,6 +248,7 @@ func (m *IPPoolManager) updateAddress(ctx context.Context,
 		if err != nil {
 			return addresses, err
 		}
+		deleted = true
 	}
 	return addresses, nil
 }