Skip to content

Commit 1fe7c30

Browse files
authored
chore: bump kind and pin its image (#2905)
1 parent 0b99318 commit 1fe7c30

File tree

6 files changed

+17
-1
lines changed

6 files changed

+17
-1
lines changed

scripts/local-cluster.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ ROOT="$(dirname "${HERE}")"
1010
export HERE
1111
export ROOT
1212

13+
# Check the kind releases page for available images, and always specify an image with its full SHA256 digest:
14+
# https://github.com/kubernetes-sigs/kind/releases
15+
export KIND_NODE_IMAGE="kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2"
16+
1317
log.info.no_newline() {
1418
echo -en "[\e[34mck8s\e[0m] ${*}" 1>&2
1519
}

scripts/local-clusters/profiles/multi-node-cache.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ networking:
1212
serviceSubnet: 10.96.0.0/12
1313
nodes:
1414
- role: control-plane
15+
image: "${KIND_NODE_IMAGE}"
1516
kubeadmConfigPatches:
1617
- |
1718
kind: ClusterConfiguration
@@ -42,6 +43,7 @@ nodes:
4243
labels:
4344
elastisys.io/node-group: control-plane
4445
- role: worker
46+
image: "${KIND_NODE_IMAGE}"
4547
extraMounts:
4648
- containerPath: /etc/containerd/certs.d
4749
hostPath: ${ROOT}/scripts/local-clusters/registries
@@ -58,13 +60,15 @@ nodes:
5860
labels:
5961
elastisys.io/node-group: worker
6062
- role: worker
63+
image: "${KIND_NODE_IMAGE}"
6164
extraMounts:
6265
- containerPath: /etc/containerd/certs.d
6366
hostPath: ${ROOT}/scripts/local-clusters/registries
6467
readOnly: true
6568
labels:
6669
elastisys.io/node-group: worker
6770
- role: worker
71+
image: "${KIND_NODE_IMAGE}"
6872
extraMounts:
6973
- containerPath: /etc/containerd/certs.d
7074
hostPath: ${ROOT}/scripts/local-clusters/registries

scripts/local-clusters/profiles/multi-node.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ networking:
88
serviceSubnet: 10.96.0.0/12
99
nodes:
1010
- role: control-plane
11+
image: "${KIND_NODE_IMAGE}"
1112
labels:
1213
elastisys.io/node-group: control-plane
1314
kubeadmConfigPatches:
@@ -35,6 +36,7 @@ nodes:
3536
containerPath: /etc/kubernetes/audit-policy/apiserver-audit-policy.yaml
3637
readOnly: true
3738
- role: worker
39+
image: "${KIND_NODE_IMAGE}"
3840
extraPortMappings:
3941
- containerPort: 30080
4042
hostPort: 80
@@ -47,8 +49,10 @@ nodes:
4749
labels:
4850
elastisys.io/node-group: worker
4951
- role: worker
52+
image: "${KIND_NODE_IMAGE}"
5053
labels:
5154
elastisys.io/node-group: worker
5255
- role: worker
56+
image: "${KIND_NODE_IMAGE}"
5357
labels:
5458
elastisys.io/node-group: worker

scripts/local-clusters/profiles/single-node-cache.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ networking:
1212
serviceSubnet: 10.96.0.0/12
1313
nodes:
1414
- role: control-plane
15+
image: "${KIND_NODE_IMAGE}"
1516
kubeadmConfigPatches:
1617
- |
1718
kind: ClusterConfiguration
@@ -42,6 +43,7 @@ nodes:
4243
labels:
4344
elastisys.io/node-group: control-plane
4445
- role: worker
46+
image: "${KIND_NODE_IMAGE}"
4547
extraMounts:
4648
- containerPath: /etc/containerd/certs.d
4749
hostPath: ${ROOT}/scripts/local-clusters/registries

scripts/local-clusters/profiles/single-node.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ networking:
88
serviceSubnet: 10.96.0.0/12
99
nodes:
1010
- role: control-plane
11+
image: "${KIND_NODE_IMAGE}"
1112
labels:
1213
elastisys.io/node-group: control-plane
1314
kubeadmConfigPatches:
@@ -35,6 +36,7 @@ nodes:
3536
containerPath: /etc/kubernetes/audit-policy/apiserver-audit-policy.yaml
3637
readOnly: true
3738
- role: worker
39+
image: "${KIND_NODE_IMAGE}"
3840
extraPortMappings:
3941
- containerPort: 30080
4042
hostPort: 80

tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ RUN apt-get update && \
138138
rm -rf /var/lib/apt/lists/* && \
139139
ln -s /usr/bin/podman-remote /usr/bin/podman
140140

141-
ARG KIND_VERSION="0.27.0"
141+
ARG KIND_VERSION="0.30.0"
142142
RUN curl -LOs "https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-linux-amd64" && \
143143
install -Tm 755 kind-linux-amd64 /usr/local/bin/kind && \
144144
rm kind-linux-amd64

0 commit comments

Comments
 (0)