Merge pull request #5139 from vincepri/default-kcp-rollingupdate-03

🐛 KubeadmControlPlane rolloutstrategy should be defaulted in openapi

Author: k8s-ci-robot

controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go

@@ -85,6 +85,7 @@ type KubeadmControlPlaneSpec struct {
 	// The RolloutStrategy to use to replace control plane machines with
 	// new ones.
 	// +optional
+	// +kubebuilder:default={type: "RollingUpdate", rollingUpdate: {maxSurge: 1}}
 	RolloutStrategy *RolloutStrategy `json:"rolloutStrategy,omitempty"`
 }
 

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml

@@ -1046,6 +1046,10 @@ spec:
                 format: int32
                 type: integer
               rolloutStrategy:
+                default:
+                  rollingUpdate:
+                    maxSurge: 1
+                  type: RollingUpdate
                 description: The RolloutStrategy to use to replace control plane machines
                   with new ones.
                 properties:

controlplane/kubeadm/controllers/upgrade.go

@@ -38,6 +38,10 @@ func (r *KubeadmControlPlaneReconciler) upgradeControlPlane(
 ) (ctrl.Result, error) {
 	logger := controlPlane.Logger()
 
+	if kcp.Spec.RolloutStrategy == nil || kcp.Spec.RolloutStrategy.RollingUpdate == nil {
+		return ctrl.Result{}, errors.New("rolloutStrategy is not set")
+	}
+
 	// TODO: handle reconciliation of etcd members and kubeadm config in case they get out of sync with cluster
 
 	workloadCluster, err := r.managementCluster.GetWorkloadCluster(ctx, util.ObjectKey(cluster))