Use official release of CAPL

Author: Richard Kovacs

devbox.json

@@ -11,8 +11,7 @@
     "init_hook": [
       "export GOROOT=$(go env GOROOT)",
       "export KUBECONFIG=${PWD}/e2e/test/kind-management.conf",
-      "export K8S_VERSION=v1.28.7",
-      "export REGION=eu-sea"
+      "export K8S_VERSION=v1.28.7"
     ],
     "scripts": {}
   }

e2e/Makefile

@@ -12,18 +12,18 @@ endif
 
 .PHONY: test reuse-and-test clean
 
-test-cluster: ctlptl kind clean-cluster
+test-cluster: kind ctlptl kind clean-cluster
 	./test/scripts/create_management_cluster.sh $(K8S_VERSION)
 
 clean-cluster: ctlptl
-	ctlptl delete cluster kind-management --ignore-not-found
+	$(CTLPTL) delete cluster kind-management --ignore-not-found
 	rm -rf $(MANAGEMENT_KUBECONFIG)
 
 reuse-and-test: SUITE_ARGS='--reuse'
 
 test reuse-and-test: clusterctl ginkgo check-token test-cluster
 	go list -m; \
-	MANAGEMENT_KUBECONFIG=$(ROOT_DIR)/e2e/$(MANAGEMENT_KUBECONFIG) ginkgo -r --vv --trace $(TEST_ARGS) -- --image=${IMG} --k8s_version=${K8S_VERSION} $(SUITE_ARGS)
+	MANAGEMENT_KUBECONFIG=$(ROOT_DIR)/e2e/$(MANAGEMENT_KUBECONFIG) $(GINKGO) -r --vv --trace $(TEST_ARGS) -- --image=${IMG} --k8s_version=${K8S_VERSION} $(SUITE_ARGS)
 
 	$(MAKE) clean-cluster
 
@@ -73,6 +73,8 @@ ifdef DEVBOX_PACKAGES_DIR
 endif
 
 export PATH := $(CACHE_BIN):$(PATH)
+$(CACHE_BIN):
+	mkdir -p $(CACHE_BIN)
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 

e2e/test/ccm_suite_test.go

@@ -22,7 +22,7 @@ var (
 	useExisting = false
 	reuse       = false
 	clusterName string
-	region      = "us-sea"
+	region      = "us-east"
 	k8s_version string
 	linodeURL   = "https://api.linode.com"
 )

e2e/test/scripts/clusterctl.yaml

@@ -1,6 +1,6 @@
 CLUSTER_TOPOLOGY: "true"
 EXP_CLUSTER_RESOURCE_SET: "true"
 providers:
-   - name: linode
-     url: ${PWD}/infrastructure-linode/${CAPL_VERSION}/infrastructure-components.yaml
+   - name: akamai-linode
+     url: https://github.com/linode/cluster-api-provider-linode/releases/latest/infrastructure-components.yaml
      type: InfrastructureProvider

e2e/test/scripts/create_cluster.sh

@@ -18,14 +18,11 @@ export ROOT_DIR="$(git rev-parse --show-toplevel)"
 
 if [[ -z "$5" ]]
 then
-  export LINODE_REGION="us-sea"
+  export LINODE_REGION="eu-west"
 else
   export LINODE_REGION="$5"
 fi
 
-METADATA_REGIONS="nl-ams in-maa us-ord id-cgk us-lax es-mad us-mia it-mil jp-osa fr-par br-gru us-sea se-sto us-iad"
-[[ "$METADATA_REGIONS" =~ .*"${LINODE_REGION}".* ]] || (echo "Given region doesn't support Metadata service" ; exit 1)
-
 (cd ${ROOT_DIR}/deploy ; set +x ; ./generate-manifest.sh ${LINODE_TOKEN} ${LINODE_REGION})
 
 kubectl create ns ${CLUSTER_NAME}

e2e/test/scripts/create_management_cluster.sh

@@ -6,9 +6,9 @@ set -o nounset
 set -x
 
 export KUBERNETES_VERSION="$1"
+export GOPROXY=off # clusterctl workaround to fetch addons
 export CAPI_VERSION="v1.6.3"
-export HELM_VERSION="v0.1.1-alpha.1"
-export CAPL_VERSION="0.1.0"
+export HELM_VERSION="v0.2.1"
 export KUBECONFIG="$(realpath "$(dirname "$0")/../kind-management.conf")"
 
 ctlptl create cluster kind \
@@ -21,7 +21,7 @@ prepare_images() {
   echo "${images//[\'\"]}" | xargs -I {} sh -c 'docker pull '{}' ; kind -n management load docker-image '{}
 }
 
-(set +x ; prepare_images "$(cat $(realpath "$(dirname "$0")/infrastructure-linode/${CAPL_VERSION}/infrastructure-components.yaml"))")
+(set +x; prepare_images "$(curl -sfL $(cat $(realpath "$(dirname "$0")/clusterctl.yaml") | grep cluster-api-provider-linode | awk '{print $2}'))")
 (set +x ; prepare_images "$(clusterctl init list-images \
   --core cluster-api:${CAPI_VERSION} \
   --addon helm:${HELM_VERSION} \
@@ -31,5 +31,5 @@ prepare_images() {
   --wait-providers \
   --core cluster-api:${CAPI_VERSION} \
   --addon helm:${HELM_VERSION} \
-  --infrastructure linode:${CAPL_VERSION} \
+  --infrastructure akamai-linode \
   --config clusterctl.yaml)