diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index 31c36e5..ce5479c 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -36,7 +36,7 @@ RUN apt install -y apt-transport-https gnupg \ && apt update && apt install -y kubectl # install Kind -ENV KIND_VERSION=v0.19.0 +ENV KIND_VERSION=v0.20.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 cbebfa1..cb722fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ jobs: e2e-remote-docker: docker: - - image: docker/tilt-ctlptl-ci@sha256:683561b35efdeeb25dac399e28eb5e7c52b7e593b8865a9c9e7e26dd11e4253d + - image: docker/tilt-ctlptl-ci@sha256:313bb6e393e0dbf777293026003b714158c930eb86e4b7cc369ed23078e7f729 steps: - checkout - setup_remote_docker @@ -53,7 +53,7 @@ jobs: sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube - run: | set -ex - export KIND_VERSION=v0.19.0 + export KIND_VERSION=v0.20.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 c01f763..d474a99 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -37,7 +37,7 @@ RUN apt install -y apt-transport-https gnupg \ && apt update && apt install -y kubectl # Install Kind -ENV KIND_VERSION=v0.19.0 +ENV KIND_VERSION=v0.20.0 ARG TARGETARCH RUN set -exu \ && KIND_URL="https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-$TARGETARCH" \ diff --git a/pkg/cluster/admin_kind.go b/pkg/cluster/admin_kind.go index e4b47f2..6dc0ede 100644 --- a/pkg/cluster/admin_kind.go +++ b/pkg/cluster/admin_kind.go @@ -263,6 +263,15 @@ 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.20.0": { + "1.27": "kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72", + "1.26": "kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb", + "1.25": "kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8", + "1.24": "kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab", + "1.23": "kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb", + "1.22": "kindest/node:v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2", + "1.21": "kindest/node:v1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093", + }, "v0.19.0": { "1.27": "kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b", "1.26": "kindest/node:v1.26.4@sha256:f4c0d87be03d6bea69f5e5dc0adb678bb498a190ee5c38422bf751541cebe92e", diff --git a/test/kind-cluster-network/cluster.yaml b/test/kind-cluster-network/cluster.yaml index 5933a4c..228e0a3 100644 --- a/test/kind-cluster-network/cluster.yaml +++ b/test/kind-cluster-network/cluster.yaml @@ -3,4 +3,4 @@ kind: Cluster name: kind-ctlptl-test-cluster product: kind registry: ctlptl-test-registry -kubernetesVersion: v1.22.0 +kubernetesVersion: v1.26.0 diff --git a/test/kind-cluster-network/e2e.sh b/test/kind-cluster-network/e2e.sh index 1966b52..e938be5 100755 --- a/test/kind-cluster-network/e2e.sh +++ b/test/kind-cluster-network/e2e.sh @@ -34,8 +34,8 @@ k8sVersion=$(ctlptl get cluster "$CLUSTER_NAME" -o go-template --template='{{.st ctlptl delete -f cluster.yaml -if [[ "$k8sVersion" != "v1.22.17" ]]; then - echo "Expected kubernetes version v1.22.17 but got $k8sVersion" +if [[ "$k8sVersion" != "v1.26.6" ]]; then + echo "Expected kubernetes version v1.26.6 but got $k8sVersion" exit 1 fi