Skip to content

Commit 94c8c15

Browse files
committed
fix: Migrate to kubernetes svc DNS names from the deprecated pod DNS names
Naive search replace to see what breaks in CI
1 parent 6a49c2c commit 94c8c15

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

cluster-bootstrap/src/test/scala/akka/management/cluster/bootstrap/LowestAddressJoinDeciderSpec.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ abstract class JoinDeciderSpec extends AbstractBootstrapSpec {
5353
""")
5454

5555
val contactA = ResolvedTarget(
56-
host = "10-0-0-2.default.pod.cluster.local",
56+
host = "10-0-0-2.default.svc.cluster.local",
5757
port = None,
5858
address = Some(InetAddress.getByName("10.0.0.2")))
5959

6060
val contactB = ResolvedTarget(
61-
host = "10-0-0-3.default.pod.cluster.local",
61+
host = "10-0-0-3.default.svc.cluster.local",
6262
port = None,
6363
address = Some(InetAddress.getByName("10.0.0.3")))
6464

6565
val contactC = ResolvedTarget(
66-
host = "10-0-0-4.default.pod.cluster.local",
66+
host = "10-0-0-4.default.svc.cluster.local",
6767
port = None,
6868
address = Some(InetAddress.getByName("10.0.0.4")))
6969

@@ -306,17 +306,17 @@ class SelfAwareJoinDeciderIPv6Spec extends JoinDeciderSpec {
306306
val settings = ClusterBootstrapSettings(system.settings.config, NoLogging)
307307

308308
val contactIPv6A = ResolvedTarget(
309-
host = "240b-c0e0-202-5e2b-b424-2-0-450.default.pod.cluster.local",
309+
host = "240b-c0e0-202-5e2b-b424-2-0-450.default.svc.cluster.local",
310310
port = None,
311311
address = Some(InetAddress.getByName("240b:c0e0:202:5e2b:b424:2:0:450")))
312312

313313
val contactIPv6B = ResolvedTarget(
314-
host = "240b-c0e0-202-5e2b-b424-2-0-cc4.default.pod.cluster.local",
314+
host = "240b-c0e0-202-5e2b-b424-2-0-cc4.default.svc.cluster.local",
315315
port = None,
316316
address = Some(InetAddress.getByName("240b:c0e0:202:5e2b:b424:2:0:cc4")))
317317

318318
val contactIPv6C = ResolvedTarget(
319-
host = "240b-c0e0-202-5e2b-b424-2-0-cc5.default.pod.cluster.local",
319+
host = "240b-c0e0-202-5e2b-b424-2-0-cc5.default.svc.cluster.local",
320320
port = None,
321321
address = Some(InetAddress.getByName("240b:c0e0:202:5e2b:b424:2:0:cc5")))
322322

discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ object KubernetesApiServiceDiscovery {
7979
} yield Some(port.containerPort)
8080
}
8181
} yield {
82-
val hostOrIp = if (rawIp) ip else s"${ip.replace('.', '-')}.$podNamespace.pod.$podDomain"
82+
val hostOrIp = if (rawIp) ip else s"${ip.replace('.', '-')}.$podNamespace.svc.$podDomain"
8383
ResolvedTarget(
8484
host = hostOrIp,
8585
port = maybePort,

discovery-kubernetes-api/src/test/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
4646

4747
KubernetesApiServiceDiscovery.targets(podList, Some("management"), "default", "cluster.local", false, None) shouldBe List(
4848
ResolvedTarget(
49-
host = "172-17-0-4.default.pod.cluster.local",
49+
host = "172-17-0-4.default.svc.cluster.local",
5050
port = Some(10001),
5151
address = Some(InetAddress.getByName("172.17.0.4"))
5252
))
@@ -112,17 +112,17 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
112112

113113
KubernetesApiServiceDiscovery.targets(podList, None, "default", "cluster.local", false, None) shouldBe List(
114114
ResolvedTarget(
115-
host = "172-17-0-4.default.pod.cluster.local",
115+
host = "172-17-0-4.default.svc.cluster.local",
116116
port = None,
117117
address = Some(InetAddress.getByName("172.17.0.4"))
118118
),
119119
ResolvedTarget(
120-
host = "172-17-0-5.default.pod.cluster.local",
120+
host = "172-17-0-5.default.svc.cluster.local",
121121
port = None,
122122
address = Some(InetAddress.getByName("172.17.0.5"))
123123
),
124124
ResolvedTarget(
125-
host = "172-17-0-6.default.pod.cluster.local",
125+
host = "172-17-0-6.default.svc.cluster.local",
126126
port = None,
127127
address = Some(InetAddress.getByName("172.17.0.6"))
128128
)
@@ -170,7 +170,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec with Matchers {
170170
false,
171171
Some("user-function")) shouldBe List(
172172
ResolvedTarget(
173-
"10-8-7-9.b58dbc88-3651-4fb4-8408-60c375592d1d.pod.cluster.local",
173+
"10-8-7-9.b58dbc88-3651-4fb4-8408-60c375592d1d.svc.cluster.local",
174174
None,
175175
Some(InetAddress.getByName("10.8.7.9")))
176176
)

docs/src/main/paradox/kubernetes-deployment/deploying.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ make the logs quieter, but for now it will help us to understand what is happeni
8181
[INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [] [Appka-akka.actor.default-dispatcher-3] - Looking up [Lookup(appka,None,Some(tcp))] MDC: {akkaAddress=akka://[email protected]:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
8282
[INFO] [akka.discovery.kubernetes.KubernetesApiServiceDiscovery] [] [Appka-akka.actor.default-dispatcher-3] - Querying for pods with label selector: [app=appka]. Namespace: [appka-1]. Port: [None] MDC: {akkaAddress=akka://[email protected]:25520, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=KubernetesApiServiceDiscovery(akka://Appka), sourceActorSystem=Appka, akkaTimestamp=10:04:53.844UTC}
8383
84-
5 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapResolved] [Appka-akka.actor.default-dispatcher-3] - Located service members based on: [Lookup(appka,None,Some(tcp))]: [ResolvedTarget(172-17-0-6.appka-1.pod.cluster.local,None,Some(/172.17.0.6)), ResolvedTarget(172-17-0-7.appka-1.pod.cluster.local,None,Some(/172.17.0.7)), ResolvedTarget(172-17-0-5.appka-1.pod.cluster.local,None,Some(/172.17.0.5))], filtered to [172-17-0-5.appka-1.pod.cluster.local:0, 172-17-0-6.appka-1.pod.cluster.local:0, 172-17-0-7.appka-1.pod.cluster.local:0] MDC: {akkaAddress=akka://[email protected]:25520, akkaContactPoints=172-17-0-5.appka-1.pod.cluster.local:0, 172-17-0-6.appka-1.pod.cluster.local:0, 172-17-0-7.appka-1.pod.cluster.local:0, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:04:54.919UTC}
84+
5 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapResolved] [Appka-akka.actor.default-dispatcher-3] - Located service members based on: [Lookup(appka,None,Some(tcp))]: [ResolvedTarget(172-17-0-6.appka-1.svc.cluster.local,None,Some(/172.17.0.6)), ResolvedTarget(172-17-0-7.appka-1.svc.cluster.local,None,Some(/172.17.0.7)), ResolvedTarget(172-17-0-5.appka-1.svc.cluster.local,None,Some(/172.17.0.5))], filtered to [172-17-0-5.appka-1.svc.cluster.local:0, 172-17-0-6.appka-1.svc.cluster.local:0, 172-17-0-7.appka-1.svc.cluster.local:0] MDC: {akkaAddress=akka://[email protected]:25520, akkaContactPoints=172-17-0-5.appka-1.svc.cluster.local:0, 172-17-0-6.appka-1.svc.cluster.local:0, 172-17-0-7.appka-1.svc.cluster.local:0, sourceThread=Appka-akka.actor.default-dispatcher-13, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:04:54.919UTC}
8585
8686
6 [INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapSeedNodes] [Appka-akka.actor.default-dispatcher-20] - Contact point [akka://[email protected]:25520] returned [1] seed-nodes [akka://[email protected]:25520] MDC: {akkaAddress=akka://[email protected]:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.306UTC, akkaSeedNodes=akka://[email protected]:25520}
8787
[INFO] [akka.management.cluster.bootstrap.internal.BootstrapCoordinator] [akkaBootstrapJoin] [Appka-akka.actor.default-dispatcher-20] - Joining [akka://[email protected]:25520] to existing cluster [akka://[email protected]:25520] MDC: {akkaAddress=akka://[email protected]:25520, sourceThread=Appka-akka.actor.default-dispatcher-11, akkaSource=akka://Appka/system/bootstrapCoordinator, sourceActorSystem=Appka, akkaTimestamp=10:05:01.309UTC, akkaSeedNodes=akka://[email protected]:25520}

0 commit comments

Comments
 (0)