Merge pull request #3684 from Skarlso/scale_from_0

Add scaling from 0 support

Author: k8s-ci-robot

api/v1alpha3/awsmachine_conversion.go

@@ -106,6 +106,8 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	restoreSpec(&restored.Spec.Template.Spec, &dst.Spec.Template.Spec)
 
+	dst.Status = restored.Status
+
 	return nil
 }
 
@@ -123,6 +125,10 @@ func (r *AWSMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
+func Convert_v1beta1_AWSMachineTemplate_To_v1alpha3_AWSMachineTemplate(in *infrav1.AWSMachineTemplate, out *AWSMachineTemplate, s apiconversion.Scope) error {
+	return autoConvert_v1beta1_AWSMachineTemplate_To_v1alpha3_AWSMachineTemplate(in, out, s)
+}
+
 // ConvertTo converts the v1alpha3 AWSMachineTemplateList receiver to a v1beta1 AWSMachineTemplateList.
 func (r *AWSMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1.AWSMachineTemplateList)

api/v1alpha3/zz_generated.conversion.go

@@ -83,6 +83,7 @@ func (r *AWSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 
 	dst.Spec.Template.ObjectMeta = restored.Spec.Template.ObjectMeta
 	dst.Spec.Template.Spec.Ignition = restored.Spec.Template.Spec.Ignition
+	dst.Status = restored.Status
 
 	return nil
 }
@@ -103,6 +104,10 @@ func (r *AWSMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
+func Convert_v1beta1_AWSMachineTemplate_To_v1alpha4_AWSMachineTemplate(in *v1beta1.AWSMachineTemplate, out *AWSMachineTemplate, s apiconversion.Scope) error {
+	return autoConvert_v1beta1_AWSMachineTemplate_To_v1alpha4_AWSMachineTemplate(in, out, s)
+}
+
 // ConvertTo converts the v1alpha4 AWSMachineTemplateList receiver to a v1beta1 AWSMachineTemplateList.
 func (src *AWSMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1.AWSMachineTemplateList)

api/v1alpha4/awsmachine_conversion.go

@@ -17,11 +17,21 @@ limitations under the License.
 package v1beta1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+// AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
+type AWSMachineTemplateStatus struct {
+	// Capacity defines the resource capacity for this machine.
+	// 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"`
+}
+
 // AWSMachineTemplateSpec defines the desired state of AWSMachineTemplate.
 type AWSMachineTemplateSpec struct {
 	Template AWSMachineTemplateResource `json:"template"`
@@ -37,7 +47,8 @@ type AWSMachineTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec AWSMachineTemplateSpec `json:"spec,omitempty"`
+	Spec   AWSMachineTemplateSpec   `json:"spec,omitempty"`
+	Status AWSMachineTemplateStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1alpha4/zz_generated.conversion.go

@@ -1115,6 +1115,21 @@ spec:
             required:
             - template
             type: object
+          status:
+            description: AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
+            properties:
+              capacity:
+                additionalProperties:
+                  anyOf:
+                  - type: integer
+                  - type: string
+                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                  x-kubernetes-int-or-string: true
+                description: 'Capacity defines the resource capacity for this machine.
+                  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'
+                type: object
+            type: object
         type: object
     served: true
     storage: true