Skip K8s tests on mac runner

Author: iabudiab

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-14]
+        os: [ubuntu-22.04, macos-latest]
         swift: ["5.9", "5.10", "6.0"]
     steps:
     - name: Checkout
@@ -51,15 +51,16 @@ jobs:
         key: ${{ matrix.os }}-${{ matrix.swift }}-${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
           ${{ matrix.os }}-${{ matrix.swift }}-
-    - name: Install runtime for macOS
-      continue-on-error: true
-      if: matrix.os == 'macos-14'
-      run: |
-        brew install docker-machine docker
-        brew services start docker-machine
-        sudo docker --version
-        sysctl hw.physicalcpu hw.logicalcpu
+    # - name: Install runtime for macOS
+    #   continue-on-error: true
+    #   if: matrix.os == 'macos-latest'
+    #   run: |
+    #     brew install docker-machine docker
+    #     brew services start docker-machine
+    #     sudo docker --version
+    #     sysctl hw.physicalcpu hw.logicalcpu
     - name: Start minikube
+      if: matrix.os == 'ubuntu-22.04'
       uses: medyagh/setup-minikube@latest
       id: minikube
       with:
@@ -71,5 +72,9 @@ jobs:
       run: swift --version
     - name: Build
       run: swift build
-    - name: Test
+    - name: Test Linux
+      if: matrix.os == 'ubuntu-22.04'
       run: swift test
+    - name: Test macOS
+      if: matrix.os == 'macos-latest'
+      run: swift test --skip K3d

Tests/SwiftkubeClientTests/K3dCRDTests.swift renamed to Tests/SwiftkubeClientTests/K8sCRDTests.swift

@@ -18,7 +18,7 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-final class K3dCRDTests: K3dTestCase {
+final class K8sCRDTests: K8sTestCase {
 
 	private let cocktailCRD = apiextensions.v1.CustomResourceDefinition(
 		metadata: meta.v1.ObjectMeta(name: "cocktails.example.swiftkube.dev"),
@@ -99,9 +99,9 @@ final class K3dCRDTests: K3dTestCase {
 	}
 
 	func testCRD() async {
-		let _ = try? await K3dTestCase.client.apiExtensionsV1.customResourceDefinitions.create(cocktailCRD)
+		let _ = try? await K8sTestCase.client.apiExtensionsV1.customResourceDefinitions.create(cocktailCRD)
 
-		let allCRDs = try? await K3dTestCase.client.apiExtensionsV1.customResourceDefinitions.list()
+		let allCRDs = try? await K8sTestCase.client.apiExtensionsV1.customResourceDefinitions.list()
 
 		let cocktail = allCRDs?.first { element in
 			element.spec.names.kind == "Cocktail"
@@ -114,7 +114,7 @@ final class K3dCRDTests: K3dTestCase {
 			resource: "cocktails"
 		)
 
-		let cocktailsClient = K3dTestCase.client.for(Cocktail.self, gvr: gvr)
+		let cocktailsClient = K8sTestCase.client.for(Cocktail.self, gvr: gvr)
 
 		try? _ = await cocktailsClient.create(in: .namespace("crd-test"), Cocktail(
 			metadata: meta.v1.ObjectMeta(name: "gin-tonic"),

Tests/SwiftkubeClientTests/K3dConfigMapTests.swift renamed to Tests/SwiftkubeClientTests/K8sConfigMapTests.swift

@@ -19,7 +19,7 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-final class K3dConfigMapTests: K3dTestCase {
+final class K8sConfigMapTests: K8sTestCase {
 
 	override class func setUp() {
 		super.setUp()
@@ -41,10 +41,10 @@ final class K3dConfigMapTests: K3dTestCase {
 			buildConfigMap("test2", data: ["app": "nginx", "env": "qa"]),
 			buildConfigMap("test3", data: ["app": "swiftkube", "env": "prod"])
 		] {
-			try? _ = await K3dTestCase.client.configMaps.create(inNamespace: .namespace("cm1"), configMap)
+			try? _ = await K8sTestCase.client.configMaps.create(inNamespace: .namespace("cm1"), configMap)
 		}
 
-		let configMaps = try? await K3dTestCase.client.configMaps.list(in: .namespace("cm1"))
+		let configMaps = try? await K8sTestCase.client.configMaps.list(in: .namespace("cm1"))
 			.map {
 				$0.name
 			}
@@ -53,7 +53,7 @@ final class K3dConfigMapTests: K3dTestCase {
 	}
 
 	func testCreate() async {
-		let configMap = try? await K3dTestCase.client.configMaps.create(
+		let configMap = try? await K8sTestCase.client.configMaps.create(
 			inNamespace: .namespace("cm2"),
 			buildConfigMap("test", data: ["app": "nginx", "env": "dev"])
 		)
@@ -64,19 +64,19 @@ final class K3dConfigMapTests: K3dTestCase {
 	}
 
 	func testDelete() async {
-		let configMap = try? await K3dTestCase.client.configMaps.create(
+		let configMap = try? await K8sTestCase.client.configMaps.create(
 			inNamespace: .namespace("cm2"),
 			buildConfigMap("deleteme", data: [:])
 		)
 
 		XCTAssertNotNil(configMap)
 
-		let _ = try? await K3dTestCase.client.configMaps.delete(inNamespace: .namespace("cm2"), name: configMap!.name!)
+		let _ = try? await K8sTestCase.client.configMaps.delete(inNamespace: .namespace("cm2"), name: configMap!.name!)
 
 		let deletedConfigMap = expectation(description: "Deleted ConfigMap")
 
 		do {
-			let _ = try await K3dTestCase.client.configMaps.get(in: .namespace("cm2"), name: "deleteme")
+			let _ = try await K8sTestCase.client.configMaps.get(in: .namespace("cm2"), name: "deleteme")
 		} catch let error {
 			guard case let SwiftkubeClientError.statusError(status) = error, status.code == 404 else {
 				return
@@ -94,7 +94,7 @@ final class K3dConfigMapTests: K3dTestCase {
 		let task = Task {
 			var records: [Record] = []
 			do {
-				let watchTask = try K3dTestCase.client.configMaps.watch(in: .namespace("cm3"))
+				let watchTask = try K8sTestCase.client.configMaps.watch(in: .namespace("cm3"))
 				for try await event in await watchTask.start() {
 					let record = Record(eventType: event.type, resource: event.resource.metadata!.name!)
 					records.append(record)
@@ -110,10 +110,10 @@ final class K3dConfigMapTests: K3dTestCase {
 			}
 		}
 
-		try? _ = await K3dTestCase.client.configMaps.create(inNamespace: .namespace("cm3"), buildConfigMap("test1"))
-		try? _ = await K3dTestCase.client.configMaps.create(inNamespace: .namespace("cm3"), buildConfigMap("test2"))
-		try? _ = await K3dTestCase.client.configMaps.delete(inNamespace: .namespace("cm3"), name: "test1")
-		try? _ = await K3dTestCase.client.configMaps.update(inNamespace: .namespace("cm3"), buildConfigMap("test2", data: ["foo": "bar"]))
+		try? _ = await K8sTestCase.client.configMaps.create(inNamespace: .namespace("cm3"), buildConfigMap("test1"))
+		try? _ = await K8sTestCase.client.configMaps.create(inNamespace: .namespace("cm3"), buildConfigMap("test2"))
+		try? _ = await K8sTestCase.client.configMaps.delete(inNamespace: .namespace("cm3"), name: "test1")
+		try? _ = await K8sTestCase.client.configMaps.update(inNamespace: .namespace("cm3"), buildConfigMap("test2", data: ["foo": "bar"]))
 
 		await fulfillment(of: [expectation], timeout:10)
 

Tests/SwiftkubeClientTests/K3dNamespaceTests.swift renamed to Tests/SwiftkubeClientTests/K8sNamespaceTests.swift

@@ -18,7 +18,7 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-final class K3dNamespaceTests: K3dTestCase {
+final class K8sNamespaceTests: K8sTestCase {
 
 	override class func setUp() {
 		super.setUp()
@@ -35,7 +35,7 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testListByLabels_eq() async {
-		let namespaces = try? await K3dTestCase.client.namespaces.list(options: [
+		let namespaces = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.eq(["app": "nginx"]))
 		])
 		.map { $0.name }
@@ -44,7 +44,7 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testListByLabels_neq() async {
-		let namespaces = try? await K3dTestCase.client.namespaces.list(options: [
+		let namespaces = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.exists(["app"])),
 			.labelSelector(.neq(["app": "nginx"]))
 		])
@@ -54,14 +54,14 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testListByLabels_exists() async {
-		let namespaces = try? await K3dTestCase.client.namespaces.list(options: [
+		let namespaces = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.exists(["app"]))
 		])
 		.map { $0.name }
 
 		assertEqual(namespaces, ["ns1", "ns2", "ns3"])
 
-		let empty = try? await K3dTestCase.client.namespaces.list(options: [
+		let empty = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.exists(["foo"]))
 		])
 		.map { $0.name }
@@ -70,14 +70,14 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testListByLabels_in() async {
-		let all = try? await K3dTestCase.client.namespaces.list(options: [
+		let all = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.in(["app": ["nginx", "swiftkube"]]))
 		])
 		.map { $0.name }
 
 		assertEqual(all, ["ns1", "ns2", "ns3"])
 
-		let sub = try? await K3dTestCase.client.namespaces.list(options: [
+		let sub = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.in(["app": ["nginx"]]))
 		])
 		.map { $0.name }
@@ -86,7 +86,7 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testListByLabels_notIn() async {
-		let namespaces = try? await K3dTestCase.client.namespaces.list(options: [
+		let namespaces = try? await K8sTestCase.client.namespaces.list(options: [
 			.labelSelector(.exists(["app"])),
 			.labelSelector(.notIn(["app": ["swiftkube"]]))
 		])
@@ -96,7 +96,7 @@ final class K3dNamespaceTests: K3dTestCase {
 	}
 
 	func testGetByName() async {
-		let namespace = try? await K3dTestCase.client.namespaces.get(name: "ns2").name
+		let namespace = try? await K8sTestCase.client.namespaces.get(name: "ns2").name
 		XCTAssertEqual(namespace, "ns2")
 	}
 }

Tests/SwiftkubeClientTests/K3dNodeTests.swift renamed to Tests/SwiftkubeClientTests/K8sNodeTests.swift

@@ -18,10 +18,10 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-final class K3dNodeTests: K3dTestCase {
+final class K8sNodeTests: K8sTestCase {
 
 	func testListNodes() async {
-		let nodes = try? await K3dTestCase.client.nodes.list()
+		let nodes = try? await K8sTestCase.client.nodes.list()
 		XCTAssertEqual(nodes?.items.count, 1)
 	}
 }

Tests/SwiftkubeClientTests/K3dServiceTests.swift renamed to Tests/SwiftkubeClientTests/K8sServiceTests.swift

@@ -19,7 +19,7 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-final class K3dServiceTests: K3dTestCase {
+final class K8sServiceTests: K8sTestCase {
 
 	let deployment = buildDeployment()
 
@@ -34,16 +34,16 @@ final class K3dServiceTests: K3dTestCase {
 	}
 
 	func testListCreate() async {
-		try? _ = await K3dTestCase.client.appsV1.deployments.create(in: .namespace("svc1"), deployment)
+		try? _ = await K8sTestCase.client.appsV1.deployments.create(in: .namespace("svc1"), deployment)
 
 		for service in [
 			buildService(name: "svc1", port: 8080, deploy: deployment),
 			buildService(name: "svc2", port: 9090, deploy: deployment),
 		] {
-			try? _ = await K3dTestCase.client.services.create(inNamespace: .namespace("svc1"), service)
+			try? _ = await K8sTestCase.client.services.create(inNamespace: .namespace("svc1"), service)
 		}
 
-		let services = try? await K3dTestCase.client.services.list(in: .namespace("svc1"))
+		let services = try? await K8sTestCase.client.services.list(in: .namespace("svc1"))
 
 		let names = services?.items.map { $0.name }
 		assertEqual(names, ["svc1", "svc2"])
@@ -53,21 +53,21 @@ final class K3dServiceTests: K3dTestCase {
 	}
 
 	func testDelete() async {
-		try? _ = await K3dTestCase.client.appsV1.deployments.create(in: .namespace("svc1"), deployment)
+		try? _ = await K8sTestCase.client.appsV1.deployments.create(in: .namespace("svc1"), deployment)
 
-		let service = try? await K3dTestCase.client.services.create(
+		let service = try? await K8sTestCase.client.services.create(
 			inNamespace: .namespace("svc1"),
 			buildService(name: "deleteme", port: 8080, deploy: deployment)
 		)
 
 		XCTAssertNotNil(service)
 
-		let _ = try! await K3dTestCase.client.services.delete(inNamespace: .namespace("svc1"), name: "deleteme")
+		let _ = try! await K8sTestCase.client.services.delete(inNamespace: .namespace("svc1"), name: "deleteme")
 
 		let deletedService = expectation(description: "Deleted Service")
 
 		do {
-			let _ = try await K3dTestCase.client.configMaps.get(in: .namespace("svc1"), name: "deleteme")
+			let _ = try await K8sTestCase.client.configMaps.get(in: .namespace("svc1"), name: "deleteme")
 		} catch let error {
 			guard case let SwiftkubeClientError.statusError(status) = error, status.code == 404 else {
 				return

Tests/SwiftkubeClientTests/K3dTestCase.swift renamed to Tests/SwiftkubeClientTests/K8sTestCase.swift

@@ -20,7 +20,7 @@ import SwiftkubeClient
 import SwiftkubeModel
 import XCTest
 
-open class K3dTestCase: XCTestCase {
+open class K8sTestCase: XCTestCase {
 
 	#if compiler(>=6.0)
 	nonisolated(unsafe) static var logger: Logger!