Skip to content

Commit 2bdce98

Browse files
authored
Merge pull request #76 from maxcao13/fix-e2e
ci: fix e2e by bumping capk
2 parents 2588ddc + f2e6cb9 commit 2bdce98

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

test/hack/e2e.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
CAPK_VERSION=v0.10.0
5+
CAPK_VERSION=v0.10.1
66
CAPI_VERSION=release-1.10
77
CALICO_VERSION=v3.24.1
88
DEFAULT_KIND_IMAGE=kindest/node:v1.32.8
@@ -17,11 +17,6 @@ fi
1717

1818
CAPK_HACK="$WORKSPACE/cluster-api-provider-kubemark/hack"
1919

20-
# TODO(maxcao13): kubemark v0.10.0 is using golang.org/x/tools@v0.24.0 which is incompatible with go1.25
21-
# https://github.com/golang/go/issues/7446
22-
go mod -C "$CAPK_HACK/tools" edit -replace=golang.org/x/tools=golang.org/x/tools@v0.24.1
23-
go mod -C "$CAPK_HACK/tools" tidy && go mod -C "$CAPK_HACK/tools" download
24-
2520
if [[ ! -d cluster-api ]]; then
2621
git clone https://github.com/kubernetes-sigs/cluster-api.git -b "$CAPI_VERSION" --single-branch
2722
fi

0 commit comments

Comments
 (0)