Skip to content

Commit 8b7d5b5

Browse files
authored
Merge pull request #563 from element-hq/bbz/kind-0.29.0
Upgrade kind to 0.29.0
2 parents 27787bd + 4641c80 commit 8b7d5b5

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

.github/workflows/pytest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686

8787
- uses: engineerd/setup-kind@ecfad61750951586a9ef973db567df1d28671bdc # v0.6.2
8888
with:
89-
version: "v0.27.0"
89+
version: "v0.29.0"
9090
name: "ess-helm"
9191
skipClusterCreation: "true"
9292
skipClusterLogsExport: "true"

newsfragments/563.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Run integration tests with `kind` 0.29.0.

tests/integration/fixtures/files/clusters/kind.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 New Vector Ltd
1+
# Copyright 2024-2025 New Vector Ltd
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44

@@ -41,6 +41,9 @@ nodes:
4141
- hostPath: ./audit-policy.yml
4242
containerPath: /etc/kubernetes/policies/audit-policy.yaml
4343
readOnly: true
44+
- hostPath: ./local_mirrors
45+
containerPath: /etc/containerd/certs.d
46+
readOnly: true
4447
extraPortMappings:
4548
- containerPort: 80
4649
hostPort: 80
@@ -50,5 +53,5 @@ nodes:
5053
protocol: TCP
5154
containerdConfigPatches:
5255
- |-
53-
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:5000"]
54-
endpoint = ["http://registry:5000"]
56+
[plugins."io.containerd.grpc.v1.cri".registry]
57+
config_path = "/etc/containerd/certs.d"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Copyright 2025 New Vector Ltd
2+
#
3+
# SPDX-License-Identifier: AGPL-3.0-only
4+
5+
[host."http://registry:5000"]
6+
capabilities = ["pull", "resolve"]

0 commit comments

Comments
 (0)