Adjust the test to use akka-dns

Author: eed3si9n

build.sbt

@@ -124,6 +124,7 @@ lazy val akkaClusterBootstrap = createProject("reactive-lib-akka-cluster-bootstr
     libraryDependencies ++= Seq(
       "com.lightbend.akka.discovery"  %% "akka-discovery-kubernetes-api"     % Versions.akkaManagement,
       "com.lightbend.akka.discovery"  %% "akka-discovery-marathon-api"       % Versions.akkaManagement,
+      "com.lightbend.akka.discovery"  %% "akka-discovery-dns"                % Versions.akkaManagement,
       "com.lightbend.akka.management" %% "akka-management-cluster-bootstrap" % Versions.akkaManagement,
       "com.typesafe.akka"             %% "akka-testkit"                      % Versions.akka              % "test",
       "com.typesafe.akka"             %% "akka-cluster"                      % Versions.akka              % "provided"

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/build.sbt

@@ -8,9 +8,6 @@ ThisBuild / version      := "0.1.5"
 ThisBuild / organization := "com.example"
 ThisBuild / scalaVersion := "2.12.7"
 
-// This is where we wire the freshly baked reactive-lib
-ThisBuild / reactiveLibVersion := freshReactiveLibVersion
-
 lazy val isOpenShift = {
   sys.props.get("test.openshift").isDefined
 }
@@ -30,10 +27,14 @@ lazy val root = (project in file("."))
       "-Xlint",
       "-Yno-adapted-args",
     ),
+    // This is where we wire the freshly baked reactive-lib
+    reactiveLibVersion := freshReactiveLibVersion,
     libraryDependencies ++= Seq(
       akkaManagement,
       akkaClusterHttp,
       akkaCluster,
+      akkaClusterSharding,
+      akkaClusterTools,
       akkaDiscoveryDns,
       akkaSlj4j,
       logback,

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/kubernetes/akka-cluster.yml

@@ -95,7 +95,7 @@ spec:
           - name: "RP_ENDPOINT_AKKA_REMOTE_PORT"
             value: "10000"
           - name: "RP_JAVA_OPTS"
-            value: "-Dconfig.resource=rp-application.conf -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=akka.discovery.akka-dns -Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=bootstrap-demo-kubernetes-dns-internal -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=2 -Dakka.discovery.kubernetes-api.pod-label-selector=actorSystemName=hoboken1"
+            value: "-Dconfig.resource=rp-application.conf -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=akka.discovery.akka-dns -Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=bootstrap-demo-kubernetes-dns-internal -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=2"
           - name: "RP_KUBERNETES_POD_IP"
             valueFrom:
               fieldRef:

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/kubernetes/openshift.yml

@@ -95,7 +95,7 @@ spec:
           - name: "RP_ENDPOINT_AKKA_REMOTE_PORT"
             value: "10000"
           - name: "RP_JAVA_OPTS"
-            value: "-Dconfig.resource=rp-application.conf -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=akka.discovery.akka-dns -Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=bootstrap-demo-kubernetes-dns-internal -Dakka.management.cluster.bootstrap.contact-point-discovery.required-contact-point-nr=2 -Dakka.discovery.kubernetes-api.pod-label-selector=actorSystemName=hoboken1"
+            value: "-Dconfig.resource=rp-application.conf -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=akka.discovery.akka-dns -Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=bootstrap-demo-kubernetes-dns-internal -Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=akka.discovery.akka-dns"
           - name: "RP_KUBERNETES_POD_IP"
             valueFrom:
               fieldRef:

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
   val akkaVersion = "2.5.18"
-  val akkaManagementVersion = "0.18.0" // 0.20.0
+  val akkaManagementVersion = "0.20.0"
   val freshReactiveLibVersion = sys.props.get("plugin.version").getOrElse {
     sys.error("""|The system property 'plugin.version' is not defined.
                  |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/src/main/resources/application.conf

@@ -1,21 +1,3 @@
 akka {
   loglevel = DEBUG
-
-  io.dns.resolver = async-dns
-
-  # actor {
-  #   provider = "cluster"
-  # }
-
-  # management {
-  #   cluster.bootstrap {
-  #     contact-point-discovery {
-  #       port-name = "akka-mgmt-http"
-  #       protocol = "tcp"
-  #       service-name = "bootstrap-demo-kubernetes-dns-internal"
-  #       # Can be removed once https://github.com/akka/akka/issues/25825 is implemented
-  #       service-namespace = ${NAMESPACE}".svc.cluster.local"
-  #     }
-  #   }
-  # }
 }

integrateion-test/src/sbt-test/bootstrap-demo/dns-kubernetes/src/main/scala/foo/ClusterApp.scala

@@ -22,11 +22,11 @@ object ClusterApp {
     implicit val system = ActorSystem()
     implicit val materializer = ActorMaterializer()
     implicit val executionContext = system.dispatcher
-    val cluster = Cluster(system)
 
+    val cluster = Cluster(system)
     system.log.info("Starting Akka Management")
-    AkkaManagement(system).start()
-    ClusterBootstrap(system).start()
+    // AkkaManagement(system).start()
+    // ClusterBootstrap(system).start()
 
     system.actorOf(
       ClusterSingletonManager.props(

service-discovery/src/main/resources/rp-tooling.conf

@@ -1,15 +1,7 @@
-# TODO: This config should be generated at runtime as it is platform-specific, or this project needs platform-specific
-# configs that are included dynamically depending upon platform, perhaps via -Dconfig.resource
-
 akka {
   io {
     dns {
       resolver = async-dns
-      async-dns {
-        provider-object = "com.lightbend.rp.asyncdns.AsyncDnsProvider"
-        resolve-srv = true
-        resolv-conf = on
-      }
     }
   }
 }