Minor fixes (#981)

* Update docstring for `MachineDeploymentFrozen`

* Change retryPeriod for machines failing creation due to ResourceExhaustion

Author: takoverflow

pkg/apis/machine/types.go

@@ -653,8 +653,8 @@ const (
 	// or deleted.
 	MachineDeploymentReplicaFailure MachineDeploymentConditionType = "ReplicaFailure"
 
-	// MachineDeploymentFrozen is added in a MachineDeployment when one of its machines fails to be created
-	// or deleted.
+	// MachineDeploymentFrozen is added in a MachineDeployment when one of its
+	// machineSet has either the "freeze" label or the "Frozen" condition on it.
 	MachineDeploymentFrozen MachineDeploymentConditionType = "Frozen"
 )
 

pkg/apis/machine/v1alpha1/machinedeployment_types.go

@@ -249,8 +249,8 @@ const (
 	// or deleted.
 	MachineDeploymentReplicaFailure MachineDeploymentConditionType = "ReplicaFailure"
 
-	// MachineDeploymentFrozen is added in a MachineDeployment when one of its machines fails to be created
-	// or deleted.
+	// MachineDeploymentFrozen is added in a MachineDeployment when one of its
+	// machineSet has either the "freeze" label or the "Frozen" condition on it.
 	MachineDeploymentFrozen MachineDeploymentConditionType = "Frozen"
 )
 

pkg/util/provider/machinecontroller/machine_test.go

@@ -909,7 +909,7 @@ var _ = Describe("machine", func() {
 						},
 					}, nil, nil, nil, true, metav1.Now()),
 					err:   status.Error(codes.ResourceExhausted, "Provider does not have capacity to create VM"),
-					retry: machineutils.MediumRetry,
+					retry: machineutils.LongRetry,
 				},
 			}),
 			Entry("Machine creation fails with Failure due to timeout", &data{

pkg/util/provider/machinecontroller/machine_util.go

@@ -728,6 +728,9 @@ func (c *controller) machineCreateErrorHandler(ctx context.Context, machine *v1a
 	machineErr, ok := status.FromError(err)
 	if ok {
 		switch machineErr.Code() {
+		case codes.ResourceExhausted:
+			retryRequired = machineutils.LongRetry
+			lastKnownState = machine.Status.LastKnownState
 		case codes.Unknown, codes.DeadlineExceeded, codes.Aborted, codes.Unavailable:
 			retryRequired = machineutils.ShortRetry
 			lastKnownState = machine.Status.LastKnownState