Fix reconcileDelete machine flow for vpc (#873)

Signed-off-by: Prajyot-Parab <[email protected]> Signed-off-by: Prajyot-Parab <[email protected]> Co-authored-by: Prajyot-Parab <[email protected]>
kubernetes-sigs · Sep 16, 2022 · 04c4e7e · 04c4e7e
1 parent e43256b
commit 04c4e7e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -168,6 +168,9 @@ func (m *MachineScope) CreateMachine() (*vpcv1.Instance, error) {
 
 // DeleteMachine deletes the vpc machine associated with machine instance id.
 func (m *MachineScope) DeleteMachine() error {
+	if m.IBMVPCMachine.Status.InstanceID == "" {
+		return nil
+	}
 	options := &vpcv1.DeleteInstanceOptions{}
 	options.SetID(m.IBMVPCMachine.Status.InstanceID)
 	_, err := m.IBMVPCClient.DeleteInstance(options)

diff --git a/cloud/scope/machine_test.go b/cloud/scope/machine_test.go
@@ -273,6 +273,7 @@ func TestDeleteMachine(t *testing.T) {
 			setup(t)
 			t.Cleanup(teardown)
 			scope := setupMachineScope(clusterName, machineName, mockvpc)
+			scope.IBMVPCMachine.Status.InstanceID = "foo-instance-id"
 			mockvpc.EXPECT().DeleteInstance(gomock.AssignableToTypeOf(deleteInstanceOptions)).Return(detailedResponse, nil)
 			err := scope.DeleteMachine()
 			g.Expect(err).To(BeNil())
@@ -283,9 +284,19 @@ func TestDeleteMachine(t *testing.T) {
 			setup(t)
 			t.Cleanup(teardown)
 			scope := setupMachineScope(clusterName, machineName, mockvpc)
+			scope.IBMVPCMachine.Status.InstanceID = "foo-instance-id"
 			mockvpc.EXPECT().DeleteInstance(gomock.AssignableToTypeOf(deleteInstanceOptions)).Return(detailedResponse, errors.New("Failed instance deletion"))
 			err := scope.DeleteMachine()
 			g.Expect(err).To(Not(BeNil()))
 		})
+
+		t.Run("Empty InstanceID", func(t *testing.T) {
+			g := NewWithT(t)
+			setup(t)
+			t.Cleanup(teardown)
+			scope := setupMachineScope(clusterName, machineName, mockvpc)
+			err := scope.DeleteMachine()
+			g.Expect(err).To(BeNil())
+		})
 	})
 }