Skip to content

Commit 0c52c41

Browse files
tgeenseddumelendez
andauthored
Fix K3S start command (#7677)
Replace `--no-deploy` and use `--disable` instead. Fixes #6770 --------- Co-authored-by: Eddú Meléndez <[email protected]>
1 parent 8864895 commit 0c52c41

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

modules/k3s/src/main/java/org/testcontainers/k3s/K3sContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public K3sContainer(DockerImageName dockerImageName) {
4646
tmpFsMapping.put("/var/run", "");
4747
setTmpFsMapping(tmpFsMapping);
4848

49-
setCommand("server", "--no-deploy=traefik", "--tls-san=" + this.getHost());
49+
setCommand("server", "--disable=traefik", "--tls-san=" + this.getHost());
5050
setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*Node controller sync successful.*"));
5151
}
5252

modules/k3s/src/test/java/org/testcontainers/k3s/OfficialClientK3sContainerTest.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ public class OfficialClientK3sContainerTest {
2020

2121
@Test
2222
public void shouldStartAndHaveListableNode() throws IOException, ApiException {
23-
try (
24-
// starting_k3s {
25-
K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
26-
.withLogConsumer(new Slf4jLogConsumer(log))
27-
// }
28-
) {
23+
runK3s(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"));
24+
}
25+
26+
@Test
27+
public void shouldStartAndHaveListableNodeUsingLowerVersion() throws IOException, ApiException {
28+
runK3s(DockerImageName.parse("rancher/k3s:v1.20.15-k3s1"));
29+
}
30+
31+
private void runK3s(DockerImageName k3sDockerImage) throws IOException, ApiException {
32+
try (K3sContainer k3s = new K3sContainer(k3sDockerImage).withLogConsumer(new Slf4jLogConsumer(log))) {
2933
k3s.start();
3034

3135
// connecting_with_k8sio {

0 commit comments

Comments
 (0)