Filters terminated Vms in getInstance

Signed-off-by: Maxime Dufour <[email protected]>
outscale · Jul 8, 2024 · 6eb7538 · 6eb7538
1 parent f650a39
commit 6eb7538
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/cloud-controller-manager/osc/ccm_cloud.go b/cloud-controller-manager/osc/ccm_cloud.go
@@ -1946,7 +1946,15 @@ func (c *Cloud) getInstancesByNodeNames(nodeNames []string, states ...string) ([
 	names := nodeNames
 	oscInstances := []*osc.Vm{}
 
-	filters := osc.FiltersVm{}
+	filters := osc.FiltersVm{
+		VmStateNames: &[]string{
+			"pending",
+			"running",
+			"stopping",
+			"stopped",
+			"shutting-down",
+		},
+	}
 
 	instances, err := c.describeInstances(&filters)
 	if err != nil {
@@ -2006,6 +2014,13 @@ func (c *Cloud) findInstanceByNodeName(nodeName types.NodeName) (*osc.Vm, error)
 		Tags: &[]string{
 			fmt.Sprintf("%s=%s", TagNameClusterNode, privateDNSName),
 		},
+		VmStateNames: &[]string{
+			"pending",
+			"running",
+			"stopping",
+			"stopped",
+			"shutting-down",
+		},
 	}
 
 	instances, err := c.describeInstances(&filters)

diff --git a/cloud-controller-manager/osc/instances_v2.go b/cloud-controller-manager/osc/instances_v2.go
@@ -147,6 +147,13 @@ func (i *instancesV2) getInstance(ctx context.Context, node *v1.Node) (*osc.Vm,
 		request = &osc.ReadVmsRequest{
 			Filters: &osc.FiltersVm{
 				VmIds: &[]string{instanceID},
+				VmStateNames: &[]string{
+					"pending",
+					"running",
+					"stopping",
+					"stopped",
+					"shutting-down",
+				},
 			},
 		}
 		klog.V(4).Infof("looking for node by provider ID %v", node.Spec.ProviderID)