From 04c6dea3d4901d388309a070230052afaf4975b3 Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Thu, 19 May 2022 10:07:25 -0400 Subject: [PATCH] Use hardware namespace and name as provider ID Signed-off-by: Abhinav Pandey --- controllers/machine.go | 2 +- controllers/tinkerbellmachine_controller_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/machine.go b/controllers/machine.go index 18c074d5..3cd95732 100644 --- a/controllers/machine.go +++ b/controllers/machine.go @@ -349,7 +349,7 @@ func (mrc *machineReconcileContext) ensureHardware() (*tinkv1.Hardware, error) { } mrc.tinkerbellMachine.Spec.HardwareName = hardware.Name - mrc.tinkerbellMachine.Spec.ProviderID = fmt.Sprintf("tinkerbell://%s", hardware.UID) + mrc.tinkerbellMachine.Spec.ProviderID = fmt.Sprintf("tinkerbell://%s/%s", hardware.Namespace, hardware.Name) if err := mrc.ensureHardwareUserData(hardware, mrc.tinkerbellMachine.Spec.ProviderID); err != nil { return nil, fmt.Errorf("ensuring Hardware user data: %w", err) diff --git a/controllers/tinkerbellmachine_controller_test.go b/controllers/tinkerbellmachine_controller_test.go index 1326af07..1225fcb6 100644 --- a/controllers/tinkerbellmachine_controller_test.go +++ b/controllers/tinkerbellmachine_controller_test.go @@ -18,6 +18,7 @@ package controllers_test import ( "context" + "fmt" "testing" "github.com/google/uuid" @@ -288,7 +289,7 @@ func Test_Machine_reconciliation_with_available_hardware(t *testing.T) { t.Parallel() g := NewWithT(t) - g.Expect(updatedMachine.Spec.ProviderID).To(HaveSuffix(hardwareUUID), + g.Expect(updatedMachine.Spec.ProviderID).To(Equal(fmt.Sprintf("tinkerbell://%s/%s", clusterNamespace, hardwareName)), "Expected ProviderID field to include hardwareUUID") })