Upgrade CAPI to 1.9

Author: vishesh92

Makefile

@@ -129,8 +129,8 @@ lint: $(GOLANGCI_LINT) $(STATIC_CHECK) generate-mocks ## Run linting for the pro
 
 .PHONY: modules
 modules: ## Runs go mod to ensure proper vendoring.
-	go mod tidy -compat=1.21
-	cd $(TOOLS_DIR); go mod tidy -compat=1.21
+	go mod tidy -compat=1.22
+	cd $(TOOLS_DIR); go mod tidy -compat=1.22
 
 .PHONY: generate-all
 generate-all: generate-mocks generate-deepcopy generate-manifests
@@ -161,13 +161,13 @@ config/.flag.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS)
 .PHONY: generate-conversion
 generate-conversion: $(CONVERSION_GEN) ## Generate code to convert api/v1beta1 and api/v1beta2 to api/v1beta3
 	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1beta1 \
 		--go-header-file=./hack/boilerplate.go.txt \
-		--output-base=. --output-file-base=zz_generated.conversion
+		--output-file=zz_generated.conversion.go \
+		./api/v1beta1
 	$(CONVERSION_GEN) \
-		--input-dirs=./api/v1beta2 \
 		--go-header-file=./hack/boilerplate.go.txt \
-		--output-base=. --output-file-base=zz_generated.conversion
+		--output-file=zz_generated.conversion.go \
+		./api/v1beta2
 
 ##@ Build
 ## --------------------------------------
@@ -244,7 +244,7 @@ delete-kind-cluster:
 	kind delete cluster --name $(KIND_CLUSTER_NAME)
 
 cluster-api: ## Clone cluster-api repository for tilt use.
-	git clone --branch  v1.8.11 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch  v1.9.6 --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/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.1
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: cloudstackaffinitygroups.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io
@@ -21,14 +21,19 @@ spec:
           API
         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'
+            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'
+            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
@@ -43,9 +48,9 @@ spec:
                 description: Name.
                 type: string
               type:
-                description: Mutually exclusive parameter with AffinityGroupIDs. Can
-                  be "host affinity" or "host anti-affinity". Will create an affinity
-                  group per machine set.
+                description: |-
+                  Mutually exclusive parameter with AffinityGroupIDs.
+                  Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
                 type: string
             type: object
           status:
@@ -70,14 +75,19 @@ spec:
           API
         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'
+            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'
+            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
@@ -96,9 +106,9 @@ spec:
                 description: Name.
                 type: string
               type:
-                description: Mutually exclusive parameter with AffinityGroupIDs. Can
-                  be "host affinity" or "host anti-affinity". Will create an affinity
-                  group per machine set.
+                description: |-
+                  Mutually exclusive parameter with AffinityGroupIDs.
+                  Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
                 type: string
             type: object
           status:
@@ -123,14 +133,19 @@ spec:
           API
         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'
+            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'
+            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
@@ -149,9 +164,9 @@ spec:
                 description: Name.
                 type: string
               type:
-                description: Mutually exclusive parameter with AffinityGroupIDs. Can
-                  be "host affinity" or "host anti-affinity". Will create an affinity
-                  group per machine set.
+                description: |-
+                  Mutually exclusive parameter with AffinityGroupIDs.
+                  Can be "host affinity" or "host anti-affinity". Will create an affinity group per machine set.
                 type: string
             type: object
           status: