Upgrading cluster-api dependency to support k8s v1.24 (#189)

Author: davidjumani

.github/workflows/go-coverage.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.17.8
+          go-version: 1.19.3
       - name: Run go test with coverage
         run: COVER_PROFILE=coverage.txt make test
       - name: Codecov upload

Makefile

@@ -237,7 +237,7 @@ kind-cluster: cluster-api ## Create a kind cluster with a local Docker repositor
 	./cluster-api/hack/kind-install-for-capd.sh
 
 cluster-api: ## Clone cluster-api repository for tilt use.
-	git clone --branch v1.0.0 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch v1.2.7 --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

api/v1beta1/cloudstackcluster_types.go

@@ -81,7 +81,7 @@ func (z *Zone) MetaName() string {
 	return strings.ToLower(s)
 }
 
-//+k8s:conversion-gen=false
+// +k8s:conversion-gen=false
 // CloudStackClusterSpec defines the desired state of CloudStackCluster.
 type CloudStackClusterSpec struct {
 	Zones []Zone `json:"zones"`
@@ -101,7 +101,7 @@ type CloudStackClusterSpec struct {
 	IdentityRef *CloudStackIdentityReference `json:"identityRef,omitempty"`
 }
 
-//+k8s:conversion-gen=false
+// +k8s:conversion-gen=false
 // The status of the abstract CS k8s (not an actual Cloudstack Cluster) cluster.
 type CloudStackClusterStatus struct {
 
@@ -130,9 +130,9 @@ type CloudStackClusterStatus struct {
 	LBRuleID string `json:"loadBalancerRuleID,omitempty"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+k8s:conversion-gen=false
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +k8s:conversion-gen=false
 // CloudStackCluster is the Schema for the cloudstackclusters API
 type CloudStackCluster struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -144,8 +144,8 @@ type CloudStackCluster struct {
 	Status CloudStackClusterStatus `json:"status,omitempty"`
 }
 
-//+kubebuilder:object:root=true
-//+k8s:conversion-gen=false
+// +kubebuilder:object:root=true
+// +k8s:conversion-gen=false
 // CloudStackClusterList contains a list of CloudStackCluster
 type CloudStackClusterList struct {
 	metav1.TypeMeta `json:",inline"`

api/v1beta1/cloudstackzone_types.go

@@ -44,9 +44,9 @@ type CloudStackZoneStatus struct {
 	Ready bool `json:"ready"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+k8s:conversion-gen=false
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +k8s:conversion-gen=false
 // CloudStackZone is the Schema for the cloudstackzones API
 type CloudStackZone struct {
 	metav1.TypeMeta   `json:",inline"`

api/v1beta1/groupversion_info.go

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta1 contains API Schema definitions for the infrastructure v1beta1 API group
-//+kubebuilder:object:generate=true
-//+groupName=infrastructure.cluster.x-k8s.io
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1beta1
 
 import (

api/v1beta2/cloudstackmachinetemplate_webhook.go

@@ -39,7 +39,7 @@ func (r *CloudStackMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) er
 		Complete()
 }
 
-//+kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackmachinetemplate,mutating=true,failurePolicy=fail,sideEffects=None,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackmachinetemplates,verbs=create;update,versions=v1beta2,name=mcloudstackmachinetemplate.kb.io,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackmachinetemplate,mutating=true,failurePolicy=fail,sideEffects=None,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackmachinetemplates,verbs=create;update,versions=v1beta2,name=mcloudstackmachinetemplate.kb.io,admissionReviewVersions=v1beta1
 var _ webhook.Defaulter = &CloudStackMachineTemplate{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type

api/v1beta2/groupversion_info.go

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta2 contains API Schema definitions for the infrastructure v1beta2 API group
-//+kubebuilder:object:generate=true
-//+groupName=infrastructure.cluster.x-k8s.io
+// +kubebuilder:object:generate=true
+// +groupName=infrastructure.cluster.x-k8s.io
 package v1beta2
 
 import (

config/crd/bases/fakes.infrastructure.cluster.x-k8s.io_cloudstackmachineowners.yaml

@@ -0,0 +1,67 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.8.0
+  creationTimestamp: null
+  name: cloudstackmachineowners.fakes.infrastructure.cluster.x-k8s.io
+spec:
+  group: fakes.infrastructure.cluster.x-k8s.io
+  names:
+    kind: CloudStackMachineOwner
+    listKind: CloudStackMachineOwnerList
+    plural: cloudstackmachineowners
+    singular: cloudstackmachineowner
+  scope: Namespaced
+  versions:
+  - name: fakes
+    schema:
+      openAPIV3Schema:
+        description: CloudStackMachineOwner is the Schema for CloudStack Machine owner
+          (machineset, etcdadmcluster, kubeadmcontrolplane)
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CloudStackMachineOwnerSpec defines the desired state of CloudStackMachineOwner
+            properties:
+              replicas:
+                format: int32
+                type: integer
+            type: object
+          status:
+            description: CloudStackMachineOwnerStatus defines the name of the template
+            properties:
+              ready:
+                type: boolean
+              readyReplicas:
+                format: int32
+                type: integer
+              replicas:
+                format: int32
+                type: integer
+            required:
+            - replicas
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

@@ -226,11 +226,11 @@ spec:
                       description: Apache CloudStack Endpoint secret reference.
                       properties:
                         name:
-                          description: Name is unique within a namespace to reference
+                          description: name is unique within a namespace to reference
                             a secret resource.
                           type: string
                         namespace:
-                          description: Namespace defines the space within which the
+                          description: namespace defines the space within which the
                             secret name must be unique.
                           type: string
                       type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml

@@ -44,11 +44,11 @@ spec:
                 description: Apache CloudStack Endpoint secret reference.
                 properties:
                   name:
-                    description: Name is unique within a namespace to reference a
+                    description: name is unique within a namespace to reference a
                       secret resource.
                     type: string
                   namespace:
-                    description: Namespace defines the space within which the secret
+                    description: namespace defines the space within which the secret
                       name must be unique.
                     type: string
                 type: object