diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index e5382be..4df2438 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -35,7 +35,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubec && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl # install Kind -ENV KIND_VERSION=v0.24.0 +ENV KIND_VERSION=v0.25.0 RUN set -exu \ && curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \ && chmod +x ./kind-linux-amd64 \ diff --git a/.circleci/config.yml b/.circleci/config.yml index 87560fe..5671a15 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: e2e-remote-docker: docker: - - image: docker/tilt-ctlptl-ci@sha256:76da5ebbf0feeb4ecea2fec80e43145d6697d126d533e3a7e109ca79e6ca1119 + - image: docker/tilt-ctlptl-ci@sha256:075ad7149112ef9189022a575dac39dcb8de7e1cc8b548b0e9023fb6f1c0939e steps: - checkout - setup_remote_docker @@ -43,7 +43,7 @@ jobs: sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube - run: | set -ex - export KIND_VERSION=v0.24.0 + export KIND_VERSION=v0.25.0 curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" chmod +x ./kind-linux-amd64 sudo mv ./kind-linux-amd64 /usr/local/bin/kind diff --git a/hack/Dockerfile b/hack/Dockerfile index 183bf4d..4356b98 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -37,7 +37,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARC && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl # Install Kind -ENV KIND_VERSION=v0.24.0 +ENV KIND_VERSION=v0.25.0 RUN set -exu \ && KIND_URL="https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-$TARGETARCH" \ && curl --silent --show-error --location --fail --retry 3 --output ./kind-linux-$TARGETARCH "$KIND_URL" \ diff --git a/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go index a7b1cdb..951fc20 100644 --- a/pkg/cluster/admin_kind.go +++ b/pkg/cluster/admin_kind.go @@ -333,6 +333,14 @@ func (a *kindAdmin) getKindVersion(ctx context.Context) (string, error) { // This table must be built up manually from the Kind release notes each // time a new Kind version is released :\ var kindK8sNodeTable = map[string]map[string]string{ + "v0.25.0": { + "1.31": "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e", + "1.30": "kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994", + "1.29": "kindest/node:v1.29.10@sha256:3b2d8c31753e6c8069d4fc4517264cd20e86fd36220671fb7d0a5855103aa84b", + "1.28": "kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251", + "1.27": "kindest/node:v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20", + "1.26": "kindest/node:v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd", + }, "v0.24.0": { "1.31": "kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865", "1.30": "kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114", diff --git a/test/kind/e2e.sh b/test/kind/e2e.sh index 93af105..42036f6 100755 --- a/test/kind/e2e.sh +++ b/test/kind/e2e.sh @@ -53,8 +53,8 @@ k8sVersion=$(ctlptl get cluster "$CLUSTER_NAME" -o go-template --template='{{.st ctlptl delete -f cluster.yaml -if [[ "$k8sVersion" != "v1.31.0" ]]; then - echo "Expected kubernetes version v1.31.0 but got $k8sVersion" +if [[ "$k8sVersion" != "v1.31.2" ]]; then + echo "Expected kubernetes version v1.31.2 but got $k8sVersion" exit 1 fi