OpenShift route generator: prefer port name over port number for targ…

…etPort when it's possible

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

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

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

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

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

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

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

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

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

gradle-plugin/it/src/it/image-pull-secrets/expected/openshift.yml

@@ -135,7 +135,7 @@ items:
       name: image-pull-secrets
     spec:
       port:
-        targetPort: 8080
+        targetPort: http
       to:
         kind: Service
         name: image-pull-secrets

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

gradle-plugin/it/src/it/spring-boot-managementhealthprobes/expected/openshift.yml

@@ -157,7 +157,7 @@ items:
     name: spring-boot-managementhealthprobes
   spec:
     port:
-      targetPort: 8080
+      targetPort: http
     to:
       kind: Service
       name: spring-boot-managementhealthprobes

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

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

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

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

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<ServicePort> 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();
-    }
 }

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;
@@ -121,14 +121,23 @@ 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();
-            routePort.setTargetPort(new IntOrString(servicePort));
+    private static RoutePort createRoutePort(ServicePort servicePortToExpose) {
+        RoutePort routePort = new RoutePort();
+        final String servicePortName = servicePortToExpose.getName();
+
+        if(servicePortName != null){
+            routePort.setTargetPort(new IntOrString(servicePortName));
+            return routePort;
+        }
+
+        final IntOrString serviceTargetPort = servicePortToExpose.getTargetPort();
+        if( serviceTargetPort != null && serviceTargetPort.getValue() != null){
+            routePort.setTargetPort(serviceTargetPort);
+            return routePort;
         }
+
+        final Integer servicePort =  servicePortToExpose.getPort();
+        routePort.setTargetPort(new IntOrString(servicePort));
         return routePort;
     }
 
@@ -224,8 +233,17 @@ private static void handleTlsTermination(RouteBuilder routeBuilder, String tlsTe
     static Route createOpinionatedRouteFromService(ServiceBuilder serviceBuilder, String routeDomainPostfix, String tlsTermination, String edgeTerminationPolicy, boolean isRouteWithTls) {
         ObjectMeta serviceMetadata = serviceBuilder.buildMetadata();
         if (serviceMetadata != null) {
+            RoutePort routePort = null;
             String name = serviceMetadata.getName();
-            RoutePort routePort = createRoutePort(serviceBuilder);
+            final ServicePort servicePortToExpose = getServicePortToExpose(serviceBuilder);
+
+            if(servicePortToExpose != null && (
+                            servicePortToExpose.getName() != null ||
+                            servicePortToExpose.getPort() != null ||
+                            servicePortToExpose.getTargetPort() != null)){
+                routePort = createRoutePort(servicePortToExpose);
+            }
+
             if (routePort != null) {
                 RouteBuilder routeBuilder = new RouteBuilder().
                         withMetadata(serviceMetadata).