✨ Add scale from/to 0 support for CAPD

test/e2e/autoscaler_test.go

@@ -36,7 +36,8 @@ var _ = Describe("When using the autoscaler with Cluster API using ClusterClass
 			InfrastructureMachinePoolTemplateKind: "dockermachinepooltemplates",
 			InfrastructureMachinePoolKind:         "dockermachinepools",
 			Flavor:                                ptr.To("topology-autoscaler"),
-			AutoscalerVersion:                     "v1.33.0",
+			AutoscalerVersion:                     "v1.32.1",
+			ScaleToAndFromZero:                    true,
 		}
 	})
 })

test/infrastructure/container/docker.go

@@ -64,6 +64,7 @@ func NewDockerClient() (Runtime, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to created docker runtime client")
 	}
+
 	return &dockerRuntime{
 		dockerClient: dockerClient,
 	}, nil
@@ -544,6 +545,11 @@ func (d *dockerRuntime) RunContainer(ctx context.Context, runConfig *RunContaine
 	return nil
 }
 
+// GetSystemInfo will return the docker system info.
+func (d *dockerRuntime) GetSystemInfo(ctx context.Context) (dockersystem.Info, error) {
+	return d.dockerClient.Info(ctx)
+}
+
 // needsDevMapper checks whether we need to mount /dev/mapper.
 // This is required when the docker storage driver is Btrfs or ZFS.
 // https://github.com/kubernetes-sigs/kind/pull/1464

test/infrastructure/container/fake.go

@@ -19,6 +19,8 @@ package container
 import (
 	"context"
 	"io"
+
+	dockersystem "github.com/docker/docker/api/types/system"
 )
 
 var runContainerCallLog []RunContainerArgs
@@ -170,3 +172,8 @@ func (f *FakeRuntime) RunContainerCalls() []RunContainerArgs {
 func (f *FakeRuntime) ResetRunContainerCallLogs() {
 	runContainerCallLog = []RunContainerArgs{}
 }
+
+// GetSystemInfo returns empty docker system info.
+func (f *FakeRuntime) GetSystemInfo(_ context.Context) (dockersystem.Info, error) {
+	return dockersystem.Info{}, nil
+}

test/infrastructure/container/interface.go

@@ -23,6 +23,7 @@ import (
 	"net"
 
 	dockercontainer "github.com/docker/docker/api/types/container"
+	dockersystem "github.com/docker/docker/api/types/system"
 	"github.com/pkg/errors"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -46,6 +47,7 @@ type Runtime interface {
 	ContainerDebugInfo(ctx context.Context, containerName string, w io.Writer) error
 	DeleteContainer(ctx context.Context, containerName string) error
 	KillContainer(ctx context.Context, containerName, signal string) error
+	GetSystemInfo(ctx context.Context) (dockersystem.Info, error)
 }
 
 // Mount contains mount details.

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

@@ -350,3 +350,7 @@ func Convert_v1alpha3_DockerClusterSpec_To_v1beta2_DockerClusterSpec(in *DockerC
 
 	return nil
 }
+
+func Convert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in *infrav1.DockerMachineTemplate, out *DockerMachineTemplate, s apiconversion.Scope) error {
+	return autoConvert_v1beta2_DockerMachineTemplate_To_v1alpha3_DockerMachineTemplate(in, out, s)
+}

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

@@ -620,3 +620,7 @@ func Convert_v1beta1_DockerClusterBackendSpec_To_v1beta2_DockerClusterBackendSpe
 
 	return nil
 }
+
+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)
+}

test/infrastructure/docker/api/v1beta2/dockermachinetemplate_types.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,13 @@ type DockerMachineTemplateSpec struct {
 	Template DockerMachineTemplateResource `json:"template"`
 }
 
+// DockerMachineTemplateStatus defines the observed state of a DockerMachineTemplate.
+type DockerMachineTemplateStatus struct {
+	Capacity corev1.ResourceList `json:"capacity,omitempty"`
+}
+
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 // +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachineTemplate"
@@ -37,7 +44,8 @@ type DockerMachineTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec DockerMachineTemplateSpec `json:"spec,omitempty"`
+	Spec   DockerMachineTemplateSpec   `json:"spec,omitempty"`
+	Status DockerMachineTemplateStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

test/infrastructure/docker/config/rbac/role.yaml

@@ -112,3 +112,11 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - dockermachinetemplates/status
+  verbs:
+  - get
+  - patch
+  - update

test/infrastructure/docker/controllers/alias.go

@@ -72,6 +72,24 @@ func (r *DockerClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 	}).SetupWithManager(ctx, mgr, options)
 }
 
+// DockerMachineTemplateReconciler reconciles a DockerMachineTemplate object.
+type DockerMachineTemplateReconciler struct {
+	Client           client.Client
+	ContainerRuntime container.Runtime
+
+	// WatchFilterValue is the label value used to filter events prior to reconciliation.
+	WatchFilterValue string
+}
+
+// SetupWithManager sets up the reconciler with the Manager.
+func (r *DockerMachineTemplateReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+	return (&dockercontrollers.DockerMachineTemplateReconciler{
+		Client:           r.Client,
+		ContainerRuntime: r.ContainerRuntime,
+		WatchFilterValue: r.WatchFilterValue,
+	}).SetupWithManager(ctx, mgr, options)
+}
+
 // DevMachineReconciler reconciles a DevMachine object.
 type DevMachineReconciler struct {
 	Client           client.Client