Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.

Commit 7911ceb

Browse files
committed
Switch from akka.discovery.method
to akka.management.cluster.bootstrap.contact-point-discovery.discovery-method. Fixes #173 Ref akka/akka-management#316 This was tested using the integration testing on reactive-lib lightbend/reactive-lib#106
1 parent ef00afd commit 7911ceb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ object PodTemplate {
7878
Map(
7979
"RP_JAVA_OPTS" -> LiteralEnvironmentVariable(
8080
Seq(
81-
s"-Dakka.discovery.method=kubernetes-api",
81+
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=kubernetes-api",
8282
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=$serviceResourceName",
8383
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=$noOfReplicas",
8484
akkaClusterBootstrapSystemName.fold("-Dakka.discovery.kubernetes-api.pod-label-selector=appName=%s")(systemName => s"-Dakka.discovery.kubernetes-api.pod-label-selector=actorSystemName=$systemName"),

cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariables.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ object RpEnvironmentVariables {
5757
else
5858
Map(
5959
"RP_JAVA_OPTS" -> Seq(
60-
s"-Dakka.discovery.method=marathon-api",
60+
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=marathon-api",
6161
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=$serviceResourceName",
6262
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=$noOfReplicas",
6363
akkaClusterBootstrapSystemName.fold("-Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s")(systemName => s"-Dakka.discovery.marathon-api.app-label-query=ACTOR_SYSTEM_NAME==$systemName"),

cli/shared/src/test/scala/com/lightbend/rp/reactivecli/runtime/marathon/RpEnvironmentVariablesTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ object RpEnvironmentVariablesTest extends TestSuite {
109109
Map(
110110
"RP_ENDPOINT_0_BIND_PORT" -> "$PORT_EP",
111111
"RP_ENDPOINTS" -> "EP1", "RP_APP_VERSION" -> "3.2.1-SNAPSHOT",
112-
"RP_JAVA_OPTS" -> "-Dakka.discovery.method=marathon-api -Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3 -Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s",
112+
"RP_JAVA_OPTS" -> "-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=marathon-api -Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=3 -Dakka.discovery.marathon-api.app-label-query=APP_NAME==%s",
113113
"RP_PLATFORM" -> "mesos",
114114
"RP_ENDPOINT_EP1_PORT" -> "$PORT_EP",
115115
"RP_MODULES" -> "akka-cluster-bootstrapping",

0 commit comments

Comments
 (0)