Wait for node to be ready

kokuwaio · Jul 31, 2023 · dddeaba · dddeaba
1 parent 9ce2570
commit dddeaba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,8 @@
 # k3s Maven Plugin
 
-[![License](https://img.shields.io/github/license/kokuwaio/k3s-maven-plugin.svg?label=License)](https://github.com/kokuwaio/k3s-maven-plugin/blob/main/LICENSE)
-[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.maven/k3s-maven-plugin.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.maven)
-[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/k3s-maven-plugin/build.yaml?branch=main&label=1.x)](https://github.com/kokuwaio/k3s-maven-plugin/actions/workflows/build.yaml?query=branch%3Amain)
-[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/k3s-maven-plugin/build.yaml?branch=0.x&label=0.x)](https://github.com/kokuwaio/k3s-maven-plugin/actions/workflows/build.yaml?query=branch%3A0.x)
+[![Apache License 2.0](https://img.shields.io/github/license/kokuwaio/helm-maven-plugin)](https://spdx.org/licenses/MIT.html)
+[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.maven/k3s-maven-plugin)](https://central.sonatype.com/namespace/io.kokuwa.maven)
+[![Build](https://img.shields.io/github/actions/workflow/status/kokuwaio/k3s-maven-plugin/build.yaml?branch=main)](https://github.com/kokuwaio/k3s-maven-plugin/actions/workflows/build.yaml?query=branch%3Amain)
 
 This is a plugin to manage k3s for integration tests.
 

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/ApplyMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/ApplyMojo.java
@@ -84,6 +84,10 @@ public void execute() throws MojoExecutionException {
 				.exec("kubectl", "get", "sa", "default", "--ignore-not-found", "--output=name")
 				.isEmpty());
 
+		// wait for node getting ready
+
+		getDocker().exec("kubectl", "wait", "--for=condition=Ready", "node", "k3s");
+
 		// execute command
 
 		var result = apply();

diff --git a/src/main/java/io/kokuwa/maven/k3s/mojo/RunMojo.java b/src/main/java/io/kokuwa/maven/k3s/mojo/RunMojo.java
@@ -190,14 +190,14 @@ public void execute() throws MojoExecutionException {
 
 			// get image name
 
-			if (imageTag.equals("latest")) {
+			if ("latest".equals(imageTag)) {
 				getLog().warn("Using image tag 'latest' is unstable.");
 			}
 			var image = (imageRegistry == null ? "" : imageRegistry + "/") + imageRepository + ":" + imageTag;
 
 			// k3s command
 
-			var command = new ArrayList<>(List.of("server", "--https-listen-port=" + portKubeApi));
+			var command = new ArrayList<>(List.of("server", "--node-name=k3s", "--https-listen-port=" + portKubeApi));
 			if (disableCloudController) {
 				command.add("--disable-cloud-controller");
 			}

diff --git a/src/main/java/io/kokuwa/maven/k3s/util/Task.java b/src/main/java/io/kokuwa/maven/k3s/util/Task.java
@@ -104,7 +104,9 @@ public Task verify() throws MojoExecutionException {
 		if (exitCode != 0) {
 			log.error(">>> " + this);
 			output.forEach(line -> log.error("<<< " + line));
-			throw new MojoExecutionException("Command failed wit exit code " + exitCode + ": " + this);
+			System.out.println(">>> " + this);
+			output.forEach(line -> System.out.println("<<< " + line));
+			throw new MojoExecutionException("Command failed with exit code " + exitCode + ": " + this);
 		}
 		return this;
 	}

diff --git a/src/test/java/io/kokuwa/maven/k3s/test/AbstractTest.java b/src/test/java/io/kokuwa/maven/k3s/test/AbstractTest.java
@@ -38,7 +38,7 @@ public abstract class AbstractTest {
 	@BeforeEach
 	@AfterEach
 	void reset(TestInfo test, Log log, Docker newDocker) throws MojoExecutionException {
-		log.info("Reset test: " + test.getTestClass() + "#" + test.getTestMethod());
+		log.info("Reset test: " + test.getTestMethod().orElse(null));
 		this.docker = newDocker;
 		this.docker.removeContainer();
 		this.docker.removeVolume();