Merge pull request #309 from rishabh-11/instance-status

Populate instance status state when `machine.Status.LastOperation.Type` is `Create`
gardener · Jul 4, 2024 · 1be6cca · 1be6cca
2 parents 65d622b + f085dc2
commit 1be6cca
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/cluster-autoscaler/cloudprovider/mcm/mcm_manager.go b/cluster-autoscaler/cloudprovider/mcm/mcm_manager.go
@@ -657,25 +657,28 @@ func findMatchingInstance(nodes []*v1.Node, machine *v1alpha1.Machine) cloudprov
 	// Report InstanceStatus only for `ResourceExhausted` errors
 	return cloudprovider.Instance{
 		Id:     placeholderInstanceIDForMachineObj(machine.Name),
-		Status: checkAndGetResourceExhaustedInstanceStatus(machine),
+		Status: generateInstanceStatus(machine),
 	}
 }
 
 func placeholderInstanceIDForMachineObj(name string) string {
 	return fmt.Sprintf("requested://%s", name)
 }
 
-// checkAndGetResourceExhaustedInstanceStatus returns cloudprovider.InstanceStatus for the machine obj
-func checkAndGetResourceExhaustedInstanceStatus(machine *v1alpha1.Machine) *cloudprovider.InstanceStatus {
-	if machine.Status.LastOperation.Type == v1alpha1.MachineOperationCreate && machine.Status.LastOperation.State == v1alpha1.MachineStateFailed && machine.Status.LastOperation.ErrorCode == machinecodes.ResourceExhausted.String() {
-		return &cloudprovider.InstanceStatus{
-			State: cloudprovider.InstanceCreating,
-			ErrorInfo: &cloudprovider.InstanceErrorInfo{
-				ErrorClass:   cloudprovider.OutOfResourcesErrorClass,
-				ErrorCode:    machinecodes.ResourceExhausted.String(),
-				ErrorMessage: machine.Status.LastOperation.Description,
-			},
+// generateInstanceStatus returns cloudprovider.InstanceStatus for the machine obj
+func generateInstanceStatus(machine *v1alpha1.Machine) *cloudprovider.InstanceStatus {
+	if machine.Status.LastOperation.Type == v1alpha1.MachineOperationCreate {
+		if machine.Status.LastOperation.State == v1alpha1.MachineStateFailed && machine.Status.LastOperation.ErrorCode == machinecodes.ResourceExhausted.String() {
+			return &cloudprovider.InstanceStatus{
+				State: cloudprovider.InstanceCreating,
+				ErrorInfo: &cloudprovider.InstanceErrorInfo{
+					ErrorClass:   cloudprovider.OutOfResourcesErrorClass,
+					ErrorCode:    machinecodes.ResourceExhausted.String(),
+					ErrorMessage: machine.Status.LastOperation.Description,
+				},
+			}
 		}
+		return &cloudprovider.InstanceStatus{State: cloudprovider.InstanceCreating}
 	}
 	return nil
 }