Merge pull request #69 from leaseweb/develop

develop -> main: autoscaling and CAPI v1.9.10

Author: hrak

Makefile

@@ -288,7 +288,7 @@ delete-kind-cluster:
 	kind delete cluster --name $(KIND_CLUSTER_NAME)
 
 cluster-api: ## Clone cluster-api repository for tilt use.
-	git clone --branch v1.9.7 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch v1.9.10 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
 
 cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
 	cp ./hack/tilt-settings.json cluster-api

PROJECT

@@ -1,6 +1,6 @@
 domain: cluster.x-k8s.io
 layout:
-- go.kubebuilder.io/v3
+- go.kubebuilder.io/v4
 projectName: cluster-api-provider-capc
 repo: sigs.k8s.io/cluster-api-provider-cloudstack
 resources:
@@ -78,7 +78,7 @@ resources:
 - api:
     crdVersion: v1
     namespaced: true
-  controller: true
+  controller: false
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineStateChecker
@@ -141,7 +141,7 @@ resources:
 - api:
     crdVersion: v1
     namespaced: true
-  controller: true
+  controller: false
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineStateChecker
@@ -213,7 +213,7 @@ resources:
 - api:
     crdVersion: v1
     namespaced: true
-  controller: true
+  controller: false
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineStateChecker

api/v1beta1/conversion.go

@@ -73,6 +73,12 @@ func Convert_v1beta3_Network_To_v1beta1_Network(in *infrav1.Network, out *Networ
 	return autoConvert_v1beta3_Network_To_v1beta1_Network(in, out, s)
 }
 
+func Convert_v1beta3_CloudStackMachineTemplate_To_v1beta1_CloudStackMachineTemplate(in *infrav1.CloudStackMachineTemplate, out *CloudStackMachineTemplate, s machineryconversion.Scope) error {
+	out.ObjectMeta = in.ObjectMeta
+
+	return Convert_v1beta3_CloudStackMachineTemplateSpec_To_v1beta1_CloudStackMachineTemplateSpec(&in.Spec, &out.Spec, s)
+}
+
 // getZones maps failure domains to zones.
 func getZones(csCluster *infrav1.CloudStackCluster) []Zone {
 	zones := make([]Zone, 0, len(csCluster.Status.FailureDomains))

api/v1beta1/zz_generated.conversion.go

@@ -29,3 +29,9 @@ func Convert_v1beta3_Network_To_v1beta2_Network(in *infrav1.Network, out *Networ
 func Convert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta2_CloudStackIsolatedNetworkSpec(in *infrav1.CloudStackIsolatedNetworkSpec, out *CloudStackIsolatedNetworkSpec, s machineryconversion.Scope) error {
 	return autoConvert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta2_CloudStackIsolatedNetworkSpec(in, out, s)
 }
+
+func Convert_v1beta3_CloudStackMachineTemplate_To_v1beta2_CloudStackMachineTemplate(in *infrav1.CloudStackMachineTemplate, out *CloudStackMachineTemplate, s machineryconversion.Scope) error {
+	out.ObjectMeta = in.ObjectMeta
+
+	return Convert_v1beta3_CloudStackMachineTemplateSpec_To_v1beta2_CloudStackMachineTemplateSpec(&in.Spec, &out.Spec, s)
+}

api/v1beta2/conversion.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta3
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
@@ -37,6 +38,16 @@ type CloudStackMachineTemplateSpec struct {
 	Template CloudStackMachineTemplateResource `json:"template"`
 }
 
+// CloudStackMachineTemplateStatus defines the observed state of CloudStackMachineTemplate.
+type CloudStackMachineTemplateStatus 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"`
+}
+
+//+kubebuilder:subresource:status
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:path=cloudstackmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=csmt
 //+kubebuilder:storageversion
@@ -47,7 +58,8 @@ type CloudStackMachineTemplate struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec CloudStackMachineTemplateSpec `json:"spec,omitempty"`
+	Spec   CloudStackMachineTemplateSpec   `json:"spec,omitempty"`
+	Status CloudStackMachineTemplateStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

api/v1beta2/zz_generated.conversion.go

@@ -646,7 +646,25 @@ spec:
             required:
             - template
             type: object
+          status:
+            description: CloudStackMachineTemplateStatus defines the observed state
+              of CloudStackMachineTemplate.
+            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
-    subresources: {}
+    subresources:
+      status: {}

api/v1beta3/cloudstackmachinetemplate_types.go

@@ -55,6 +55,7 @@ rules:
   - cloudstackfailuredomains
   - cloudstackisolatednetworks
   - cloudstackmachines
+  - cloudstackmachinetemplates
   verbs:
   - create
   - delete
@@ -79,6 +80,7 @@ rules:
   - cloudstackaffinitygroups/status
   - cloudstackisolatednetworks/status
   - cloudstackmachines/status
+  - cloudstackmachinetemplates/status
   verbs:
   - get
   - patch