chore: update e2e tests to use latest capi releases

This PR version bumps cacppt, cabpt, capa, capg, and cluster api itself

Signed-off-by: Spencer Smith <[email protected]>

Makefile

@@ -22,7 +22,7 @@ TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM)
 INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)
 INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
 KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.21.2/bin/$(OPERATING_SYSTEM)/amd64/kubectl
-CLUSTERCTL_VERSION ?= 0.3.15
+CLUSTERCTL_VERSION ?= 0.3.19
 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
 SONOBUOY_VERSION ?= 0.50.0
 SONOBUOY_URL ?= https://github.com/vmware-tanzu/sonobuoy/releases/download/v$(SONOBUOY_VERSION)/sonobuoy_$(SONOBUOY_VERSION)_$(OPERATING_SYSTEM)_amd64.tar.gz

hack/test/e2e-capi.sh

@@ -4,10 +4,10 @@ set -eou pipefail
 
 source ./hack/test/e2e.sh
 
-export CABPT_VERSION="0.2.0-alpha.10"
-export CACPPT_VERSION="0.1.0-alpha.11"
-export CAPA_VERSION="0.6.4"
-export CAPG_VERSION="0.3.0"
+export CABPT_VERSION="0.2.0"
+export CACPPT_VERSION="0.1.0"
+export CAPA_VERSION="0.6.5"
+export CAPG_VERSION="0.3.1"
 
 # We need to override this here since e2e.sh will set it to ${TMP}/capi/kubeconfig.
 export KUBECONFIG="/tmp/e2e/docker/kubeconfig"
@@ -29,10 +29,6 @@ ${CLUSTERCTL} init \
     --infrastructure "aws:v${CAPA_VERSION},gcp:v${CAPG_VERSION}" \
     --bootstrap "talos:v${CABPT_VERSION}"
 
-# Temporarily override CAPA image so secrets backend can be turned off
-${KUBECTL} patch deploy -n capa-system capa-controller-manager --type='json' \
-  -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value": "docker.io/rsmitty/cluster-api-aws-controller-amd64:dev"}]'
-
 # Wait for the talosconfig
 timeout=$(($(date +%s) + ${TIMEOUT}))
 until ${KUBECTL} wait --timeout=1s --for=condition=Ready -n ${CABPT_NS} pods --all; do

hack/test/e2e.sh

@@ -26,7 +26,7 @@ mkdir -p "${TMP}"
 # Talos
 
 export TALOSCONFIG="${TMP}/talosconfig"
-export TALOS_VERSION=v0.9
+export TALOS_VERSION=v0.11
 
 # Kubernetes