Skip to content

Commit efa5576

Browse files
committed
Update tests and k3d config
1 parent 30e62e1 commit efa5576

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

Tests/SwiftkubeClientTests/K3dCRDTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ final class K3dCRDTests: K3dTestCase {
5050
"ingredients": [
5151
"type": "array",
5252
"items": ["type": "string"]
53-
]
54-
]
55-
]
56-
]
53+
] as [String: Sendable]
54+
] as [String: Sendable]
55+
] as [String: Sendable]
56+
] as [String: Sendable]
5757
])
5858
),
5959
served: true,

Tests/SwiftkubeClientTests/K3dConfigMapTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ final class K3dConfigMapTests: K3dTestCase {
8585
deletedConfigMap.fulfill()
8686
}
8787

88-
wait(for: [deletedConfigMap], timeout: 30)
88+
await fulfillment(of: [deletedConfigMap], timeout: 30)
8989
}
9090

9191
func testWatch() async {
@@ -95,7 +95,7 @@ final class K3dConfigMapTests: K3dTestCase {
9595
var records: [Record] = []
9696
do {
9797
let watchTask = try K3dTestCase.client.configMaps.watch(in: .namespace("cm3"))
98-
for try await event in watchTask.start() {
98+
for try await event in await watchTask.start() {
9999
let record = Record(eventType: event.type, resource: event.resource.metadata!.name!)
100100
records.append(record)
101101

@@ -115,10 +115,10 @@ final class K3dConfigMapTests: K3dTestCase {
115115
try? _ = await K3dTestCase.client.configMaps.delete(inNamespace: .namespace("cm3"), name: "test1")
116116
try? _ = await K3dTestCase.client.configMaps.update(inNamespace: .namespace("cm3"), buildConfigMap("test2", data: ["foo": "bar"]))
117117

118-
wait(for: [expectation], timeout: 10)
118+
await fulfillment(of: [expectation], timeout:10)
119119

120120
task.cancel()
121-
let result = try? await task.result.get()
121+
let result = await task.result.get()
122122

123123
assertEqual(result, [
124124
Record(eventType: .added, resource: "kube-root-ca.crt"),

Tests/SwiftkubeClientTests/K3dServiceTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ final class K3dServiceTests: K3dTestCase {
7676
deletedService.fulfill()
7777
}
7878

79-
wait(for: [deletedService], timeout: 10)
79+
await fulfillment(of: [deletedService], timeout: 10)
8080
}
8181

8282
private func buildService(name: String, port: Int32, deploy: apps.v1.Deployment) -> core.v1.Service {

Tests/SwiftkubeClientTests/K3dTestCase.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import XCTest
2222

2323
open class K3dTestCase: XCTestCase {
2424

25-
static var logger: Logger!
26-
static var client: KubernetesClient!
25+
nonisolated(unsafe) static var logger: Logger!
26+
nonisolated(unsafe) static var client: KubernetesClient!
2727
static let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
2828

2929
open override class func setUp() {

k3d/swiftkube.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
apiVersion: k3d.io/v1alpha3
1+
apiVersion: k3d.io/v1alpha5
22
kind: Simple
3-
name: swiftkube
4-
image: docker.io/rancher/k3s:v1.29.6-k3s1
3+
metadata:
4+
name: swiftkube
55
servers: 1
66
agents: 2
7+
image: docker.io/rancher/k3s:v1.32.0-k3s1
78
options:
89
k3d:
910
wait: true
1011
timeout: "120s"
1112
disableLoadbalancer: true
13+
disableImageVolume: true
1214
k3s:
1315
extraArgs:
1416
- arg: --disable=traefik,servicelb,metrics-server

0 commit comments

Comments
 (0)