Merge pull request #2913 from benmoss/machineset-replicas-default

🏃 Remove MachineSet controller Update fallback

api/v1alpha3/machineset_types.go

@@ -115,7 +115,8 @@ type MachineSetStatus struct {
 	Selector string `json:"selector,omitempty"`
 
 	// Replicas is the most recently observed number of replicas.
-	Replicas int32 `json:"replicas"`
+	// +optional
+	Replicas int32 `json:"replicas,omitempty"`
 
 	// The number of replicas that have labels matching the labels of the machine template of the MachineSet.
 	// +optional

config/crd/bases/cluster.x-k8s.io_machinesets.yaml

@@ -910,8 +910,6 @@ spec:
                   be in the same format as the query-param syntax. More info about
                   label selectors: http://kubernetes.io/docs/user-guide/labels#label-selectors'
                 type: string
-            required:
-            - replicas
             type: object
         type: object
     served: true

controllers/machineset_controller.go

@@ -671,17 +671,7 @@ func (r *MachineSetReconciler) patchMachineSetStatus(ctx context.Context, ms *cl
 
 	newStatus.DeepCopyInto(&ms.Status)
 	if err := r.Client.Status().Patch(ctx, ms, patch); err != nil {
-		// TODO(vincepri): Try to fix this once we upgrade to CRDv1.
-		// Our Status.Replicas field is a required non-pointer integer, Go defaults this field to "0" value when decoding
-		// the data from the API server. For this reason, when we try to write the value "0", the patch is going to think
-		// the value is already there and shouldn't be patched, making it fail validation.
-		// Fallback to Update.
-		if !apierrors.IsInvalid(err) {
-			return nil, err
-		}
-		if err := r.Client.Status().Update(ctx, ms); err != nil {
-			return nil, err
-		}
+		return nil, err
 	}
 	return ms, nil
 }