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

Set protocol for ports #196

Merged
eed3si9n merged 2 commits into from
Feb 4, 2019
Merged

Set protocol for ports #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee64016
Set protocol for ports
eed3si9n Feb 4, 2019
6441144
generate project name dynamically
eed3si9n Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@ jobs:
- sudo apt-get install -y bc build-essential clang-3.9 libcurl4-openssl-dev libgc-dev libre2-dev libunwind8-dev
- script/install-oc.sh
before_script:
- export OC_PROJECT=orchestration-$(date "+%Y%m%d-%H%M%S")
- oc login -u $OC_USERNAME -p $OC_PASSWORD centralpark.lightbend.com > /dev/null
- oc new-project reactivelibtest1 || oc project reactivelibtest1
- oc new-project $OC_PROJECT || oc project $OC_PROJECT
- export OC_TOKEN=$(oc serviceaccounts get-token default)
- echo "$OC_TOKEN" | docker login -u unused --password-stdin docker-registry-default.centralpark.lightbend.com
- oc status
script: sbt -Ddeckhand.openshift cliNative/nativeLink integrationTest/scripted
after_script:
- oc delete project reactivelibtest1
- oc delete project $OC_PROJECT

stages:
- name: openshift-test
Expand Down
18 changes: 13 additions & 5 deletions cli/shared/src/main/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/PodTemplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ object PodTemplate {
s"-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=$managementEndpointName",
appName match {
case Some(name) => s"-Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=$name-internal"
case _ => sys.error("appName was expected")
case _ => sys.error("appName was expected")
})
}) ++
List(
Expand Down Expand Up @@ -253,10 +253,18 @@ object PodTemplate {
.asJson
}

implicit def assignedEncode = EncodeJson[AssignedPort] { assigned =>
Json(
"containerPort" -> assigned.port.asJson,
"name" -> serviceName(assigned.endpoint.name).asJson)
implicit def assignedEncode: EncodeJson[AssignedPort] = EncodeJson[AssignedPort] { assigned =>
assigned.endpoint match {
case UdpEndpoint(_, _, _) =>
Json(
"containerPort" -> assigned.port.asJson,
"name" -> serviceName(assigned.endpoint.name).asJson,
"protocol" -> "UDP".asJson)
case _ =>
Json(
"containerPort" -> assigned.port.asJson,
"name" -> serviceName(assigned.endpoint.name).asJson)
}
}

implicit def endpointsEncode = EncodeJson[Map[String, Endpoint]] { endpoints =>
Expand Down
15 changes: 8 additions & 7 deletions ...d/src/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/DeploymentJsonTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ object DeploymentJsonTest extends TestSuite {
| },
| {
| "containerPort": 10001,
| "name": "ep3"
| "name": "ep3",
| "protocol": "UDP"
| }
| ],
| "resources": {
Expand Down Expand Up @@ -277,8 +278,7 @@ object DeploymentJsonTest extends TestSuite {
assert(javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.discovery-method=kubernetes-api") &&
javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management") &&
javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl") &&
javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s")
)
javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s"))
})
}

Expand Down Expand Up @@ -308,8 +308,7 @@ object DeploymentJsonTest extends TestSuite {
javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.service-name=friendimpl-internal") &&
javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.port-name=management") &&
!javaOpts.contains("-Dakka.management.cluster.bootstrap.contact-point-discovery.effective-name=friendimpl") &&
!javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s")
)
!javaOpts.contains("-Dakka.discovery.kubernetes-api.pod-label-selector=akka.lightbend.com/service-name=%s"))
})
}

Expand Down Expand Up @@ -379,7 +378,8 @@ object DeploymentJsonTest extends TestSuite {
| },
| {
| "containerPort": 10001,
| "name": "ep3"
| "name": "ep3",
| "protocol": "UDP"
| }
| ],
| "resources": {
Expand Down Expand Up @@ -665,7 +665,8 @@ object DeploymentJsonTest extends TestSuite {
"""
|{
| "containerPort": 9999,
| "name": "ep1"
| "name": "ep1",
| "protocol": "UDP"
|}
""".stripMargin.parse.right.get
val generatedJson = assigned.asJson
Expand Down
6 changes: 4 additions & 2 deletions ...rc/test/scala/com/lightbend/rp/reactivecli/runtime/kubernetes/KubernetesPackageTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ object KubernetesPackageTest extends TestSuite {
| },
| {
| "containerPort": 1234,
| "name": "ep5"
| "name": "ep5",
| "protocol": "UDP"
| }
| ]
| }
Expand Down Expand Up @@ -551,7 +552,8 @@ object KubernetesPackageTest extends TestSuite {
| },
| {
| "containerPort": 1234,
| "name": "ep5"
| "name": "ep5",
| "protocol": "UDP"
| }
| ]
| }
Expand Down
4 changes: 2 additions & 2 deletions integration-test/src/sbt-test/bootstrap-demo/kubernetes-api/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ lazy val root = (project in file("."))
val s = streams.value
val nm = name.value
val v = version.value
val namespace = "reactivelibtest1"
val namespace = sys.env.get("OC_PROJECT").getOrElse("reactivelibtest1")
val rpPath = file(sys.props("reactiveclipath")) / "reactive-cli-out"
val out = Process(s"$rpPath generate-kubernetes-resources --registry-use-local --generate-all --discovery-method kubernetes-api $nm:$v --pod-controller-replicas 3").!!
val x =
Expand All @@ -61,7 +61,7 @@ lazy val root = (project in file("."))
val s = streams.value
val nm = name.value
val v = version.value
val namespace = "reactivelibtest1"
val namespace = sys.env.get("OC_PROJECT").getOrElse("reactivelibtest1")
val kubectl = Deckhand.kubectl(s.log)
val docker = Deckhand.docker(s.log)
val yamlDir = baseDirectory.value / "kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions integration-test/src/sbt-test/bootstrap-demo/kubernetes-dns/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ lazy val root = (project in file("."))
val s = streams.value
val nm = name.value
val v = version.value
val namespace = "reactivelibtest1"
val namespace = sys.env.get("OC_PROJECT").getOrElse("reactivelibtest1")
val rpPath = file(sys.props("reactiveclipath")) / "reactive-cli-out"
val out = Process(s"$rpPath generate-kubernetes-resources --registry-use-local --generate-all $nm:$v --pod-controller-replicas 3 --stacktrace").!!
val x =
Expand All @@ -60,7 +60,7 @@ lazy val root = (project in file("."))
val s = streams.value
val nm = name.value
val v = version.value
val namespace = "reactivelibtest1"
val namespace = sys.env.get("OC_PROJECT").getOrElse("reactivelibtest1")
val kubectl = Deckhand.kubectl(s.log)
val docker = Deckhand.docker(s.log)

Expand Down