From 1ed1f73e511f4a5cf4d1db5f97422cf1eb088fda Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 31 Mar 2022 22:08:19 +0300 Subject: [PATCH] test: bump CAPI to 1.1.3 This probably fixes the incompatibility with 1.24.0-beta.0. Signed-off-by: Andrey Smirnov --- Makefile | 4 ++-- hack/test/e2e-capi.sh | 2 +- hack/test/e2e.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a83eede9f..c1bb395df 100644 --- a/Makefile +++ b/Makefile @@ -29,9 +29,9 @@ OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]") 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.24.0-beta.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl +KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.24.0-alpha.4/bin/$(OPERATING_SYSTEM)/amd64/kubectl KUBESTR_URL ?= https://github.com/kastenhq/kubestr/releases/download/v0.4.31/kubestr_0.4.31_Linux_amd64.tar.gz -CLUSTERCTL_VERSION ?= 1.0.4 +CLUSTERCTL_VERSION ?= 1.1.3 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64 D2CTL_URL ?= https://github.com/siderolabs/day-two/releases/download/v0.1.0-alpha.1/d2ctl-$(OPERATING_SYSTEM)-amd64 PULUMI_URL ?= https://get.pulumi.com/releases/sdk/pulumi-v3.26.1-$(OPERATING_SYSTEM)-x64.tar.gz diff --git a/hack/test/e2e-capi.sh b/hack/test/e2e-capi.sh index 78cca6568..c48e02190 100755 --- a/hack/test/e2e-capi.sh +++ b/hack/test/e2e-capi.sh @@ -4,7 +4,7 @@ set -eou pipefail source ./hack/test/e2e.sh -export CAPI_VERSION="${CAPI_VERSION:-1.0.4}" +export CAPI_VERSION="${CAPI_VERSION:-1.1.3}" export CAPA_VERSION="${CAPA_VERSION:-1.2.0}" export CAPG_VERSION="${CAPG_VERSION:-1.0.0}" diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh index ee0cc8da7..f9c554e6f 100755 --- a/hack/test/e2e.sh +++ b/hack/test/e2e.sh @@ -25,7 +25,7 @@ mkdir -p "${TMP}" # Talos export TALOSCONFIG="${TMP}/talosconfig" -export TALOS_VERSION=v0.14 +export TALOS_VERSION=v1.1 # Kubernetes