diff --git a/gradle-plugin/it/src/it/autotls/expected/openshift.yml b/gradle-plugin/it/src/it/autotls/expected/openshift.yml index e28e0c93d9..cc87876b34 100644 --- a/gradle-plugin/it/src/it/autotls/expected/openshift.yml +++ b/gradle-plugin/it/src/it/autotls/expected/openshift.yml @@ -142,7 +142,7 @@ items: name: autotls spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: autotls \ No newline at end of file diff --git a/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml b/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml index 60450645cd..7ca348b1ee 100644 --- a/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml +++ b/gradle-plugin/it/src/it/dockerfile-simple/expected/openshift.yml @@ -89,7 +89,7 @@ items: name: dockerfile-simple spec: port: - targetPort: 9080 + targetPort: glrpc to: kind: Service name: dockerfile-simple diff --git a/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation-enricher/openshift.yml b/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation-enricher/openshift.yml index 189d1237d1..03eb501d98 100644 --- a/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation-enricher/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation-enricher/openshift.yml @@ -134,7 +134,7 @@ items: name: expose spec: port: - targetPort: 21 + targetPort: ftp to: kind: Service name: expose diff --git a/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation/openshift.yml b/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation/openshift.yml index 189d1237d1..03eb501d98 100644 --- a/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/ftp-port-expose-annotation/openshift.yml @@ -134,7 +134,7 @@ items: name: expose spec: port: - targetPort: 21 + targetPort: ftp to: kind: Service name: expose diff --git a/gradle-plugin/it/src/it/expose/expected/ftp-port-external/openshift.yml b/gradle-plugin/it/src/it/expose/expected/ftp-port-external/openshift.yml index dc0a6bfc91..9464e4efae 100644 --- a/gradle-plugin/it/src/it/expose/expected/ftp-port-external/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/ftp-port-external/openshift.yml @@ -132,7 +132,7 @@ items: name: expose spec: port: - targetPort: 21 + targetPort: ftp to: kind: Service name: expose diff --git a/gradle-plugin/it/src/it/expose/expected/http-port-external/openshift.yml b/gradle-plugin/it/src/it/expose/expected/http-port-external/openshift.yml index fafc7378c0..8c9ac20329 100644 --- a/gradle-plugin/it/src/it/expose/expected/http-port-external/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/http-port-external/openshift.yml @@ -132,7 +132,7 @@ items: name: expose spec: port: - targetPort: 80 + targetPort: http to: kind: Service name: expose diff --git a/gradle-plugin/it/src/it/expose/expected/http-port/openshift.yml b/gradle-plugin/it/src/it/expose/expected/http-port/openshift.yml index fafc7378c0..8c9ac20329 100644 --- a/gradle-plugin/it/src/it/expose/expected/http-port/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/http-port/openshift.yml @@ -132,7 +132,7 @@ items: name: expose spec: port: - targetPort: 80 + targetPort: http to: kind: Service name: expose diff --git a/gradle-plugin/it/src/it/expose/expected/multiple-services/openshift.yml b/gradle-plugin/it/src/it/expose/expected/multiple-services/openshift.yml index 2fee0a99fe..e35de3bc04 100644 --- a/gradle-plugin/it/src/it/expose/expected/multiple-services/openshift.yml +++ b/gradle-plugin/it/src/it/expose/expected/multiple-services/openshift.yml @@ -230,7 +230,7 @@ items: name: expose spec: port: - targetPort: 443 + targetPort: https to: kind: Service name: expose @@ -256,7 +256,7 @@ items: name: ssh spec: port: - targetPort: 22 + targetPort: ssh to: kind: Service name: ssh diff --git a/gradle-plugin/it/src/it/helidon/expected/openshift.yml b/gradle-plugin/it/src/it/helidon/expected/openshift.yml index 36fdb46151..53100c9584 100644 --- a/gradle-plugin/it/src/it/helidon/expected/openshift.yml +++ b/gradle-plugin/it/src/it/helidon/expected/openshift.yml @@ -137,7 +137,7 @@ items: name: helidon spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: helidon diff --git a/gradle-plugin/it/src/it/initcontainers/expected/openshift.yml b/gradle-plugin/it/src/it/initcontainers/expected/openshift.yml index 885cb024b3..2b963ac3de 100644 --- a/gradle-plugin/it/src/it/initcontainers/expected/openshift.yml +++ b/gradle-plugin/it/src/it/initcontainers/expected/openshift.yml @@ -126,7 +126,7 @@ items: name: initcontainers spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: initcontainers diff --git a/gradle-plugin/it/src/it/metadata/expected/openshift.yml b/gradle-plugin/it/src/it/metadata/expected/openshift.yml index f98227b576..78a6c86e94 100644 --- a/gradle-plugin/it/src/it/metadata/expected/openshift.yml +++ b/gradle-plugin/it/src/it/metadata/expected/openshift.yml @@ -156,7 +156,7 @@ items: name: metadata spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: metadata diff --git a/gradle-plugin/it/src/it/multiple-services/expected/openshift.yml b/gradle-plugin/it/src/it/multiple-services/expected/openshift.yml index cacb26f9c7..e764eaca35 100644 --- a/gradle-plugin/it/src/it/multiple-services/expected/openshift.yml +++ b/gradle-plugin/it/src/it/multiple-services/expected/openshift.yml @@ -179,7 +179,7 @@ items: name: multiple-services spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: multiple-services diff --git a/gradle-plugin/it/src/it/openliberty/expected/openshift.yml b/gradle-plugin/it/src/it/openliberty/expected/openshift.yml index 921030db00..af507a80b0 100644 --- a/gradle-plugin/it/src/it/openliberty/expected/openshift.yml +++ b/gradle-plugin/it/src/it/openliberty/expected/openshift.yml @@ -137,7 +137,7 @@ items: name: openliberty spec: port: - targetPort: 9080 + targetPort: glrpc to: kind: Service name: openliberty diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml index 488c8bda4c..d0fbb1e2b6 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/liveness-readiness/openshift.yml @@ -151,7 +151,7 @@ items: name: probes-groovy-dsl-config spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: probes-groovy-dsl-config diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml index 1352c08d20..469283078c 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/none/openshift.yml @@ -119,7 +119,7 @@ items: name: probes-groovy-dsl-config spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: probes-groovy-dsl-config diff --git a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml index b65ed95fb4..6f84bef580 100644 --- a/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml +++ b/gradle-plugin/it/src/it/probes-groovy-dsl-config/expected/startup/openshift.yml @@ -127,7 +127,7 @@ items: name: probes-groovy-dsl-config spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: probes-groovy-dsl-config diff --git a/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml index edd7352665..2acc7dfcd1 100644 --- a/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/app/openshift.yml @@ -110,7 +110,7 @@ items: name: project-label spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: project-label diff --git a/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml index 6a56de14b5..fd766595f8 100644 --- a/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/custom/openshift.yml @@ -109,7 +109,7 @@ items: name: project-label spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: project-label diff --git a/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml index b3cc6ec6fb..4a18233f4e 100644 --- a/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/default/openshift.yml @@ -109,7 +109,7 @@ items: name: project-label spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: project-label diff --git a/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml index 2c1e061abc..26e64290bf 100644 --- a/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/group/openshift.yml @@ -109,7 +109,7 @@ items: name: project-label spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: project-label diff --git a/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml b/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml index f39291f68c..f1576ed6fe 100644 --- a/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml +++ b/gradle-plugin/it/src/it/project-label/expected/version/openshift.yml @@ -109,7 +109,7 @@ items: name: project-label spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: project-label diff --git a/gradle-plugin/it/src/it/route-name-fragment/expected/openshift.yml b/gradle-plugin/it/src/it/route-name-fragment/expected/openshift.yml index 4a09d20d47..ca3a8e7195 100644 --- a/gradle-plugin/it/src/it/route-name-fragment/expected/openshift.yml +++ b/gradle-plugin/it/src/it/route-name-fragment/expected/openshift.yml @@ -110,7 +110,7 @@ items: name: customized-name spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: customized-name diff --git a/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml b/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml index 95eda79fa0..44da9f56a1 100644 --- a/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml +++ b/gradle-plugin/it/src/it/route/expected/routeEnabled/openshift.yml @@ -110,7 +110,7 @@ items: name: route spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: route diff --git a/gradle-plugin/it/src/it/service-name-fragment/expected/openshift.yml b/gradle-plugin/it/src/it/service-name-fragment/expected/openshift.yml index f7c2ccefd1..7f58d70b19 100644 --- a/gradle-plugin/it/src/it/service-name-fragment/expected/openshift.yml +++ b/gradle-plugin/it/src/it/service-name-fragment/expected/openshift.yml @@ -106,7 +106,7 @@ items: name: customized-name spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: customized-name diff --git a/gradle-plugin/it/src/it/service-name/expected/openshift.yml b/gradle-plugin/it/src/it/service-name/expected/openshift.yml index 63ce0bd1b1..d1732741f1 100644 --- a/gradle-plugin/it/src/it/service-name/expected/openshift.yml +++ b/gradle-plugin/it/src/it/service-name/expected/openshift.yml @@ -106,7 +106,7 @@ items: name: customized-name spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: customized-name diff --git a/gradle-plugin/it/src/it/service/expected/openshift.yml b/gradle-plugin/it/src/it/service/expected/openshift.yml index a20fa75f84..8945d0e7c2 100644 --- a/gradle-plugin/it/src/it/service/expected/openshift.yml +++ b/gradle-plugin/it/src/it/service/expected/openshift.yml @@ -133,7 +133,7 @@ items: name: svc1 spec: port: - targetPort: 8080 + targetPort: port1 to: kind: Service name: svc1 diff --git a/gradle-plugin/it/src/it/smallrye-health/expected/openshift.yml b/gradle-plugin/it/src/it/smallrye-health/expected/openshift.yml index eb882d4dae..64dfa55144 100644 --- a/gradle-plugin/it/src/it/smallrye-health/expected/openshift.yml +++ b/gradle-plugin/it/src/it/smallrye-health/expected/openshift.yml @@ -137,7 +137,7 @@ items: name: smallrye-health spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: smallrye-health diff --git a/gradle-plugin/it/src/it/well-known-labels/expected/custom/openshift.yml b/gradle-plugin/it/src/it/well-known-labels/expected/custom/openshift.yml index 3599ed853d..01f2ef8692 100644 --- a/gradle-plugin/it/src/it/well-known-labels/expected/custom/openshift.yml +++ b/gradle-plugin/it/src/it/well-known-labels/expected/custom/openshift.yml @@ -137,7 +137,7 @@ items: name: well-known-labels spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: well-known-labels diff --git a/gradle-plugin/it/src/it/well-known-labels/expected/default/openshift.yml b/gradle-plugin/it/src/it/well-known-labels/expected/default/openshift.yml index 69e4eebf78..b0e9ccd830 100644 --- a/gradle-plugin/it/src/it/well-known-labels/expected/default/openshift.yml +++ b/gradle-plugin/it/src/it/well-known-labels/expected/default/openshift.yml @@ -131,7 +131,7 @@ items: name: well-known-labels spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: well-known-labels diff --git a/gradle-plugin/it/src/it/well-known-labels/expected/disabled/openshift.yml b/gradle-plugin/it/src/it/well-known-labels/expected/disabled/openshift.yml index 0665baffcb..14d87129f5 100644 --- a/gradle-plugin/it/src/it/well-known-labels/expected/disabled/openshift.yml +++ b/gradle-plugin/it/src/it/well-known-labels/expected/disabled/openshift.yml @@ -109,7 +109,7 @@ items: name: well-known-labels spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: well-known-labels diff --git a/gradle-plugin/it/src/it/well-known-labels/expected/labelsViaResourceConfig/openshift.yml b/gradle-plugin/it/src/it/well-known-labels/expected/labelsViaResourceConfig/openshift.yml index b93be39e80..356cdc8c11 100644 --- a/gradle-plugin/it/src/it/well-known-labels/expected/labelsViaResourceConfig/openshift.yml +++ b/gradle-plugin/it/src/it/well-known-labels/expected/labelsViaResourceConfig/openshift.yml @@ -138,7 +138,7 @@ items: name: well-known-labels spec: port: - targetPort: 8080 + targetPort: http to: kind: Service name: well-known-labels diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java index 39f87f9428..0d9bba764d 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java @@ -611,7 +611,7 @@ private String ensureProtocol(ServicePort port) { return protocol; } - private static ServicePort getServicePortToExpose(ServiceBuilder serviceBuilder){ + public static ServicePort getServicePortToExpose(ServiceBuilder serviceBuilder){ ServiceSpec spec = serviceBuilder.buildSpec(); if (spec != null) { final List ports = spec.getPorts(); @@ -637,12 +637,4 @@ public static Integer getPortToExpose(ServiceBuilder serviceBuilder) { } return servicePort.getPort(); } - - public static Integer getTargetPortToExpose(ServiceBuilder serviceBuilder) { - ServicePort servicePort = getServicePortToExpose(serviceBuilder); - if (servicePort == null || servicePort.getTargetPort() == null){ - return null; - } - return servicePort.getTargetPort().getIntVal(); - } } diff --git a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java index 82a715ce16..a9f2f32435 100644 --- a/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java +++ b/jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java @@ -14,6 +14,7 @@ package org.eclipse.jkube.enricher.generic.openshift; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.openshift.api.model.RouteSpec; import org.eclipse.jkube.kit.common.Configs; import org.eclipse.jkube.kit.common.util.FileUtil; @@ -37,8 +38,7 @@ import java.util.Objects; -import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getPortToExpose; -import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getTargetPortToExpose; +import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getServicePortToExpose; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.mergeMetadata; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.mergeSimpleFields; import static org.eclipse.jkube.kit.enricher.api.util.KubernetesResourceUtil.removeItemFromKubernetesBuilder; @@ -122,14 +122,33 @@ private void addRoute(KubernetesListBuilder listBuilder, ServiceBuilder serviceB } private static RoutePort createRoutePort(ServiceBuilder serviceBuilder) { + RoutePort routePort = null; - final Integer serviceTargetPort = getTargetPortToExpose(serviceBuilder); - final Integer servicePort = serviceTargetPort != null ? serviceTargetPort : getPortToExpose(serviceBuilder); - if (servicePort != null) { - routePort = new RoutePort(); + final ServicePort servicePortToExpose = getServicePortToExpose(serviceBuilder); + + if(servicePortToExpose == null){ + return null; + } + + routePort = new RoutePort(); + final String sevicePortName = servicePortToExpose.getName(); + + if(sevicePortName != null){ + routePort.setTargetPort(new IntOrString(sevicePortName)); + return routePort; + } + final IntOrString serviceTargetPort = servicePortToExpose.getTargetPort(); + if(serviceTargetPort.getValue() != null){ + routePort.setTargetPort(serviceTargetPort); + return routePort; + } + + final Integer servicePort = servicePortToExpose.getPort(); + if(servicePort != null){ routePort.setTargetPort(new IntOrString(servicePort)); + return routePort; } - return routePort; + return null; } private String prepareHostForRoute(String routeDomainPostfix, String name) { diff --git a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherTest.java b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherTest.java index 78e5e42d6a..ce4ed2af1e 100644 --- a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherTest.java +++ b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherTest.java @@ -96,8 +96,8 @@ void create_withDefaultsAndRouteDomainInOpenShift_shouldAddRouteWithDomainPostfi .containsExactly("Service", "Route") ) .last() - .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.intVal") - .contains("test-svc", "test-svc.jkube.eclipse.org", "Service", "test-svc", 8080); + .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.value") + .contains("test-svc", "test-svc.jkube.eclipse.org", "Service", "test-svc", "http"); } @Test @@ -173,8 +173,8 @@ void create_opinionatedRouteFromService() { // Then assertThat(route).isNotNull() - .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.intVal") - .contains("test-svc", "example.com", "Service", "test-svc", 8080); + .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.value") + .contains("test-svc", "example.com", "Service", "test-svc", "http"); } @Test @@ -291,8 +291,8 @@ void routeTargetPortFromServicePort() { // Then assertThat(route).isNotNull() - .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.intVal") - .contains("test-svc", "example.com", "Service", "test-svc", 8080); + .extracting("metadata.name", "spec.host", "spec.to.kind", "spec.to.name", "spec.port.targetPort.value") + .contains("test-svc", "example.com", "Service", "test-svc", "http"); } @Test diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml index 9020e6987e..c96832de0c 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-different-namespace/openshift.yml @@ -137,7 +137,7 @@ items: namespace: namespace-to-operate spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: project \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml index 7e1f665dca..4fb1035598 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project-and-set-namespace/openshift.yml @@ -137,7 +137,7 @@ items: namespace: project-to-create-and-operate spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: project \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml index 65615445ea..a7d7d650a1 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/create-project/openshift.yml @@ -134,7 +134,7 @@ items: name: project spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: project \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml index 674c174a62..a857163ae6 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/default/openshift.yml @@ -123,7 +123,7 @@ items: name: project spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: project \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml b/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml index 0ae7e0dc03..b4c5fd2a38 100644 --- a/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml +++ b/openshift-maven-plugin/it/src/it/project/expected/set-namespace/openshift.yml @@ -126,7 +126,7 @@ items: namespace: namespace-to-operate spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: project \ No newline at end of file diff --git a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml index 173f0231db..d8e81a8cb6 100644 --- a/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/simple-with-route-flag-true/expected/openshift.yml @@ -122,7 +122,7 @@ items: name: jkube-maven-sample-zero-config spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: jkube-maven-sample-zero-config diff --git a/openshift-maven-plugin/it/src/it/statefulset/expected/openshift.yml b/openshift-maven-plugin/it/src/it/statefulset/expected/openshift.yml index 41daa02b02..6aa7f34154 100644 --- a/openshift-maven-plugin/it/src/it/statefulset/expected/openshift.yml +++ b/openshift-maven-plugin/it/src/it/statefulset/expected/openshift.yml @@ -46,7 +46,7 @@ items: name: jkube-maven-sample-statefulset spec: port: - targetPort: 8080 + targetPort: "http" to: kind: Service name: jkube-maven-sample-statefulset