Use "Runtime" as Docker image and service names; Runtime 1.1.27 (ligh…

…tbend#1895) * Use image name kalix-runtime (was kalix-proxy) * Adapt Runtime version updating helpers * Rename Docker compose services * Kalix Runtime 1.1.25 * More safe renames * Missed a few versions * Service name in DockerComposeUtilsSpec * Found even more, sigh * Make TestContainers wait for the new message * Use Runtime 1.1.26 * some more proxy > runtime renaming * Kalix Runtime 1.1.27 * delegate from old update script name * typo --------- Co-authored-by: Renato Cavalcanti <[email protected]>
aklikic · Jan 15, 2024 · e8234a9 · e8234a9
1 parent 124e256
commit e8234a9
Show file tree

Hide file tree

Showing 71 changed files with 244 additions and 237 deletions.
diff --git a/build.sbt b/build.sbt
@@ -102,8 +102,8 @@ lazy val javaSdkProtobufTestKit = project
     buildInfoKeys := Seq[BuildInfoKey](
       name,
       version,
-      "proxyImage" -> "gcr.io/kalix-public/kalix-proxy",
-      "proxyVersion" -> Kalix.ProxyVersion,
+      "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime",
+      "runtimeVersion" -> Kalix.RuntimeVersion,
       "scalaVersion" -> scalaVersion.value),
     buildInfoPackage := "kalix.javasdk.testkit",
     // Generate javadocs by just including non generated Java sources
@@ -182,8 +182,8 @@ lazy val javaSdkSpringTestKit = project
     buildInfoKeys := Seq[BuildInfoKey](
       name,
       version,
-      "proxyImage" -> "gcr.io/kalix-public/kalix-proxy",
-      "proxyVersion" -> Kalix.ProxyVersion,
+      "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime",
+      "runtimeVersion" -> Kalix.RuntimeVersion,
       "scalaVersion" -> scalaVersion.value),
     buildInfoPackage := "kalix.spring.testkit",
     // Generate javadocs by just including non generated Java sources
@@ -254,8 +254,8 @@ lazy val springBootStarterTest = project
     buildInfoKeys := Seq[BuildInfoKey](
       name,
       version,
-      "proxyImage" -> "gcr.io/kalix-public/kalix-proxy",
-      "proxyVersion" -> Kalix.ProxyVersion,
+      "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime",
+      "runtimeVersion" -> Kalix.RuntimeVersion,
       "scalaVersion" -> scalaVersion.value),
     buildInfoPackage := "kalix.spring.boot.test",
     // Generate javadocs by just including non generated Java sources
@@ -384,8 +384,8 @@ def devToolsCommon(project: Project): Project =
       buildInfoKeys := Seq[BuildInfoKey](
         name,
         version,
-        "proxyImage" -> "gcr.io/kalix-public/kalix-proxy",
-        "proxyVersion" -> Kalix.ProxyVersion),
+        "runtimeImage" -> "gcr.io/kalix-public/kalix-runtime",
+        "runtimeVersion" -> Kalix.RuntimeVersion),
       buildInfoPackage := "kalix.devtools",
       // Generate javadocs by just including non generated Java sources
       Compile / doc / sources := {
@@ -517,7 +517,7 @@ lazy val codegenScala =
         version,
         scalaVersion,
         sbtVersion,
-        "protocolVersion" -> Kalix.ProxyVersion,
+        "protocolVersion" -> Kalix.RuntimeVersion,
         BuildInfoKey(PB.protocExecutable),
         BuildInfoKey(codegenCore / PB.externalIncludePath),
         BuildInfoKey(codegenCore / PB.externalSourcePath),

diff --git a/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala b/devtools/src/test/scala/kalix/devtools/impl/DevModeSettingsSpec.scala
@@ -27,8 +27,8 @@ object DevModeSettingsSpec {
     """
       |version: "3"
       |services:
-      |  kalix-proxy:
-      |    image: gcr.io/kalix-public/kalix-proxy:1.1.13
+      |  kalix-runtime:
+      |    image: gcr.io/kalix-public/kalix-runtime:1.1.27
       |    ports:
       |      - "9000:9000"
       |    extra_hosts:

diff --git a/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala b/devtools/src/test/scala/kalix/devtools/impl/DockerComposeUtilsSpec.scala
@@ -34,8 +34,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues
     """
       |version: "3"
       |services:
-      |  kalix-proxy:
-      |    image: gcr.io/kalix-public/kalix-proxy:1.1.13
+      |  kalix-runtime:
+      |    image: gcr.io/kalix-public/kalix-runtime:1.1.27
       |    ports:
       |      - "9000:9000"
       |    extra_hosts:
@@ -70,8 +70,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues
         """
           |version: "3"
           |services:
-          |  kalix-proxy:
-          |    image: gcr.io/kalix-public/kalix-proxy:1.1.8
+          |  kalix-runtime:
+          |    image: gcr.io/kalix-public/kalix-runtime:1.1.27
           |    ports:
           |      - "9000:9000"
           |    extra_hosts:
@@ -87,8 +87,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues
         """
           |version: "3"
           |services:
-          |  kalix-proxy:
-          |    image: gcr.io/kalix-public/kalix-proxy:1.1.8
+          |  kalix-runtime:
+          |    image: gcr.io/kalix-public/kalix-runtime:1.1.27
           |    ports:
           |      - "9000:9000"
           |    extra_hosts:
@@ -119,8 +119,8 @@ class DockerComposeUtilsSpec extends AnyWordSpec with Matchers with OptionValues
 
       val extraProxy =
         """
-          |  kalix-proxy-2:
-          |    image: gcr.io/kalix-public/kalix-proxy:1.1.8
+          |  kalix-runtime-2:
+          |    image: gcr.io/kalix-public/kalix-runtime:1.1.27
           |    ports:
           |      - "9000:9000"
           |    extra_hosts:

diff --git a/docs/src/modules/java/pages/access-control.adoc b/docs/src/modules/java/pages/access-control.adoc
@@ -123,7 +123,7 @@ When running a service during local development, it may be useful to enable ACL
 
 ```yaml
 kalix-runtime:
-  image: gcr.io/kalix-public/kalix-proxy:latest
+  image: gcr.io/kalix-public/kalix-runtime:latest
   ports:
     - "9000:9000"
   environment:
@@ -140,7 +140,7 @@ If running multiple services in local development, you may want to run with ACLs
 
 ```yaml
 kalix-runtime:
-  image: gcr.io/kalix-public/kalix-proxy:latest
+  image: gcr.io/kalix-public/kalix-runtime:latest
   ports:
     - "9000:9000"
   environment:

diff --git a/...-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml b/...-archetype-event-sourced-entity/src/main/resources/archetype-resources/docker-compose.yml
@@ -1,11 +1,11 @@
 #[[
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: ]]#${artifactId}#[[
     ports:
       - "9000:9000"

diff --git a/...ix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml b/...ix-maven-archetype-value-entity/src/main/resources/archetype-resources/docker-compose.yml
@@ -1,11 +1,11 @@
 #[[
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: ]]#${artifactId}#[[
     ports:
       - "9000:9000"

diff --git a/...ava/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml b/...ava/kalix-spring-boot-archetype/src/main/resources/archetype-resources/docker-compose.yml
@@ -1,11 +1,11 @@
 #[[
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: ]]#${artifactId}#[[
     ports:
       - "9000:9000"

diff --git a/...ix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml b/...ix-spring-boot-kotlin-archetype/src/main/resources/archetype-resources/docker-compose.yml
@@ -1,11 +1,11 @@
 #[[
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: ]]#${artifactId}#[[
     ports:
       - "9000:9000"

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,7 +6,10 @@ object Dependencies {
   object Kalix {
     val ProtocolVersionMajor = 1
     val ProtocolVersionMinor = 1
-    val ProxyVersion = System.getProperty("kalix-proxy.version", "1.1.26")
+    val RuntimeVersion = System.getProperty(
+      "kalix-runtime.version",
+      // temporarily accept the old system property name
+      System.getProperty("kalix-proxy.version", "1.1.27"))
   }
 
   // changing the Scala version of the Java SDK affects end users
@@ -36,10 +39,10 @@ object Dependencies {
   val CommonsIoVersion = "2.11.0"
   val MunitVersion = "0.7.29"
 
-  val kalixProxyProtocol = "io.kalix" % "kalix-proxy-protocol" % Kalix.ProxyVersion
-  val kalixSdkProtocol = "io.kalix" % "kalix-sdk-protocol" % Kalix.ProxyVersion
-  val kalixTckProtocol = "io.kalix" % "kalix-tck-protocol" % Kalix.ProxyVersion
-  val kalixTestkitProtocol = "io.kalix" % "kalix-testkit-protocol" % Kalix.ProxyVersion
+  val kalixProxyProtocol = "io.kalix" % "kalix-proxy-protocol" % Kalix.RuntimeVersion
+  val kalixSdkProtocol = "io.kalix" % "kalix-sdk-protocol" % Kalix.RuntimeVersion
+  val kalixTckProtocol = "io.kalix" % "kalix-tck-protocol" % Kalix.RuntimeVersion
+  val kalixTestkitProtocol = "io.kalix" % "kalix-testkit-protocol" % Kalix.RuntimeVersion
 
   val commonsIo = "commons-io" % "commons-io" % CommonsIoVersion
   val logback = "ch.qos.logback" % "logback-classic" % LogbackVersion
@@ -174,7 +177,7 @@ object Dependencies {
     //        Eventually, the final form of protos from should be backported to the framework.
     //        See https://github.com/lightbend/kalix-jvm-sdk/issues/605
     //  kalixTckProtocol % "protobuf-src",
-    //  "io.kalix" % "kalix-tck-protocol" % Kalix.ProxyVersion % "protobuf-src",
+    //  "io.kalix" % "kalix-tck-protocol" % Kalix.RuntimeVersion % "protobuf-src",
     logback)
 
   val codegenCore = deps ++= Seq(

diff --git a/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-kafka-quickstart/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-customer-registry-kafka-quickstart
     ports:
       - "9000:9000"
@@ -25,7 +25,7 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      # advertised listener running on port 9092 must be accessible to kalix-proxy container running for integration tests
+      # advertised listener running on port 9092 must be accessible to kalix-runtime service running for integration tests
       # therefore we need to use host.docker.internal (docker's bridge address) to access it through the host machine
       # advertised listener running on port 9093 is to be used by non-docker clients running on host machine
       KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:29092,EXTERNAL_DOCKER://host.docker.internal:9092,HOST://localhost:9093

diff --git a/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-quickstart/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-customer-registry-quickstart
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml b/samples/java-protobuf-customer-registry-views-quickstart/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-customer-registry-views-quickstart
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-eventsourced-counter/docker-compose.yml b/samples/java-protobuf-eventsourced-counter/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-counter
     ports:
       - "9000:9000"

diff --git a/...es/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml b/...es/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose-integration.yml
@@ -4,11 +4,11 @@
 #tag::customer-registry-docker[]
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-customer-registry-subscriber
     depends_on:
-      - kalix-proxy-customer-registry
+      - kalix-runtime-customer-registry
     ports:
       - "9001:9000"
     extra_hosts:
@@ -19,8 +19,8 @@ services:
       USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
       USER_FUNCTION_PORT: "8081"
 
-  kalix-proxy-customer-registry:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime-customer-registry:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-customer-registry
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry-subscriber/docker-compose.yml
@@ -5,8 +5,8 @@ services:
   # note the ports being different from other sample docker-compose files to allow this service to run
   # on the same local machine as the java-protobuf-eventsourced-customer-registry
 #tag::customer-registry-subscriber[]  
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-customer-registry-subscriber
     ports:
       - "9001:9000"
@@ -17,4 +17,4 @@ services:
         -Dkalix.dev-mode.service-port-mappings.customer-registry=host.docker.internal:9000
       USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
       USER_FUNCTION_PORT: "8081"
-#end::customer-registry-subscriber[]
+#end::customer-registry-subscriber[]
diff --git a/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml b/samples/java-protobuf-eventsourced-customer-registry/docker-compose.yml
@@ -1,8 +1,8 @@
 #tag::customer-registry[]
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-customer-registry
     ports:
       - "9000:9000"
@@ -14,4 +14,4 @@ services:
 
       USER_FUNCTION_HOST: ${USER_FUNCTION_HOST:-host.docker.internal}
       USER_FUNCTION_PORT: ${USER_FUNCTION_PORT:-8080}
-#end::customer-registry[]
+#end::customer-registry[]
diff --git a/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml b/samples/java-protobuf-eventsourced-shopping-cart/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-eventsourced-shopping-cart
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-fibonacci-action/docker-compose.yml b/samples/java-protobuf-fibonacci-action/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-fibonacci-action
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-first-service/docker-compose.yml b/samples/java-protobuf-first-service/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-first-service
     ports:
       - "9000:9000"

diff --git a/samples/java-protobuf-reliable-timers/docker-compose.yml b/samples/java-protobuf-reliable-timers/docker-compose.yml
@@ -1,10 +1,10 @@
 # If you're looking to use eventing with Google PubSub, to get an emulator running:
-# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-proxy service
+# - add property "-Dkalix.proxy.eventing.support=google-pubsub-emulator" to the JAVA_TOOL_OPTIONS environment map under the kalix-runtime service
 # - uncomment the env var PUBSUB_EMULATOR_HOST and the section below for gcloud-pubsub-emulator service
 version: "3"
 services:
-  kalix-proxy:
-    image: gcr.io/kalix-public/kalix-proxy:1.1.24
+  kalix-runtime:
+    image: gcr.io/kalix-public/kalix-runtime:1.1.27
     container_name: java-protobuf-reliable-timers
     ports:
       - "9000:9000"