-
Notifications
You must be signed in to change notification settings - Fork 431
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OpenShift route generator: prefer port name over port number for targetPort when it's possible #2857
base: master
Are you sure you want to change the base?
OpenShift route generator: prefer port name over port number for targetPort when it's possible #2857
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -142,7 +142,7 @@ items: | |
name: autotls | ||
spec: | ||
port: | ||
targetPort: 8080 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: autotls |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,7 +134,7 @@ items: | |
name: expose | ||
spec: | ||
port: | ||
targetPort: 21 | ||
targetPort: ftp | ||
to: | ||
kind: Service | ||
name: expose |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,7 +134,7 @@ items: | |
name: expose | ||
spec: | ||
port: | ||
targetPort: 21 | ||
targetPort: ftp | ||
to: | ||
kind: Service | ||
name: expose |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,7 +132,7 @@ items: | |
name: expose | ||
spec: | ||
port: | ||
targetPort: 21 | ||
targetPort: ftp | ||
to: | ||
kind: Service | ||
name: expose |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,7 +132,7 @@ items: | |
name: expose | ||
spec: | ||
port: | ||
targetPort: 80 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: expose |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -132,7 +132,7 @@ items: | |
name: expose | ||
spec: | ||
port: | ||
targetPort: 80 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: expose |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,7 +137,7 @@ items: | |
name: helidon | ||
spec: | ||
port: | ||
targetPort: 8080 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: helidon |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -156,7 +156,7 @@ items: | |
name: metadata | ||
spec: | ||
port: | ||
targetPort: 8080 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: metadata |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,7 +137,7 @@ items: | |
name: openliberty | ||
spec: | ||
port: | ||
targetPort: 9080 | ||
targetPort: glrpc | ||
to: | ||
kind: Service | ||
name: openliberty |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -110,7 +110,7 @@ items: | |
name: route | ||
spec: | ||
port: | ||
targetPort: 8080 | ||
targetPort: http | ||
to: | ||
kind: Service | ||
name: route |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -133,7 +133,7 @@ items: | |
name: svc1 | ||
spec: | ||
port: | ||
targetPort: 8080 | ||
targetPort: port1 | ||
to: | ||
kind: Service | ||
name: svc1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 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); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it possible to add some unit tests verifying this precedence order? |
||
|
||
if(servicePortToExpose == null){ | ||
return null; | ||
Check warning on line 130 in jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java Codecov / codecov/patchjkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java#L130
|
||
} | ||
|
||
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(); | ||
Check warning on line 146 in jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java Codecov / codecov/patchjkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java#L146
|
||
if(servicePort != null){ | ||
routePort.setTargetPort(new IntOrString(servicePort)); | ||
return routePort; | ||
Check warning on line 149 in jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java Codecov / codecov/patchjkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java#L149
|
||
} | ||
return routePort; | ||
return null; | ||
Check warning on line 151 in jkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java Codecov / codecov/patchjkube-kit/enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java#L151
|
||
} | ||
|
||
private String prepareHostForRoute(String routeDomainPostfix, String name) { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is value different in this case? I see in this case it's
port1
instead ofhttp