Make PacketMachine controller re-entrant when crashes happen during creation process

Author: detiber

controllers/packetmachine_controller.go

@@ -23,16 +23,16 @@ import (
 	"strings"
 	"time"
 
-	corev1 "k8s.io/api/core/v1"
-
 	"github.com/go-logr/logr"
-	"github.com/google/uuid"
 	"github.com/packethost/packngo"
 	"github.com/pkg/errors"
-
+	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
+	infrastructurev1alpha3 "sigs.k8s.io/cluster-api-provider-packet/api/v1alpha3"
+	packet "sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet"
+	"sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet/scope"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	capierrors "sigs.k8s.io/cluster-api/errors"
 	"sigs.k8s.io/cluster-api/util"
@@ -42,11 +42,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
-
-	packet "sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet"
-	"sigs.k8s.io/cluster-api-provider-packet/pkg/cloud/packet/scope"
-
-	infrastructurev1alpha3 "sigs.k8s.io/cluster-api-provider-packet/api/v1alpha3"
 )
 
 const (
@@ -195,6 +190,13 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 	}
 
 	providerID := machineScope.GetInstanceID()
+
+	defaultTags := []string{
+		packet.GenerateClusterTag(clusterScope.Name()),
+		packet.GenerateMachineNameTag(machineScope.Name()),
+		packet.GenerateNamespaceTag(machineScope.Namespace()),
+	}
+
 	var (
 		dev                  *packngo.Device
 		addrs                []corev1.NodeAddress
@@ -208,15 +210,22 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 			return ctrl.Result{}, err
 		}
 	}
+
+	if dev == nil {
+		dev, err = r.PacketClient.GetDeviceByTags(
+			machineScope.PacketCluster.Spec.ProjectID,
+			defaultTags,
+		)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	if dev == nil {
 		createDeviceReq := packet.CreateDeviceRequest{
+			ExtraTags:    defaultTags,
 			MachineScope: machineScope,
 		}
-		mUID := uuid.New().String()
-		tags := []string{
-			packet.GenerateMachineTag(mUID),
-			packet.GenerateClusterTag(clusterScope.Name()),
-		}
 
 		// when the node is a control plan we should check if the elastic ip
 		// for this cluster is not assigned. If it is free we can prepare the
@@ -236,8 +245,6 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 			createDeviceReq.ControlPlaneEndpoint = controlPlaneEndpoint.Address
 		}
 
-		createDeviceReq.ExtraTags = tags
-
 		dev, err = r.PacketClient.NewDevice(createDeviceReq)
 
 		switch {

pkg/cloud/packet/util.go

@@ -21,16 +21,26 @@ import (
 )
 
 const (
-	MachineUIDTag = "cluster-api-provider-packet:machine-uid"
-	clusterIDTag  = "cluster-api-provider-packet:cluster-id"
-	AnnotationUID = "cluster.k8s.io/machine-uid"
+	MachineUIDTag  = "cluster-api-provider-packet:machine-uid"
+	machineNameTag = "cluster-api-provider-packet:machine-name"
+	clusterIDTag   = "cluster-api-provider-packet:cluster-id"
+	namespaceTag   = "cluster-api-provider-packet:namespace"
 )
 
-func GenerateMachineTag(ID string) string {
-	return fmt.Sprintf("%s:%s", MachineUIDTag, ID)
+func GenerateMachineTag(id string) string {
+	return fmt.Sprintf("%s:%s", MachineUIDTag, id)
 }
-func GenerateClusterTag(ID string) string {
-	return fmt.Sprintf("%s:%s", clusterIDTag, ID)
+
+func GenerateMachineNameTag(name string) string {
+	return fmt.Sprintf("%s:%s", machineNameTag, name)
+}
+
+func GenerateClusterTag(clusterName string) string {
+	return fmt.Sprintf("%s:%s", clusterIDTag, clusterName)
+}
+
+func GenerateNamespaceTag(namespace string) string {
+	return fmt.Sprintf("%s:%s", namespaceTag, namespace)
 }
 
 // ItemsInList checks if all items are in the list