.github/workflows/ci-release.yml

@@ -15,9 +15,11 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 17
           cache: sbt
-      - run: ./sbt ci-release
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+      - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

.github/workflows/test.yml

@@ -12,11 +12,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java:
-          - 8
-          - 11
-          - 17
-    #          - graalvm-ce-java11@20.3.0
+        scala: [2.12.20, 2.13.16, 3.3.6]
+        java: [17, 21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -44,15 +41,8 @@ jobs:
           java-version: ${{ matrix.java }}
           check-latest: true
           cache: "sbt"
-      - name: Restore cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.cache/coursier
-          key: cache-v1-${{ hashFiles('build.sbt') }}
-          restore-keys: |
-            cache-v1-
-      - name: Compile and Test
-        run: ./sbt +test
+
+      - name: Setup sbt launcher
+        uses: sbt/setup-sbt@v1
+
+      - run: sbt ++${{ matrix.scala }} test

.jvmopts

@@ -0,0 +1,4 @@
+-Dfile.encoding=UTF8
+-Xms256M
+-Xmx6G
+-XX:+UseG1GC

build.sbt

@@ -2,11 +2,13 @@ import xerial.sbt.Sonatype.*
 import ReleaseTransformations.*
 import java.net.URI
 
+Global / onChangedBuildSource := IgnoreSourceChanges
+
 lazy val compileScalastyle = taskKey[Unit]("compileScalastyle")
 
 val commonSettings = Seq(
-  ThisBuild / scalaVersion := "2.12.19",
-  crossScalaVersions := Seq("2.12.19", "2.13.14", "3.3.4"),
+  ThisBuild / scalaVersion := "2.12.20",
+  crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.6"),
 
   ThisBuild / parallelExecution := false,
   fork := true,
@@ -111,6 +113,7 @@ lazy val root = (project in file("."))
     moduleWireMock,
     moduleYugabytedb,
     moduleOpensearch,
+    moduleK3s,
     allOld
   )
   .settings(noPublishSettings)
@@ -563,3 +566,14 @@ lazy val moduleOpensearch = (project in file("modules/opensearch"))
     name := "testcontainers-scala-opensearch",
     libraryDependencies ++= Dependencies.moduleOpensearch.value
   )
+
+lazy val moduleK3s = project.in(file("modules/k3s"))
+  .dependsOn(
+    core % "compile->compile;test->test;provided->provided",
+    scalatest % "test->test"
+  )
+  .settings(
+    commonSettings,
+    name := "testcontainers-scala-k3s",
+    libraryDependencies ++= Dependencies.moduleK3s.value
+  )

docs/src/main/tut/setup.md

@@ -95,6 +95,7 @@ Here is the full list of the [currently available modules](https://github.com/te
 * `testcontainers-scala-redis` — module with Redis container.
 * `testcontainers-scala-wiremock` - module with WireMock container.
 * `testcontainers-scala-opensearch` - module with Opensearch container.
+* `testcontainers-scala-k3s` - module with K3S container.
 
 Most of the modules are just proxies to the testcontainers-java modules and behave exactly like java containers.
 You can find documentation about them in the [testcontainers-java docs pages](https://www.testcontainers.org/).

modules/k3s/src/main/scala/com/dimafeng/testcontainers/K3sContainer.scala

@@ -0,0 +1,38 @@
+package com.dimafeng.testcontainers
+
+import org.testcontainers.k3s.{K3sContainer => JavaK3sContainer}
+import org.testcontainers.utility.DockerImageName
+import org.testcontainers.containers.Network
+
+class K3sContainer private (
+  dockerImageName: DockerImageName,
+  network: Option[Network],
+  networkAlias: Option[String]
+) extends SingleContainer[JavaK3sContainer] {
+  override val container: JavaK3sContainer = {
+    val c = new JavaK3sContainer(dockerImageName)
+    network.fold(c)(c.withNetwork(_))
+    networkAlias.fold(c)(c.withNetworkAliases(_))
+  }
+
+  def generateInternalKubeConfigYaml(networkAlias: String): String = container.generateInternalKubeConfigYaml(networkAlias)
+  def kubeConfigYaml: String = container.getKubeConfigYaml()
+}
+
+object K3sContainer {
+  private[testcontainers] final val defaultImage: String = "rancher/k3s"
+  private[testcontainers] final val defaultTag: String = "v1.32.2-k3s1"
+  private[testcontainers] final val defaultDockerImageName: String = s"${defaultImage}:${defaultTag}"
+
+  case class Def(
+    dockerImageName: DockerImageName = DockerImageName.parse(defaultDockerImageName),
+    network: Option[Network] = None,
+    networkAlias: Option[String] = None
+  ) extends ContainerDef {
+    override type Container = K3sContainer
+    override def createContainer(): K3sContainer = new K3sContainer(dockerImageName, network, networkAlias)
+
+    def withNetwork(network: Network): Def = copy(network = Some(network))
+    def withNetworkAlias(alias: String): Def = copy(networkAlias = Some(alias))
+  }
+}

modules/k3s/src/test/scala/com/dimafeng/testcontainers/K3sSpec.scala

@@ -0,0 +1,32 @@
+package com.dimafeng.testcontainers
+
+import com.dimafeng.testcontainers.scalatest.TestContainersForAll
+import org.scalatest.flatspec.AnyFlatSpec
+import org.testcontainers.containers.Network
+import org.testcontainers.utility.DockerImageName
+
+class K3sSpec extends AnyFlatSpec with TestContainersForAll {
+  override type Containers = K3sContainer
+
+  val network: Network = Network.SHARED
+
+  override def startContainers(): K3sContainer = {
+    K3sContainer.Def()
+      .withNetwork(network)
+      .withNetworkAlias("k3s")
+      .start()
+  }
+
+  "K3sContainer" should "be started" in withContainers { k3s =>
+    val kubeConfig = k3s.generateInternalKubeConfigYaml("k3s")
+    k3s.container.getKubeConfigYaml()
+
+    assert(kubeConfig.contains("apiVersion"))
+    assert(kubeConfig.contains("kind: \"Config\""))
+    assert(kubeConfig.contains("clusters"))
+    assert(kubeConfig.contains("users"))
+    assert(kubeConfig.contains("contexts"))
+    assert(k3s.logs.contains("kube-system"))
+    assert(k3s.kubeConfigYaml.contains("apiVersion"))
+  }
+}

modules/redpanda/src/main/scala/com/dimafeng/testcontainers/RedpandaContainer.scala

@@ -14,7 +14,7 @@ case class RedpandaContainer(
 
 object RedpandaContainer {
 
-  val defaultImage = "docker.redpanda.com/vectorized/redpanda"
+  val defaultImage = "docker.redpanda.com/redpandadata/redpanda"
   val defaultTag = "v22.2.6"
   val defaultDockerImageName = s"$defaultImage:$defaultTag"
 

project/Dependencies.scala

@@ -12,35 +12,35 @@ object Dependencies {
     scope.map(s => modules.map(_ % s)).getOrElse(modules)
   }
 
-  private val testcontainersVersion = "1.20.2"
+  private val testcontainersVersion = "1.21.1"
   private val seleniumVersion = "2.53.1"
-  private val slf4jVersion = "1.7.32"
+  private val slf4jVersion = "2.0.17"
   private val scalaTestVersion = "3.2.9"
   private val scalaTestMockitoVersion = "3.2.9.0"
   private val scalaTestSeleniumVersion_scala2 = "3.2.2.0"
   private val scalaTestSeleniumVersion_scala3 = "3.2.9.0"
   private val junitVersion = "4.13.2"
-  private val munitVersion = "1.0.0"
+  private val munitVersion = "1.1.1"
   private val mysqlConnectorVersion = "5.1.42"
   private val neo4jConnectorVersion = "4.0.0"
-  private val oracleDriverVersion = "21.3.0.0"
+  private val oracleDriverVersion = "21.18.0.0"
   private val cassandraDriverVersion = "4.0.1"
-  private val postgresqlDriverVersion = "42.2.24"
+  private val postgresqlDriverVersion = "42.7.7"
   private val kafkaDriverVersion = "2.2.0"
   private val mockitoVersion = "3.12.4"
   private val restAssuredVersion = "4.0.0"
   private val groovyVersion = "2.5.16"
   private val awsV1Version = "1.11.479"
-  private val awsV2Version = "2.20.68"
+  private val awsV2Version = "2.31.66"
   private val sttpVersion = "3.3.14"
   private val firestoreConnectorVersion = "3.0.11"
   private val bigtableVersion = "2.45.0"
-  private val pubsubVersion = "1.116.4"
-  private val redisTestcontainersVersion = "2.0.1"
-  private val jedisVersion = "5.0.0"
+  private val pubsubVersion = "1.139.4"
+  private val redisTestcontainersVersion = "2.2.4"
+  private val jedisVersion = "6.0.0"
   private val wireMockTestcontainersVersion = "1.0-alpha-13"
   private val milvusSdkVersion = "2.4.1"
-  private val quadrantClientVersion = "1.12.0"
+  private val quadrantClientVersion = "1.14.0"
   private val yugabyteJdbcVersion = "42.3.5-yb-6"
   private val yugabyteJavaDriverVersion = "4.15.0-yb-2-TESTFIX.0"
   private val opensearchTestcontainersVersion = "1.0.0"
@@ -148,7 +148,7 @@ object Dependencies {
     ) ++ TEST(
       ("io.rest-assured" % "scala-support" % restAssuredVersion)
         .exclude("org.codehaus.groovy", "groovy"),
-      "org.codehaus.groovy"% "groovy" % groovyVersion
+      "org.codehaus.groovy" % "groovy" % groovyVersion
     )
   )
 
@@ -372,4 +372,10 @@ object Dependencies {
       "com.softwaremill.sttp.client3" %% "core" % sttpVersion
     )
   )
+
+  val moduleK3s = Def.setting(
+    COMPILE(
+      "org.testcontainers" % "k3s" % testcontainersVersion
+    )
+  )
 }

project/Plugins.sbt

@@ -2,4 +2,4 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.0")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.11.0