Skip to content

Commit a39dddc

Browse files
authored
cluster: update to kind 1.26 (#371)
Signed-off-by: Nick Santos <nick.santos@docker.com>
1 parent e5f6a67 commit a39dddc

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.circleci/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubec
3535
&& install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
3636

3737
# install Kind
38-
ENV KIND_VERSION=v0.25.0
38+
ENV KIND_VERSION=v0.26.0
3939
RUN set -exu \
4040
&& curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64" \
4141
&& chmod +x ./kind-linux-amd64 \

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
e2e-remote-docker:
1919
docker:
20-
- image: docker/tilt-ctlptl-ci@sha256:075ad7149112ef9189022a575dac39dcb8de7e1cc8b548b0e9023fb6f1c0939e
20+
- image: docker/tilt-ctlptl-ci@sha256:74aa83c8c415c0a1c3a35c6a6debf10f463bd1794ed263f8acda8b375dd262db
2121
steps:
2222
- checkout
2323
- setup_remote_docker
@@ -43,7 +43,7 @@ jobs:
4343
sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
4444
- run: |
4545
set -ex
46-
export KIND_VERSION=v0.25.0
46+
export KIND_VERSION=v0.26.0
4747
curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
4848
chmod +x ./kind-linux-amd64
4949
sudo mv ./kind-linux-amd64 /usr/local/bin/kind

hack/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${TARGETARC
3737
&& install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
3838

3939
# Install Kind
40-
ENV KIND_VERSION=v0.25.0
40+
ENV KIND_VERSION=v0.26.0
4141
RUN set -exu \
4242
&& KIND_URL="https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-$TARGETARCH" \
4343
&& curl --silent --show-error --location --fail --retry 3 --output ./kind-linux-$TARGETARCH "$KIND_URL" \

pkg/cluster/admin_kind.go

+6
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,12 @@ func (a *kindAdmin) getKindVersion(ctx context.Context) (string, error) {
334334
// This table must be built up manually from the Kind release notes each
335335
// time a new Kind version is released :\
336336
var kindK8sNodeTable = map[string]map[string]string{
337+
"v0.26.0": {
338+
"1.32": "kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027",
339+
"1.31": "kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30",
340+
"1.30": "kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf",
341+
"1.29": "kindest/node:v1.29.12@sha256:62c0672ba99a4afd7396512848d6fc382906b8f33349ae68fb1dbfe549f70dec",
342+
},
337343
"v0.25.0": {
338344
"1.31": "kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e",
339345
"1.30": "kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994",

test/kind/e2e.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ k8sVersion=$(ctlptl get cluster "$CLUSTER_NAME" -o go-template --template='{{.st
5353

5454
ctlptl delete -f cluster.yaml
5555

56-
if [[ "$k8sVersion" != "v1.31.2" ]]; then
57-
echo "Expected kubernetes version v1.31.2 but got $k8sVersion"
56+
if [[ "$k8sVersion" != "v1.31.4" ]]; then
57+
echo "Expected kubernetes version v1.31.4 but got $k8sVersion"
5858
exit 1
5959
fi
6060

0 commit comments

Comments
 (0)