This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new c016265c try to fix ports for rolling updates tests (#807)
c016265c is described below
commit c016265c2650c2ecce5df24027ad6054cc84415a
Author: PJ Fanning <[email protected]>
AuthorDate: Sun May 31 12:28:43 2026 +0100
try to fix ports for rolling updates tests (#807)
* try to fix ports for rolling updates tests
* Update integration test workflow triggers
Remove pull_request trigger from the workflow.
* Fix rolling-update-kubernetes app-version integration tests (#13)
Co-authored-by: copilot-swe-agent[bot]
<[email protected]>
* standardise on pekko-rolling-update-demo
* Update integration tests workflow triggers
Remove pull_request trigger from integration tests workflow.
---------
Co-authored-by: Copilot <[email protected]>
---
.github/workflows/integration-tests-rolling-update-cr.yml | 1 +
build.sbt | 2 +-
integration-test/rolling-update-kubernetes/build.sbt | 2 +-
.../kubernetes/pekko-cluster-app-value-revision.yml | 14 +++++++-------
.../kubernetes/pekko-cluster-cr.yml | 2 +-
.../rolling-update-kubernetes/kubernetes/pekko-cluster.yml | 2 +-
.../src/main/resources/application.conf | 12 ++++++------
.../rolling-update-kubernetes/test-app-version-revision.sh | 4 ++--
.../scripts/app-version-revision-kubernetes-test.sh | 4 ++--
rolling-update-kubernetes/pod-cost-example.yml | 4 ++--
.../pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala | 4 ++--
11 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/integration-tests-rolling-update-cr.yml
b/.github/workflows/integration-tests-rolling-update-cr.yml
index c9025990..fe245492 100644
--- a/.github/workflows/integration-tests-rolling-update-cr.yml
+++ b/.github/workflows/integration-tests-rolling-update-cr.yml
@@ -12,6 +12,7 @@ on:
push:
branches:
- main
+ pull_request:
workflow_dispatch:
permissions:
diff --git a/build.sbt b/build.sbt
index a427b541..c1f29220 100644
--- a/build.sbt
+++ b/build.sbt
@@ -241,7 +241,7 @@ lazy val integrationTestRollingUpdateKubernetes =
pekkoIntTestModule("rolling-up
libraryDependencies := Dependencies.bootstrapDemos,
version ~= (_.replace('+', '-')),
dockerUpdateLatest := true,
- dockerExposedPorts := Seq(8080, 8558, 2552))
+ dockerExposedPorts := Seq(8080, 7626, 7355))
.dependsOn(rollingUpdateKubernetes, management, managementClusterHttp,
managementClusterBootstrap,
discoveryKubernetesApi)
.enablePlugins(NoPublish)
diff --git a/integration-test/rolling-update-kubernetes/build.sbt
b/integration-test/rolling-update-kubernetes/build.sbt
index 7684b719..aeb3ab93 100644
--- a/integration-test/rolling-update-kubernetes/build.sbt
+++ b/integration-test/rolling-update-kubernetes/build.sbt
@@ -13,7 +13,7 @@ enablePlugins(JavaAppPackaging, DockerPlugin)
version := "1.3.3.7" // we hard-code the version here, it could be anything
really
-dockerExposedPorts := Seq(8080, 8558, 2552)
+dockerExposedPorts := Seq(8080, 7626, 7355)
dockerBaseImage := "eclipse-temurin:17-jre-alpine"
dockerCommands ++= Seq(
diff --git
a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-app-value-revision.yml
b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-app-value-revision.yml
index 32511944..59efaaac 100644
---
a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-app-value-revision.yml
+++
b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-app-value-revision.yml
@@ -2,13 +2,13 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
- app: pekko-rollingupdate-demo
- name: pekko-rollingupdate-demo
+ app: pekko-rolling-update-demo
+ name: pekko-rolling-update-demo
spec:
replicas: 3
selector:
matchLabels:
- app: pekko-rollingupdate-demo
+ app: pekko-rolling-update-demo
strategy:
rollingUpdate:
maxSurge: 1
@@ -18,11 +18,11 @@ spec:
template:
metadata:
labels:
- app: pekko-rollingupdate-demo
- actorSystemName: pekko-rollingupdate-demo
+ app: pekko-rolling-update-demo
+ actorSystemName: pekko-rolling-update-demo
spec:
containers:
- - name: pekko-rollingupdate-demo
+ - name: pekko-rolling-update-demo
image: integration-test-rolling-update-kubernetes:1.3.3.7
# Remove for a real project, the image is picked up locally for the
integration test
imagePullPolicy: Never
@@ -39,7 +39,7 @@ spec:
ports:
# pekko-management bootstrap
- name: management
- containerPort: 8558
+ containerPort: 7626
protocol: TCP
- name: http
containerPort: 8080
diff --git
a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-cr.yml
b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-cr.yml
index 90cefd2c..576cedcb 100644
--- a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-cr.yml
+++ b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-cr.yml
@@ -46,7 +46,7 @@ spec:
ports:
# pekko-management bootstrap
- name: management
- containerPort: 8558
+ containerPort: 7626
protocol: TCP
- name: http
containerPort: 8080
diff --git
a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster.yml
b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster.yml
index e09af9e4..040016fa 100644
--- a/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster.yml
+++ b/integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster.yml
@@ -40,7 +40,7 @@ spec:
ports:
# pekko-management bootstrap
- name: management
- containerPort: 8558
+ containerPort: 7626
protocol: TCP
- name: http
containerPort: 8080
diff --git
a/integration-test/rolling-update-kubernetes/src/main/resources/application.conf
b/integration-test/rolling-update-kubernetes/src/main/resources/application.conf
index d71beef2..069bd4dd 100644
---
a/integration-test/rolling-update-kubernetes/src/main/resources/application.conf
+++
b/integration-test/rolling-update-kubernetes/src/main/resources/application.conf
@@ -7,16 +7,16 @@ pekko {
actor.provider = cluster
}
-pekko.discovery {
- kubernetes-api {
- pod-label-selector = "app=%s"
- }
-}
-
pekko.management {
cluster.bootstrap {
contact-point-discovery {
discovery-method = kubernetes-api
+ required-contact-point-nr = ${REQUIRED_CONTACT_POINT_NR}
}
}
}
+
+pekko.rollingupdate.kubernetes {
+ # for documentation purposes, 3 is the default anyway
+ pod-deletion-cost.annotated-pods-nr = 3
+}
diff --git
a/integration-test/rolling-update-kubernetes/test-app-version-revision.sh
b/integration-test/rolling-update-kubernetes/test-app-version-revision.sh
index a4a3973f..b431a79f 100755
--- a/integration-test/rolling-update-kubernetes/test-app-version-revision.sh
+++ b/integration-test/rolling-update-kubernetes/test-app-version-revision.sh
@@ -9,8 +9,8 @@
#
set -exu
-export NAMESPACE=pekko-rollingupdate-demo-ns
-export APP_NAME=pekko-rollingupdate-demo
+export NAMESPACE=pekko-rolling-update-demo-ns
+export APP_NAME=pekko-rolling-update-demo
export PROJECT_NAME=integration-test-rolling-update-kubernetes
export
DEPLOYMENT=integration-test/rolling-update-kubernetes/kubernetes/pekko-cluster-app-value-revision.yml
diff --git a/integration-test/scripts/app-version-revision-kubernetes-test.sh
b/integration-test/scripts/app-version-revision-kubernetes-test.sh
index 8e8f0d0f..acbcd40a 100755
--- a/integration-test/scripts/app-version-revision-kubernetes-test.sh
+++ b/integration-test/scripts/app-version-revision-kubernetes-test.sh
@@ -34,7 +34,7 @@ testRevisionInPodsLog () {
if [ $i -eq 20 ]
then
echo "Pods did not get ready (revision $1)"
- kubectl -n $NAMESPACE describe deployment pekko-rollingupdate-demo
+ kubectl -n $NAMESPACE describe deployment pekko-rolling-update-demo
exit -1
fi
@@ -63,7 +63,7 @@ testRevisionInPodsLog () {
# prep
docker images | head
kubectl create namespace $NAMESPACE || true
-kubectl -n $NAMESPACE delete deployment pekko-rollingupdate-demo || true
+kubectl -n $NAMESPACE delete deployment pekko-rolling-update-demo || true
kubectl -n $NAMESPACE apply -f $DEPLOYMENT
# after the initial deployment
diff --git a/rolling-update-kubernetes/pod-cost-example.yml
b/rolling-update-kubernetes/pod-cost-example.yml
index 4c58cd59..9f421c29 100644
--- a/rolling-update-kubernetes/pod-cost-example.yml
+++ b/rolling-update-kubernetes/pod-cost-example.yml
@@ -4,12 +4,12 @@ metadata:
name: sampleservice
spec:
pods:
- - address: pekko://[email protected]:2552
+ - address: pekko://[email protected]:7355
cost: 10000
podName: "pod1"
time: 1681909802669
uid: 3870636288020406585
- - address: pekko://[email protected]:2552
+ - address: pekko://[email protected]:7355
cost: 9900
podName: "pod2"
time: 1681909802716
diff --git
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
index a43ec027..fde99697 100644
---
a/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
+++
b/rolling-update-kubernetes/src/main/scala/org/apache/pekko/rollingupdate/kubernetes/KubernetesApiImpl.scala
@@ -327,8 +327,8 @@ PUTs must contain resourceVersions. Response:
/**
* Start a proxy in local minikube:
* - kubectl proxy --port=8080
- * - replic_set_name=$(curl -s
http://localhost:8080/api/v1/namespaces/pekko-rollingupdate-demo-ns/pods | jq
'.items[0].metadata.ownerReferences[0].name'| tr -d '"')
- * - revision=$(curl -s
http://localhost:8080/apis/apps/v1/namespaces/pekko-rollingupdate-demo-ns/replicasets/"$replic_set_name";
| jq '.metadata.annotations["deployment.kubernetes.io/revision"]'| tr -d '"')
+ * - replic_set_name=$(curl -s
http://localhost:8080/api/v1/namespaces/pekko-rolling-update-demo-ns/pods | jq
'.items[0].metadata.ownerReferences[0].name'| tr -d '"')
+ * - revision=$(curl -s
http://localhost:8080/apis/apps/v1/namespaces/pekko-rolling-update-demo-ns/replicasets/"$replic_set_name";
| jq '.metadata.annotations["deployment.kubernetes.io/revision"]'| tr -d '"')
*/
override def readRevision(): Future[String] = {
val maxTries = 5
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
