🌱 fix duplicate machine tags.

controllers/hivelocitymachine_controller_test.go

@@ -224,16 +224,22 @@ var _ = Describe("HivelocityMachineReconciler", func() {
 					testEnv.GetLogger().Info("Machine has wrong providerID")
 					return false
 				}
+				if hvMachine.Spec.Status.ProvisioningState != infrav1.StateDeviceProvisioned {
+					testEnv.GetLogger().Info("hvMachine.Spec.Status.ProvisioningState != infrav1.StateDeviceProvisioned.",
+						"ProvisioningState", hvMachine.Spec.Status.ProvisioningState)
+					return false
+				}
 				return true
 			}, timeout, time.Second).Should(BeTrue())
 			hvClient := testEnv.HVClientFactory.NewClient("dummy-key")
 			device, err := hvClient.GetDevice(ctx, mock.FreeDeviceID)
 			Expect(err).ShouldNot(HaveOccurred())
 			Expect(device.Tags).Should(BeEquivalentTo([]string{
 				"caphv-device-type=hvCustom",
-				"caphv-cluster-name=hv-test1",
 				"caphv-cluster-hv-test1=owned",
+				"caphv-cluster-name=hv-test1",
 				fmt.Sprintf("caphv-machine-name=%s", hvMachine.Name),
+				"caphv-machine-type=worker",
 			}))
 		})
 	})

pkg/scope/machine.go

@@ -114,7 +114,7 @@ func (m *MachineScope) DeviceTagMachineType() hvtag.DeviceTag {
 		value = "worker"
 	}
 	return hvtag.DeviceTag{
-		Key:   hvtag.DeviceTagKeyCluster,
+		Key:   hvtag.DeviceTagKeyMachineType,
 		Value: value,
 	}
 }

pkg/services/hivelocity/client/mock/mock_client.go

@@ -175,6 +175,8 @@ func (c *mockedHVClient) ProvisionDevice(ctx context.Context, deviceID int32, op
 	if !ok {
 		return hv.BareMetalDevice{}, fmt.Errorf("[ProvisionDevice] deviceID %d unknown", deviceID)
 	}
+	device.Tags = opts.Tags
+	c.store.idMap[deviceID] = device
 	return device, nil
 }
 

pkg/services/hivelocity/client/mock/mock_client_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	hvclient "github.com/hivelocity/cluster-api-provider-hivelocity/pkg/services/hivelocity/client"
+	hv "github.com/hivelocity/hivelocity-client-go/client"
 	"github.com/stretchr/testify/require"
 )
 
@@ -71,3 +72,16 @@ func Test_NewMockedHVClientFactory(t *testing.T) {
 	require.NoError(t, err)
 	require.ElementsMatch(t, device.Tags, []string{"caphv-device-type=hvCustom"})
 }
+
+func Test_ProvisionDevice(t *testing.T) {
+	factory := NewMockedHVClientFactory()
+	client := factory.NewClient("dummy-key")
+	ctx := context.Background()
+	_, err := client.ProvisionDevice(ctx, FreeDeviceID, hv.BareMetalDeviceUpdate{
+		Tags: []string{"dummyTag"},
+	})
+	require.NoError(t, err)
+	device, err := client.GetDevice(ctx, FreeDeviceID)
+	require.NoError(t, err)
+	require.ElementsMatch(t, []string{"dummyTag"}, device.Tags)
+}

pkg/services/hivelocity/device/device.go

@@ -116,9 +116,10 @@ func (s *Service) actionAssociateDevice(ctx context.Context) actionResult {
 
 	// associate this device with the machine object by setting tags
 	device.Tags = append(device.Tags,
-		s.scope.HivelocityCluster.DeviceTag().ToString(),
 		s.scope.HivelocityCluster.DeviceTagOwned().ToString(),
+		s.scope.HivelocityCluster.DeviceTag().ToString(),
 		s.scope.HivelocityMachine.DeviceTag().ToString(),
+		s.scope.DeviceTagMachineType().ToString(),
 	)
 
 	if err := s.scope.HVClient.SetDeviceTags(ctx, device.DeviceId, device.Tags); err != nil {
@@ -299,14 +300,6 @@ func (s *Service) actionProvisionDevice(ctx context.Context) actionResult {
 		return actionError{err: fmt.Errorf("failed to get device image: %w", err)}
 	}
 
-	tags := []string{
-		s.scope.HivelocityCluster.DeviceTag().ToString(),
-		s.scope.HivelocityMachine.DeviceTag().ToString(),
-		s.scope.DeviceTagMachineType().ToString(),
-	}
-
-	device.Tags = append(device.Tags, tags...)
-
 	opts := hv.BareMetalDeviceUpdate{
 		Hostname:    fmt.Sprintf("%s.example.com", s.scope.Name()), // TODO: HV API requires a FQDN.
 		Tags:        device.Tags,