Skip to content

Commit cd14c9f

Browse files
authored
cluster: add kind29 support (#388)
Signed-off-by: Nick Santos <[email protected]>
1 parent 3856fd4 commit cd14c9f

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

.circleci/Dockerfile

Lines changed: 1 addition & 1 deletion
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.28.0
38+
ENV KIND_VERSION=v0.29.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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
only_for_branches: main
1717
e2e-remote-docker:
1818
docker:
19-
- image: "docker/tilt-ctlptl-ci@sha256:42b8ac8904f7c629fad670e01f2130b8485d1cdaabd590a9fb06712ce4447d0f"
19+
- image: "docker/tilt-ctlptl-ci@sha256:fc1054caffe699e6b4a1d84a2af80729e11aed61ac1588f66d8c33b8b5da42e4"
2020
steps:
2121
- checkout
2222
- setup_remote_docker
@@ -41,7 +41,7 @@ jobs:
4141
sudo mv ./minikube-linux-amd64 /usr/local/bin/minikube
4242
- run: |
4343
set -ex
44-
export KIND_VERSION=v0.28.0
44+
export KIND_VERSION=v0.29.0
4545
curl -fLo ./kind-linux-amd64 "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
4646
chmod +x ./kind-linux-amd64
4747
sudo mv ./kind-linux-amd64 /usr/local/bin/kind

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
k8s.io/cli-runtime v0.33.1
3131
k8s.io/client-go v0.33.1
3232
k8s.io/klog/v2 v2.130.1
33-
sigs.k8s.io/kind v0.28.0
33+
sigs.k8s.io/kind v0.29.0
3434
)
3535

3636
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,8 @@ k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 h1:jgJW5IePPXLGB8e/1wvd0Ich9QE97
665665
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
666666
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
667667
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
668-
sigs.k8s.io/kind v0.28.0 h1:YLfMxeB0+8nHPs4IgpskdVerMUiYtP8jcbML0OVpUXg=
669-
sigs.k8s.io/kind v0.28.0/go.mod h1:ldWQisw2NYyM6k64o/tkZng/1qQW7OlzcN5a8geJX3o=
668+
sigs.k8s.io/kind v0.29.0 h1:3TpCsyh908IkXXpcSnsMjWdwdWjIl7o9IMZImZCWFnI=
669+
sigs.k8s.io/kind v0.29.0/go.mod h1:ldWQisw2NYyM6k64o/tkZng/1qQW7OlzcN5a8geJX3o=
670670
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
671671
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=
672672
sigs.k8s.io/kustomize/api v0.19.0/go.mod h1:/BbwnivGVcBh1r+8m3tH1VNxJmHSk1PzP5fkP6lbL1o=

hack/Dockerfile

Lines changed: 1 addition & 1 deletion
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.28.0
40+
ENV KIND_VERSION=v0.29.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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,12 @@ func (a *kindAdmin) getKindVersion(ctx context.Context) (string, error) {
367367
// This table must be built up manually from the Kind release notes each
368368
// time a new Kind version is released :\
369369
var kindK8sNodeTable = map[string]map[string]string{
370+
"v0.29.0": {
371+
"1.33": "kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe5892e2b644d5dd3b34f",
372+
"1.32": "kindest/node:v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d",
373+
"1.31": "kindest/node:v1.31.9@sha256:b94a3a6c06198d17f59cca8c6f486236fa05e2fb359cbd75dabbfc348a10b211",
374+
"1.30": "kindest/node:v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648",
375+
},
370376
"v0.28.0": {
371377
"1.33": "kindest/node:v1.33.1@sha256:8d866994839cd096b3590681c55a6fa4a071fdaf33be7b9660e5697d2ed13002",
372378
"1.32": "kindest/node:v1.32.2@sha256:36187f6c542fa9b78d2d499de4c857249c5a0ac8cc2241bef2ccd92729a7a259",

0 commit comments

Comments
 (0)