address comments

Author: scmeggitt

internal/controller/linodecluster_controller.go

@@ -29,6 +29,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/util/retry"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kutil "sigs.k8s.io/cluster-api/util"
 	conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
@@ -153,7 +154,9 @@ func (r *LinodeClusterReconciler) reconcileVPCLabel(ctx context.Context, cluster
 	}
 	labels[clusterv1.ClusterNameLabel] = clusterScope.LinodeCluster.Name
 	linodeVPC.SetLabels(labels)
-	return clusterScope.Client.Update(ctx, &linodeVPC)
+	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		return clusterScope.Client.Update(ctx, &linodeVPC)
+	})
 }
 
 //nolint:cyclop // can't make it simpler with existing API
@@ -189,8 +192,7 @@ func (r *LinodeClusterReconciler) reconcile(
 		return res, err
 	}
 
-	err := r.reconcileVPCLabel(ctx, clusterScope, logger)
-	if err != nil {
+	if err := r.reconcileVPCLabel(ctx, clusterScope, logger); err != nil {
 		return res, err
 	}
 

internal/controller/linodemachine_controller.go

@@ -32,6 +32,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/util/retry"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kutil "sigs.k8s.io/cluster-api/util"
 	conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
@@ -209,7 +210,9 @@ func (r *LinodeMachineReconciler) reconcileFirewallLabel(ctx context.Context, lo
 	}
 	labels[clusterv1.ClusterNameLabel] = machineScope.Machine.Labels[clusterv1.ClusterNameLabel]
 	linodeFW.SetLabels(labels)
-	return machineScope.Client.Update(ctx, &linodeFW)
+	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		return machineScope.Client.Update(ctx, &linodeFW)
+	})
 }
 
 // reconcilePGLabel adds the cluster-name label to placement group referenced in the machineScope if it does not already exist
@@ -236,7 +239,9 @@ func (r *LinodeMachineReconciler) reconcilePGLabel(ctx context.Context, logger l
 	}
 	labels[clusterv1.ClusterNameLabel] = machineScope.Machine.Labels[clusterv1.ClusterNameLabel]
 	linodePG.ObjectMeta.SetLabels(labels)
-	return machineScope.Client.Update(ctx, &linodePG)
+	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		return machineScope.Client.Update(ctx, &linodePG)
+	})
 }
 
 // reconcileLabel adds the cluster-name label to placement groups and firewalls that are difference in the machine spec