Add devcluster template reconciler

Author: Karthik-K-N

test/e2e/autoscaler.go

@@ -260,9 +260,7 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
 			By("Scaling the MachineDeployment scale up deployment to zero")
 			framework.ScaleScaleUpDeploymentAndWait(ctx, framework.ScaleScaleUpDeploymentAndWaitInput{
 				ClusterProxy: workloadClusterProxy,
-				// We need to sum up the expected number of MachineDeployment replicas and the current
-				// number of MachinePool replicas because otherwise the pods get scheduled on the MachinePool nodes.
-				Replicas: mpOriginalReplicas + 0,
+				Replicas:     0,
 			}, input.E2EConfig.GetIntervals(specName, "wait-autoscaler")...)
 
 			By("Checking the MachineDeployment finished scaling down to zero")

test/e2e/config/docker.yaml

@@ -401,7 +401,7 @@ variables:
   CAPI_INSECURE_DIAGNOSTICS: "true"
 
 intervals:
-  default/wait-controllers: ["3m", "10s"]
+  default/wait-controllers: ["4m", "10s"]
   default/wait-cluster: ["5m", "10s"]
   default/wait-control-plane: ["10m", "10s"]
   default/wait-worker-nodes: ["5m", "10s"]

test/e2e/data/autoscaler/autoscaler-to-workload-workload.yaml

@@ -198,6 +198,8 @@ spec:
             # Note: The E2E test should only go up to 4 (assuming it starts with a min node group size of 2).
             # Using 6 for additional some buffer and to allow different starting min node group sizes.
             - --max-nodes-total=6
+            # Set the log verbosity
+            - --v=4
           env:
             # Per default autoscaler uses the preferred apiVersion to retrieve MachineDeployments.
             # If that apiVersion is v1beta2 the current autoscaler implementation is not able
@@ -208,6 +210,13 @@ spec:
             - name: kubeconfig-management-cluster
               mountPath: /management-cluster
               readOnly: true
+      # Run the autoscaler on control plane Machines to avoid disruptions when scaling to 0.
+      nodeSelector:
+        node-role.kubernetes.io/control-plane: ""
+      tolerations:
+        - key: node-role.kubernetes.io/control-plane
+          effect: NoSchedule
+          operator: Exists
       serviceAccountName: cluster-autoscaler
       terminationGracePeriodSeconds: 10
       volumes:

test/infrastructure/docker/api/v1alpha3/conversion.go

@@ -165,6 +165,7 @@ func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerMachineTemplateSpec(&restored.Spec, &dst.Spec)
+		dst.Status = restored.Status
 	}
 
 	return nil

test/infrastructure/docker/api/v1alpha4/conversion.go

@@ -196,6 +196,7 @@ func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	if ok {
 		RestoreDockerMachineTemplateSpec(&restored.Spec, &dst.Spec)
+		dst.Status = restored.Status
 	}
 
 	return nil

test/infrastructure/docker/api/v1beta1/conversion.go

@@ -120,7 +120,22 @@ func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1.DockerMachineTemplate)
 
-	return Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(src, dst, nil)
+	if err := Convert_v1beta1_DockerMachineTemplate_To_v1beta2_DockerMachineTemplate(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Manually restore data.
+	restored := &infrav1.DockerMachineTemplate{}
+	ok, err := utilconversion.UnmarshalData(src, restored)
+	if err != nil {
+		return err
+	}
+
+	if ok {
+		dst.Status = restored.Status
+	}
+
+	return nil
 }
 
 func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
@@ -134,7 +149,7 @@ func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 		dst.Spec.Template.Spec.ProviderID = nil
 	}
 
-	return nil
+	return utilconversion.MarshalData(src, dst)
 }
 
 func (src *DevCluster) ConvertTo(dstRaw conversion.Hub) error {
@@ -226,7 +241,22 @@ func (dst *DevMachine) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *DevMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1.DevMachineTemplate)
 
-	return Convert_v1beta1_DevMachineTemplate_To_v1beta2_DevMachineTemplate(src, dst, nil)
+	if err := Convert_v1beta1_DevMachineTemplate_To_v1beta2_DevMachineTemplate(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Manually restore data.
+	restored := &infrav1.DevMachineTemplate{}
+	ok, err := utilconversion.UnmarshalData(src, restored)
+	if err != nil {
+		return err
+	}
+
+	if ok {
+		dst.Status = restored.Status
+	}
+
+	return nil
 }
 
 func (dst *DevMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
@@ -240,7 +270,7 @@ func (dst *DevMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 		dst.Spec.Template.Spec.ProviderID = nil
 	}
 
-	return nil
+	return utilconversion.MarshalData(src, dst)
 }
 
 func Convert_v1beta1_ObjectMeta_To_v1beta2_ObjectMeta(in *clusterv1beta1.ObjectMeta, out *clusterv1.ObjectMeta, s apiconversion.Scope) error {
@@ -624,3 +654,7 @@ func Convert_v1beta1_DockerClusterBackendSpec_To_v1beta2_DockerClusterBackendSpe
 func Convert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in *infrav1.DockerMachineTemplate, out *DockerMachineTemplate, s apiconversion.Scope) error {
 	return autoConvert_v1beta2_DockerMachineTemplate_To_v1beta1_DockerMachineTemplate(in, out, s)
 }
+
+func Convert_v1beta2_DevMachineTemplate_To_v1beta1_DevMachineTemplate(in *infrav1.DevMachineTemplate, out *DevMachineTemplate, s apiconversion.Scope) error {
+	return autoConvert_v1beta2_DevMachineTemplate_To_v1beta1_DevMachineTemplate(in, out, s)
+}

test/infrastructure/docker/api/v1beta1/zz_generated.conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta2
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -27,7 +28,17 @@ type DevMachineTemplateSpec struct {
 	Template DevMachineTemplateResource `json:"template"`
 }
 
+// DevMachineTemplateStatus defines the observed state of a DevMachineTemplate.
+type DevMachineTemplateStatus struct {
+	// capacity defines the resource capacity for this DevMachineTemplate.
+	// This value is used for autoscaling from zero operations as defined in:
+	// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
+	// +optional
+	Capacity corev1.ResourceList `json:"capacity,omitempty"`
+}
+
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:path=devmachinetemplates,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of the DevMachineTemplate"
@@ -37,7 +48,8 @@ type DevMachineTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec DevMachineTemplateSpec `json:"spec,omitempty"`
+	Spec   DevMachineTemplateSpec   `json:"spec,omitempty"`
+	Status DevMachineTemplateStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

test/infrastructure/docker/api/v1beta2/devmachinetemplate_types.go

@@ -30,6 +30,10 @@ type DockerMachineTemplateSpec struct {
 
 // DockerMachineTemplateStatus defines the observed state of a DockerMachineTemplate.
 type DockerMachineTemplateStatus struct {
+	// capacity defines the resource capacity for this DockerMachineTemplate.
+	// This value is used for autoscaling from zero operations as defined in:
+	// https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210310-opt-in-autoscaling-from-zero.md
+	// +optional
 	Capacity corev1.ResourceList `json:"capacity,omitempty"`
 }