This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new 3b10305 rename 'akka-remote' param (#55)
3b10305 is described below
commit 3b1030515c0a7949e2246b3a64bffe69a0aa90b4
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Apr 14 14:24:42 2023 +0200
rename 'akka-remote' param (#55)
* rename 'akka-remote' param
* more akka naming
* Update LeaseActorSpec.scala
* pekko-bootstrap
---
.../src/test/resources/pods.json | 60 +++++++++++-----------
.../discovery/kubernetes/JsonFormatSpec.scala | 6 +--
.../KubernetesApiServiceDiscoverySpec.scala | 14 ++---
docs/src/main/paradox/bootstrap/recipes.md | 12 ++---
.../src/main/resources/application.conf | 2 +-
.../kubernetes/pekko-cluster.yml | 2 +-
.../kubernetes-api/kubernetes/pekko-cluster.yml | 2 +-
.../kubernetes-dns/kubernetes/pekko-cluster.yml | 2 +-
.../lease/kubernetes/LeaseActorSpec.scala | 4 +-
.../src/main/resources/reference.conf | 6 +--
.../pekko/pki/kubernetes/PemManagersProvider.scala | 2 +-
.../management/scaladsl/PekkoManagement.scala | 4 +-
12 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/discovery-kubernetes-api/src/test/resources/pods.json
b/discovery-kubernetes-api/src/test/resources/pods.json
index 9298d10..389ceb1 100644
--- a/discovery-kubernetes-api/src/test/resources/pods.json
+++ b/discovery-kubernetes-api/src/test/resources/pods.json
@@ -50,7 +50,7 @@
"image":
"pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
- "name": "akka-remote",
+ "name": "pekko-remote",
"containerPort": 10000,
"protocol": "TCP"
},
@@ -84,7 +84,7 @@
},
{
"name": "RP_ENDPOINTS",
- "value": "AKKA_REMOTE,AKKA_MGMT_HTTP,HTTP"
+ "value": "PEKKO_REMOTE,PEKKO_MGMT_HTTP,HTTP"
},
{
"name": "RP_ENDPOINTS_COUNT",
@@ -169,7 +169,7 @@
"value": "10002"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -178,11 +178,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -191,11 +191,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -204,11 +204,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_PORT",
"value": "10000"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -217,7 +217,7 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_PORT",
"value": "10000"
},
{
@@ -399,7 +399,7 @@
"image":
"pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
- "name": "akka-remote",
+ "name": "pekko-remote",
"containerPort": 10000,
"protocol": "TCP"
},
@@ -433,7 +433,7 @@
},
{
"name": "RP_ENDPOINTS",
- "value": "AKKA_REMOTE,AKKA_MGMT_HTTP,HTTP"
+ "value": "PEKKO_REMOTE,PEKKO_MGMT_HTTP,HTTP"
},
{
"name": "RP_ENDPOINTS_COUNT",
@@ -518,7 +518,7 @@
"value": "10002"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -527,11 +527,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -540,11 +540,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -553,11 +553,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_PORT",
"value": "10000"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -566,7 +566,7 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_PORT",
"value": "10000"
},
{
@@ -749,7 +749,7 @@
"image":
"pekko-cluster-tooling-example/pekko-cluster-tooling-example:0.1.0",
"ports": [
{
- "name": "akka-remote",
+ "name": "pekko-remote",
"containerPort": 10000,
"protocol": "TCP"
},
@@ -783,7 +783,7 @@
},
{
"name": "RP_ENDPOINTS",
- "value": "AKKA_REMOTE,AKKA_MGMT_HTTP,HTTP"
+ "value": "PEKKO_REMOTE,PEKKO_MGMT_HTTP,HTTP"
},
{
"name": "RP_ENDPOINTS_COUNT",
@@ -868,7 +868,7 @@
"value": "10002"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -877,11 +877,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_BIND_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_HOST",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -890,11 +890,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_MGMT_HTTP_PORT",
+ "name": "RP_ENDPOINT_PEKKO_MGMT_HTTP_PORT",
"value": "10001"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -903,11 +903,11 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_BIND_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_BIND_PORT",
"value": "10000"
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_HOST",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_HOST",
"valueFrom": {
"fieldRef": {
"apiVersion": "v1",
@@ -916,7 +916,7 @@
}
},
{
- "name": "RP_ENDPOINT_AKKA_REMOTE_PORT",
+ "name": "RP_ENDPOINT_PEKKO_REMOTE_PORT",
"value": "10000"
},
{
diff --git
a/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
index 7851d1b..0dde9ab 100644
---
a/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
+++
b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/JsonFormatSpec.scala
@@ -31,7 +31,7 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(
@@ -44,7 +44,7 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(
@@ -57,7 +57,7 @@ class JsonFormatSpec extends AnyWordSpec with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(
diff --git
a/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
index 6b2bad3..7945590 100644
---
a/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
+++
b/discovery-kubernetes-api/src/test/scala/org/apache/pekko/discovery/kubernetes/KubernetesApiServiceDiscoverySpec.scala
@@ -34,7 +34,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.4"), Some(Nil), Some("Running"))),
@@ -43,7 +43,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(None, Some(Nil), Some("Running"))),
@@ -64,7 +64,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.4"), Some(Nil), Some("Running"))),
@@ -88,7 +88,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.4"), Some(Nil), Some("Running"))),
@@ -103,7 +103,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(
Container(
"pekko-cluster-tooling-example",
- Some(List(ContainerPort(Some("akka-remote"), 10000),
ContainerPort(Some("management"), 10001)))),
+ Some(List(ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001)))),
Container("sidecar", Some(List(ContainerPort(Some("http"),
10002))))))),
Some(PodStatus(Some("172.17.0.6"), Some(Nil), Some("Running"))),
Some(Metadata(deletionTimestamp = None)))))
@@ -130,7 +130,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.4"), Some(Nil), Some("Succeeded"))),
@@ -186,7 +186,7 @@ class KubernetesApiServiceDiscoverySpec extends AnyWordSpec
with Matchers {
Some(PodSpec(List(Container(
"pekko-cluster-tooling-example",
Some(List(
- ContainerPort(Some("akka-remote"), 10000),
+ ContainerPort(Some("pekko-remote"), 10000),
ContainerPort(Some("management"), 10001),
ContainerPort(Some("http"), 10002))))))),
Some(PodStatus(Some("172.17.0.4"), Some(Nil), Some("Running"))),
diff --git a/docs/src/main/paradox/bootstrap/recipes.md
b/docs/src/main/paradox/bootstrap/recipes.md
index c3b878c..db9ba2c 100644
--- a/docs/src/main/paradox/bootstrap/recipes.md
+++ b/docs/src/main/paradox/bootstrap/recipes.md
@@ -191,7 +191,7 @@ In order to observe the logs during the cluster formation
you can
pick one of the pods and issue the kubectl logs command on it:
```
-$ POD=$(kubectl get pods | grep akka-bootstrap | grep Running | head -n1 | awk
'{ print $1 }'); echo $POD
+$ POD=$(kubectl get pods | grep pekko-bootstrap | grep Running | head -n1 |
awk '{ print $1 }'); echo $POD
akka-integration-test-bcc456d8c-6qx87
$ kubectl logs $POD --follow | less
@@ -202,12 +202,12 @@ $ kubectl logs $POD --follow | less
[DEBUG] [12/13/2018 07:13:42.906] [default-akka.actor.default-dispatcher-2]
[TimerScheduler(pekko://default)] Start timer [resolve-key] with generation [1]
[DEBUG] [12/13/2018 07:13:42.919] [default-akka.actor.default-dispatcher-2]
[TimerScheduler(pekko://default)] Start timer [decide-key] with generation [2]
[INFO] [12/13/2018 07:13:42.924] [default-akka.actor.default-dispatcher-2]
[pekko.tcp://[email protected]:2552/system/bootstrapCoordinator] Locating
service members. Using discovery
[pekko.discovery.dns.DnsSimpleServiceDiscovery], join decider
[org.apache.pekko.management.cluster.bootstrap.LowestAddressJoinDecider]
-[INFO] [12/13/2018 07:13:42.933] [default-akka.actor.default-dispatcher-2]
[pekko.tcp://[email protected]:2552/system/bootstrapCoordinator] Looking up
[Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap.svc.cluster.local,Some(management),Some(tcp))]
-[DEBUG] [12/13/2018 07:13:42.936] [default-akka.actor.default-dispatcher-2]
[DnsSimpleServiceDiscovery(pekko://default)] Lookup
[Lookup(integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local,Some(management),Some(tcp))]
translated to SRV query
[_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local]
as contains portName and protocol
-[DEBUG] [12/13/2018 07:13:42.995] [default-akka.actor.default-dispatcher-18]
[pekko.tcp://[email protected]:2552/system/IO-DNS] Resolution request for
_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local
Srv from Actor[pekko://default/temp/$a]
-[DEBUG] [12/13/2018 07:13:43.011] [default-akka.actor.default-dispatcher-6]
[pekko.tcp://[email protected]:2552/system/IO-DNS/async-dns/$a] Attempting to
resolve
_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local
with Actor[pekko://default/system/IO-DNS/async-dns/$a/$a#1272991285]
+[INFO] [12/13/2018 07:13:42.933] [default-akka.actor.default-dispatcher-2]
[pekko.tcp://[email protected]:2552/system/bootstrapCoordinator] Looking up
[Lookup(integration-test-kubernetes-dns-internal.pekko-bootstrap.svc.cluster.local,Some(management),Some(tcp))]
+[DEBUG] [12/13/2018 07:13:42.936] [default-akka.actor.default-dispatcher-2]
[DnsSimpleServiceDiscovery(pekko://default)] Lookup
[Lookup(integration-test-kubernetes-dns-internal.pekko-bootstrap-demo-ns.svc.cluster.local,Some(management),Some(tcp))]
translated to SRV query
[_management._tcp.integration-test-kubernetes-dns-internal.pekko-bootstrap-demo-ns.svc.cluster.local]
as contains portName and protocol
+[DEBUG] [12/13/2018 07:13:42.995] [default-akka.actor.default-dispatcher-18]
[pekko.tcp://[email protected]:2552/system/IO-DNS] Resolution request for
_management._tcp.integration-test-kubernetes-dns-internal.pekko-bootstrap-demo-ns.svc.cluster.local
Srv from Actor[pekko://default/temp/$a]
+[DEBUG] [12/13/2018 07:13:43.011] [default-akka.actor.default-dispatcher-6]
[pekko.tcp://[email protected]:2552/system/IO-DNS/async-dns/$a] Attempting to
resolve
_management._tcp.integration-test-kubernetes-dns-internal.pekko-bootstrap-demo-ns.svc.cluster.local
with Actor[pekko://default/system/IO-DNS/async-dns/$a/$a#1272991285]
[DEBUG] [12/13/2018 07:13:43.049] [default-akka.actor.default-dispatcher-18]
[pekko.tcp://[email protected]:2552/system/IO-TCP/selectors/$a/0] Successfully
bound to /0.0.0.0:8558
-[DEBUG] [12/13/2018 07:13:43.134] [default-akka.actor.default-dispatcher-18]
[pekko.tcp://[email protected]:2552/system/IO-DNS/async-dns/$a/$a] Resolving
[_management._tcp.integration-test-kubernetes-dns-internal.akka-bootstrap-demo-ns.svc.cluster.local]
(SRV)
+[DEBUG] [12/13/2018 07:13:43.134] [default-akka.actor.default-dispatcher-18]
[pekko.tcp://[email protected]:2552/system/IO-DNS/async-dns/$a/$a] Resolving
[_management._tcp.integration-test-kubernetes-dns-internal.pekko-bootstrap-demo-ns.svc.cluster.local]
(SRV)
[INFO] [12/13/2018 07:13:43.147] [default-akka.actor.default-dispatcher-6]
[PekkoManagement(pekko://default)] Bound Pekko Management (HTTP) endpoint to:
0.0.0.0:8558
[DEBUG] [12/13/2018 07:13:43.156] [default-akka.actor.default-dispatcher-5]
[pekko.tcp://[email protected]:2552/system/IO-TCP/selectors/$a/1] Successfully
bound to /0.0.0.0:8080
[INFO] [12/13/2018 07:13:43.180] [main] [akka.actor.ActorSystemImpl(default)]
Server online at http://localhost:8080/
diff --git a/integration-test/dns-api-mesos/src/main/resources/application.conf
b/integration-test/dns-api-mesos/src/main/resources/application.conf
index 097b8df..4efe7f6 100644
--- a/integration-test/dns-api-mesos/src/main/resources/application.conf
+++ b/integration-test/dns-api-mesos/src/main/resources/application.conf
@@ -37,7 +37,7 @@ pekko {
contact-point-discovery {
# Define this name to be looked up in service discovery for
"neighboring" nodes
- # If undefined, the name will be taken from the
AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+ # If undefined, the name will be taken from the
PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
# environment variable or extracted from the ActorSystem name
service-name = ${MARATHON_APP_ID}
diff --git a/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
b/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
index a6a0336..2936490 100644
--- a/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
+++ b/integration-test/kubernetes-api-java/kubernetes/pekko-cluster.yml
@@ -43,7 +43,7 @@ spec:
# The Kubernetes API discovery will use this service name to look for
# nodes with this value in the 'app' label
# This can be customized with the 'pod-label-selector' setting.
- - name: AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+ - name: PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
valueFrom:
fieldRef:
apiVersion: v1
diff --git a/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
index c3f436c..464b058 100644
--- a/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
+++ b/integration-test/kubernetes-api/kubernetes/pekko-cluster.yml
@@ -48,7 +48,7 @@ spec:
# The Kubernetes API discovery will use this service name to look for
# nodes with this value in the 'app' label.
# This can be customized with the 'pod-label-selector' setting.
- - name: AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+ - name: PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
valueFrom:
fieldRef:
apiVersion: v1
diff --git a/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
b/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
index 4a32486..04d35d7 100644
--- a/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
+++ b/integration-test/kubernetes-dns/kubernetes/pekko-cluster.yml
@@ -53,7 +53,7 @@ spec:
fieldPath: metadata.namespace
# The DNS-based discovery will use this service name to look for the
headless
# service defined below
- - name: AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+ - name: PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
value: "integration-test-kubernetes-dns-internal"
---
diff --git
a/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
index 8f08783..1880be4 100644
---
a/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
+++
b/lease-kubernetes/src/test/scala/org/apache/pekko/coordination/lease/kubernetes/LeaseActorSpec.scala
@@ -55,8 +55,8 @@ class LeaseActorSpec
ConfigFactory.parseString("""
pekko.loggers = []
pekko.loglevel = DEBUG
- akka.stdout-loglevel = DEBUG
- akka.actor.debug.fsm = true
+ pekko.stdout-loglevel = DEBUG
+ pekko.actor.debug.fsm = true
""")))
with AnyWordSpecLike
with Matchers
diff --git a/management-cluster-bootstrap/src/main/resources/reference.conf
b/management-cluster-bootstrap/src/main/resources/reference.conf
index 59362c6..5332ae2 100644
--- a/management-cluster-bootstrap/src/main/resources/reference.conf
+++ b/management-cluster-bootstrap/src/main/resources/reference.conf
@@ -27,16 +27,16 @@ pekko.management {
contact-point-discovery {
# Define this name to be looked up in service discovery for
"neighboring" nodes
- # If undefined, the name will be taken from the
AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME
+ # If undefined, the name will be taken from the
PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME
# environment variable or extracted from the ActorSystem name
service-name = "<service-name>"
- service-name = ${?AKKA_CLUSTER_BOOTSTRAP_SERVICE_NAME}
+ service-name = ${?PEKKO_CLUSTER_BOOTSTRAP_SERVICE_NAME}
# The portName passed to discovery. This should be set to the name of
the port for Pekko Management
# If set to "", `None` is passed to the discovery mechanism and
# ${pekko.management.http.port} is assumed.
port-name = ""
- port-name= ${?AKKA_CLUSTER_BOOTSTRAP_PORT_NAME}
+ port-name= ${?PEKKO_CLUSTER_BOOTSTRAP_PORT_NAME}
# The protocol passed to discovery.
# If set to "" None is passed.
diff --git
a/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
b/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
index bb45239..c4663f0 100644
---
a/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
+++
b/management-pki/src/main/scala/org/apache/pekko/pki/kubernetes/PemManagersProvider.scala
@@ -35,7 +35,7 @@ import scala.util.Random
* INTERNAL API
* Convenience methods to ease building an SSLContext from k8s-provided PEM
files.
*/
-// Duplicate from
https://github.com/akka/akka/blob/31f654768f86db68f4c22daa2cbd0bae28fc1fad/akka-remote/src/main/scala/org/apache/pekko/remote/artery/tcp/ssl/PemManagersProvider.scala#L35
+// Duplicate from
https://github.com/akka/akka/blob/31f654768f86db68f4c22daa2cbd0bae28fc1fad/akka-remote/src/main/scala/akka/remote/artery/tcp/ssl/PemManagersProvider.scala#L35
// Eventually that will be a bit more open and we can reuse the class from
Pekko in pekko-management.
// See also https://github.com/akka/akka-http/issues/3772
@InternalApi
diff --git
a/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala
b/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala
index 4013460..30a8252 100644
---
a/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala
+++
b/management/src/main/scala/org/apache/pekko/management/scaladsl/PekkoManagement.scala
@@ -133,8 +133,8 @@ final class PekkoManagement(implicit private[pekko] val
system: ExtendedActorSys
val effectiveProviderSettings = transformSettings(providerSettings)
// TODO instead of binding to hardcoded things here, discovery could
also be used for this binding!
- // Basically: "give me the SRV host/port for the port called
`akka-bootstrap`"
- // discovery.lookup("_akka-bootstrap" +
".effective-name.default").find(myaddress)
+ // Basically: "give me the SRV host/port for the port called
`pekko-bootstrap`"
+ // discovery.lookup("_pekko-bootstrap" +
".effective-name.default").find(myaddress)
// ----
// FIXME -- think about the style of how we want to make these
available
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
