Fix K3S start command (#7677)

Replace `--no-deploy` and use `--disable` instead. Fixes #6770 --------- Co-authored-by: Eddú Meléndez <eddu.melendez@gmail.com>
testcontainers · Oct 24, 2023 · 0c52c41 · 0c52c41
1 parent 8864895
commit 0c52c41
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java b/modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java
@@ -46,7 +46,7 @@ public K3sContainer(DockerImageName dockerImageName) {
         tmpFsMapping.put("/var/run", "");
         setTmpFsMapping(tmpFsMapping);
 
-        setCommand("server", "--no-deploy=traefik", "--tls-san=" + this.getHost());
+        setCommand("server", "--disable=traefik", "--tls-san=" + this.getHost());
         setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
     }
 

diff --git a/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java b/modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java
@@ -20,12 +20,16 @@ public class OfficialClientK3sContainerTest {
 
     @Test
     public void shouldStartAndHaveListableNode() throws IOException, ApiException {
-        try (
-            // starting_k3s {
-            K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
-                .withLogConsumer(new Slf4jLogConsumer(log))
-            // }
-        ) {
+        runK3s(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"));
+    }
+
+    @Test
+    public void shouldStartAndHaveListableNodeUsingLowerVersion() throws IOException, ApiException {
+        runK3s(DockerImageName.parse("rancher/k3s:v1.20.15-k3s1"));
+    }
+
+    private void runK3s(DockerImageName k3sDockerImage) throws IOException, ApiException {
+        try (K3sContainer k3s = new K3sContainer(k3sDockerImage).withLogConsumer(new Slf4jLogConsumer(log))) {
             k3s.start();
 
             // connecting_with_k8sio {