Skip to content

Commit f89039b

Browse files
authored
Add support for 1.29.1 for KindContainer (#269)
* Add support for 1.29.1 for `KindContainer` * Add support for kindest/node >= 1.29.0
1 parent a332408 commit f89039b

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

k8s-versions.json

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
},
3939
{
4040
"k8s": "1.28.0"
41+
},
42+
{
43+
"k8s": "1.29.1"
4144
}
4245
]
4346
},

src/main/java/com/dajudge/kindcontainer/KindContainer.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.github.dockerjava.api.model.Bind;
77
import com.github.dockerjava.api.model.ContainerNetwork;
88
import com.github.dockerjava.api.model.Volume;
9+
import org.jetbrains.annotations.NotNull;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;
1112
import org.testcontainers.DockerClientFactory;
@@ -88,11 +89,12 @@ public KindContainer(final KubernetesImageSpec<KindContainerVersion> imageSpec)
8889
super(imageSpec.getImage());
8990
this.version = imageSpec.getVersion();
9091
final StringBuffer log = new StringBuffer();
92+
final String startupMessage = getStartupMessage();
9193
this.withStartupTimeout(ofSeconds(300))
9294
.withLogConsumer(outputFrame -> {
9395
if (provisioningLatch.getCount() != 0) {
9496
log.append(outputFrame.getUtf8String());
95-
if (log.toString().contains("Reached target Multi-User System.")) {
97+
if (log.toString().contains(startupMessage)) {
9698
log.append(outputFrame.getUtf8String());
9799
provisioningLatch.countDown();
98100
}
@@ -121,6 +123,13 @@ public KindContainer(final KubernetesImageSpec<KindContainerVersion> imageSpec)
121123
.withTmpFs(TMP_FILESYSTEMS);
122124
}
123125

126+
@NotNull
127+
private String getStartupMessage() {
128+
return version.descriptor().getMajor() >= 1 && version.descriptor().getMinor() >= 29
129+
? "Reached target multi-user.target"
130+
: "Reached target Multi-User System.";
131+
}
132+
124133
@Override
125134
public T withReuse(final boolean reuse) {
126135
if (reuse) {

0 commit comments

Comments
 (0)