test: restore warmup image in k8s serial tests

Author: jshi991

Sources/ContainerK8s/Commands/K8sCreate.swift

@@ -25,8 +25,10 @@ import Foundation
 import Logging
 import TerminalProgress
 
-struct K8sCreate: AsyncParsableCommand {
-    static let configuration = CommandConfiguration(
+public struct K8sCreate: AsyncParsableCommand {
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "create",
         abstract: "Create and start a local Kubernetes cluster"
     )
@@ -49,7 +51,7 @@ struct K8sCreate: AsyncParsableCommand {
     @Option(help: "Node image reference (default: \(K8sHelper.nodeImage))")
     var nodeImage: String = K8sHelper.nodeImage
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
         let log = Logger(label: K8sHelper.pluginName)
 

Sources/ContainerK8s/Commands/K8sDelete.swift

@@ -21,8 +21,10 @@ import ContainerResource
 import ContainerizationError
 import Logging
 
-struct K8sDelete: AsyncParsableCommand {
-    static let configuration = CommandConfiguration(
+public struct K8sDelete: AsyncParsableCommand {
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "delete",
         abstract: "Delete a Kubernetes cluster",
         aliases: ["rm"]
@@ -31,7 +33,7 @@ struct K8sDelete: AsyncParsableCommand {
     @Option(name: .long, help: "Cluster name (default: \(K8sHelper.defaultName))")
     var name: String = K8sHelper.defaultName
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
         let log = Logger(label: K8sHelper.pluginName)
 

Sources/ContainerK8s/Commands/K8sList.swift

@@ -20,14 +20,16 @@ import ContainerLog
 import ContainerResource
 import Logging
 
-struct K8sList: AsyncParsableCommand {
-    static let configuration = CommandConfiguration(
+public struct K8sList: AsyncParsableCommand {
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "list",
         abstract: "List clusters and their nodes",
         aliases: ["ls"]
     )
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
 
         let snapshots = try await ContainerClient().list(

Sources/ContainerK8s/Commands/K8sLoadImage.swift

@@ -25,10 +25,12 @@ import Foundation
 import Logging
 import SystemPackage
 
-struct K8sLoadImage: AsyncParsableCommand {
+public struct K8sLoadImage: AsyncParsableCommand {
+    public init() {}
+
     private static let ctrPath = "/usr/local/bin/ctr"
 
-    static let configuration = CommandConfiguration(
+    public static let configuration = CommandConfiguration(
         commandName: "load-image",
         abstract: "Load a container image into a cluster's containerd"
     )
@@ -44,7 +46,7 @@ struct K8sLoadImage: AsyncParsableCommand {
     )
     var platform: String?
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
         let log = Logger(label: K8sHelper.pluginName)
 

Sources/ContainerK8s/Commands/K8sStart.swift

@@ -22,16 +22,18 @@ import ContainerizationError
 import Foundation
 import Logging
 
-struct K8sStart: AsyncParsableCommand {
-    static let configuration = CommandConfiguration(
+public struct K8sStart: AsyncParsableCommand {
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "start",
         abstract: "Start a stopped Kubernetes cluster"
     )
 
     @Option(name: .long, help: "Cluster name (default: \(K8sHelper.defaultName))")
     var name: String = K8sHelper.defaultName
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
         let log = Logger(label: K8sHelper.pluginName)
 

Sources/ContainerK8s/Commands/K8sWriteConfig.swift

@@ -21,8 +21,10 @@ import Foundation
 import Logging
 import SystemPackage
 
-struct K8sWriteConfig: AsyncParsableCommand {
-    static let configuration = CommandConfiguration(
+public struct K8sWriteConfig: AsyncParsableCommand {
+    public init() {}
+
+    public static let configuration = CommandConfiguration(
         commandName: "write-config",
         abstract: "Write the cluster context to a Kubernetes configuration file"
     )
@@ -33,7 +35,7 @@ struct K8sWriteConfig: AsyncParsableCommand {
     @Option(name: .long, help: "Path to the kubeconfig file to write or append to (default: ~/.kube/config)")
     var kubeconfig: String?
 
-    func run() async throws {
+    public func run() async throws {
         LoggingSystem.bootstrap { _ in StderrLogHandler() }
         let log = Logger(label: K8sHelper.pluginName)
 

…s/ContainerK8s/Commands/K8sCommand.swift Sources/Plugins/K8s/K8sCommand.swiftSources/ContainerK8s/Commands/K8sCommand.swift renamed to Sources/Plugins/K8s/K8sCommand.swift Sources/ContainerK8s/Commands/K8sCommand.swift renamed to Sources/Plugins/K8s/K8sCommand.swift

@@ -74,6 +74,7 @@ struct TestK8sLoadImageSerial {
             let name = "k8s-\(f.testID)"
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name]) }
 
+            try f.restoreWarmupImage(.kindestNodeV1_35_5)
             print("[k8s-load] k8s create --name \(name)")
             let result = try f.run(["k8s", "create", "--name", name])
             print("[k8s-load] k8s create exit=\(result.status)")
@@ -85,7 +86,7 @@ struct TestK8sLoadImageSerial {
             try result.check()
 
             print("[k8s-load] pulling \(Self.testImage)")
-            try f.doPull(Self.testImage)
+            try f.restoreWarmupImage(.alpine320)
 
             print("[k8s-load] k8s load-image --name \(name) \(Self.testImage)")
             let loadResult = try f.run(["k8s", "load-image", "--name", name, Self.testImage])

Tests/IntegrationTests/K8s/TestK8sLoadImageSerial.swift

@@ -95,6 +95,7 @@ struct TestK8sNetworkingSerial {
             let name = "k8s-\(f.testID)"
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name]) }
 
+            try f.restoreWarmupImage(.kindestNodeV1_35_5)
             print("[k8s-net] k8s create --name \(name)")
             let result = try f.run(["k8s", "create", "--name", name])
             print("[k8s-net] k8s create exit=\(result.status)")
@@ -106,7 +107,7 @@ struct TestK8sNetworkingSerial {
             try result.check()
 
             print("[k8s-net] pulling \(Self.testImage)")
-            try f.doPull(Self.testImage)
+            try f.restoreWarmupImage(.alpine320)
 
             print("[k8s-net] k8s load-image --name \(name) \(Self.testImage)")
             let loadResult = try f.run(["k8s", "load-image", "--name", name, Self.testImage])
@@ -143,6 +144,7 @@ struct TestK8sNetworkingSerial {
             let name = "k8s-\(f.testID)"
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name]) }
 
+            try f.restoreWarmupImage(.kindestNodeV1_35_5)
             print("[k8s-net] k8s create --name \(name)")
             let result = try f.run(["k8s", "create", "--name", name])
             print("[k8s-net] k8s create exit=\(result.status)")
@@ -153,7 +155,7 @@ struct TestK8sNetworkingSerial {
             try result.check()
 
             print("[k8s-net] pulling \(Self.testImage)")
-            try f.doPull(Self.testImage)
+            try f.restoreWarmupImage(.alpine320)
 
             print("[k8s-net] k8s load-image --name \(name) \(Self.testImage)")
             let loadResult = try f.run(["k8s", "load-image", "--name", name, Self.testImage])

Tests/IntegrationTests/K8s/TestK8sNetworkingSerial.swift

@@ -60,6 +60,7 @@ struct TestK8sRunSerial {
             let name = "k8s-\(f.testID)"
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name]) }
 
+            try f.restoreWarmupImage(.kindestNodeV1_35_5)
             print("[k8s-run] k8s create --name \(name)")
             let result = try f.run(["k8s", "create", "--name", name])
             print("[k8s-run] k8s create exit=\(result.status)")
@@ -94,6 +95,7 @@ struct TestK8sRunSerial {
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name1]) }
             f.addCleanup { _ = try? f.run(["k8s", "delete", "--name", name2]) }
 
+            try f.restoreWarmupImage(.kindestNodeV1_35_5)
             print("[k8s-run] k8s create --name \(name1)")
             let result1 = try f.run(["k8s", "create", "--name", name1])
             print("[k8s-run] k8s create exit=\(result1.status)")