ci: update clusterctl to use fork in tests

Author: faiq

clusterctl.yaml

@@ -0,0 +1,6 @@
+CLUSTERCTL_DISABLE_VERSIONCHECK: "true"
+
+providers:
+  - name: "aws"
+    url: "https://github.com/nutanix-cloud-native/cluster-api-provider-aws/releases/v2.10.0-ncn.0/infrastructure-components.yaml"
+    type: "InfrastructureProvider"

hack/examples/bases/aws/cluster/kustomization.yaml.tmpl

@@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/${CAPA_VERSION}/cluster-template-simple-clusterclass.yaml
+- https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v2.9.1/cluster-template-simple-clusterclass.yaml
 
 sortOptions:
   order: fifo

hack/examples/bases/aws/clusterclass/kustomization.yaml.tmpl

@@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/${CAPA_VERSION}/cluster-template-simple-clusterclass.yaml
+- https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/v2.9.1/cluster-template-simple-clusterclass.yaml
 
 configurations:
   - kustomizeconfig.yaml

make/clusterctl.mk

@@ -6,6 +6,7 @@ export CAPD_VERSION := $(shell GOWORK=off go list -m -f '{{ .Version }}' sigs.k8
 export CAPA_VERSION := $(shell cd hack/third-party/capa && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-provider-aws/v2)
 export CAPX_VERSION := $(shell cd hack/third-party/capx && GOWORK=off go list -m -f '{{ .Version }}' github.com/nutanix-cloud-native/cluster-api-provider-nutanix)
 export CAAPH_VERSION := $(shell cd hack/third-party/caaph && GOWORK=off go list -m -f '{{ .Version }}' sigs.k8s.io/cluster-api-addon-provider-helm)
+CAPA_PATCHED_IMAGE := ghcr.io/nutanix-cloud-native/cluster-api-aws-controller:$(CAPA_VERSION)-ncn.0
 
 # Leave Nutanix credentials empty here and set it when creating the clusters
 .PHONY: clusterctl.init
@@ -21,9 +22,13 @@ clusterctl.init:
 	      --core cluster-api:$(CAPI_VERSION) \
 	      --bootstrap kubeadm:$(CAPI_VERSION) \
 	      --control-plane kubeadm:$(CAPI_VERSION) \
-	      --infrastructure docker:$(CAPD_VERSION),aws:$(CAPA_VERSION),nutanix:$(CAPX_VERSION) \
+	      --infrastructure docker:$(CAPD_VERSION),aws:$(CAPA_VERSION)-ncn.0,nutanix:$(CAPX_VERSION) \
 	      --addon helm:$(CAAPH_VERSION) \
+	      --config clusterctl.yaml \
 	      --wait-providers
+	kubectl --kubeconfig=$(KIND_KUBECONFIG) set image -n capa-system deployment/capa-controller-manager \
+		manager=$(CAPA_PATCHED_IMAGE)@$(shell crane digest $(CAPA_PATCHED_IMAGE))
+	kubectl --kubeconfig=$(KIND_KUBECONFIG) rollout status -n capa-system deployment/capa-controller-manager
 
 .PHONY: clusterctl.delete
 clusterctl.delete:

test/e2e/config/caren.yaml

@@ -53,7 +53,7 @@ providers:
   type: InfrastructureProvider
   versions:
   - name: "${CAPA_VERSION}"
-    value: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/download/${CAPA_VERSION}/infrastructure-components.yaml"
+    value: "https://github.com/nutanix-cloud-native/cluster-api-provider-aws/releases/download/${CAPA_VERSION}-ncn.0/infrastructure-components.yaml"
     type: "url"
     contract: v1beta1
     files:

test/e2e/data/shared/v1beta1-capa/metadata.yaml

@@ -11,3 +11,6 @@ releaseSeries:
   - major: 2
     minor: 9
     contract: v1beta1
+  - major: 2
+    minor: 10
+    contract: v1beta1