properly handle fake nodes for deletion

Author: detiber

cluster-autoscaler/cloudprovider/packet/packet_manager_rest.go

@@ -625,26 +625,38 @@ func (mgr *packetManagerRest) deleteDevice(ctx context.Context, nodegroup, id st
 func (mgr *packetManagerRest) deleteNodes(nodegroup string, nodes []NodeRef, updatedNodeCount int) error {
 	klog.Infof("Deleting nodes %v", nodes)
 
+	ctx := context.TODO()
+
 	errList := make([]error, 0, len(nodes))
 
+	devices, err := mgr.listPacketDevices(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to list devices: %w", err)
+	}
+	klog.Infof("%d devices total", len(devices.Devices))
+
 	for _, n := range nodes {
-		klog.Infof("Node %s - %s - %s", n.Name, n.MachineID, n.IPs)
+		fakeNode := false
 
-		dl, err := mgr.listPacketDevices(context.TODO())
-		if err != nil {
-			return fmt.Errorf("failed to list devices: %w", err)
+		if n.Name == n.ProviderID {
+			klog.Infof("Fake Node: %s", n.Name)
+			fakeNode = true
+		} else {
+			klog.Infof("Node %s - %s - %s", n.Name, n.MachineID, n.IPs)
 		}
 
-		klog.Infof("%d devices total", len(dl.Devices))
 		// Get the count of devices tagged as nodegroup
-		for _, d := range dl.Devices {
+		for _, d := range devices.Devices {
 			klog.Infof("Checking device %v", d)
 			if Contains(d.Tags, "k8s-cluster-"+mgr.getNodePoolDefinition(nodegroup).clusterName) && Contains(d.Tags, "k8s-nodepool-"+nodegroup) {
 				klog.Infof("nodegroup match %s %s", d.Hostname, n.Name)
-				if d.Hostname == n.Name {
+				switch {
+				case d.Hostname == n.Name:
 					klog.V(1).Infof("Matching Packet Device %s - %s", d.Hostname, d.ID)
-
-					errList = append(errList, mgr.deleteDevice(context.TODO(), nodegroup, d.ID))
+					errList = append(errList, mgr.deleteDevice(ctx, nodegroup, d.ID))
+				case fakeNode && strings.TrimPrefix(n.Name, "packet://") == d.ID:
+					klog.V(1).Infof("Fake Node %s", d.ID)
+					errList = append(errList, mgr.deleteDevice(ctx, nodegroup, d.ID))
 				}
 			}
 		}

cluster-autoscaler/cloudprovider/packet/packet_node_group_test.go

@@ -29,12 +29,11 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-const getPacketDeviceResponsePool2 = `
-{"id":"0f5609af-1c27-451b-8edd-a1283f2c9440","short_id":"0f5609af","hostname":"k8s-cluster2-pool2-jssxcyzz","description":null,"state":"active","tags":["k8s-cluster-cluster2","k8s-nodepool-pool2"]}
-`
-const getPacketDeviceResponsePool3 = `
-{"id":"8fa90049-e715-4794-ba31-81c1c78cee84","short_id":"8fa90049","hostname":"k8s-cluster2-pool3-xpnrwgdf","description":null,"state":"active","tags":["k8s-cluster-cluster2","k8s-nodepool-pool3"]}
-`
+const createPacketDeviceResponsePool2 = ``
+const deletePacketDeviceResponsePool2 = ``
+
+const createPacketDeviceResponsePool3 = ``
+const deletePacketDeviceResponsePool3 = ``
 
 func TestIncreaseDecreaseSize(t *testing.T) {
 	var m *packetManagerRest
@@ -47,14 +46,15 @@ func TestIncreaseDecreaseSize(t *testing.T) {
 	} else {
 		// Set up a mock Packet API
 		m = newTestPacketManagerRest(t, server.URL)
-		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponse).Times(4)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponse).Times(3)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(createPacketDeviceResponsePool3).Times(1)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool3).Times(2)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(createPacketDeviceResponsePool2).Times(1)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool2).Times(3)
+		server.On("handle", "/devices/0f5609af-1c27-451b-8edd-a1283f2c9440").Return(deletePacketDeviceResponsePool2).Times(1)
 		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool3).Times(3)
-		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool2).Times(1)
-		server.On("handle", "/devices/0f5609af-1c27-451b-8edd-a1283f2c9440").Return(getPacketDeviceResponsePool2).Times(1)
-		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool2).Times(4)
-		server.On("handle", "/devices/8fa90049-e715-4794-ba31-81c1c78cee84").Return(getPacketDeviceResponsePool3).Times(1)
-		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponseAfterIncreasePool2).Times(2)
-		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponse).Times(2)
+		server.On("handle", "/devices/8fa90049-e715-4794-ba31-81c1c78cee84").Return(deletePacketDeviceResponsePool3).Times(1)
+		server.On("handle", "/projects/"+m.packetManagerNodePools["default"].projectID+"/devices").Return(listPacketDevicesResponse).Times(3)
 	}
 	clusterUpdateLock := sync.Mutex{}
 	ngPool2 := &packetNodeGroup{