Skip to content

#2847 OpenShift route generated targetPort doesn't use the service "targetPort" #2850

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 27, 2024
Merged

#2847 OpenShift route generated targetPort doesn't use the service "targetPort" #2850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions gradle-plugin/it/src/it/multiple-services/expected/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ items:
name: first-service
spec:
port:
targetPort: 80
targetPort: 9376
to:
kind: Service
name: first-service
Expand Down Expand Up @@ -200,7 +200,7 @@ items:
name: second-service
spec:
port:
targetPort: 80
targetPort: 9376
to:
kind: Service
name: second-service
2 changes: 1 addition & 1 deletion gradle-plugin/it/src/it/route-name-fragment/expected/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ items:
name: customized-name
spec:
port:
targetPort: 9090
targetPort: 8080
to:
kind: Service
name: customized-name
2 changes: 1 addition & 1 deletion gradle-plugin/it/src/it/service-name-fragment/expected/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ items:
name: customized-name
spec:
port:
targetPort: 9090
targetPort: 8080
to:
kind: Service
name: customized-name
2 changes: 1 addition & 1 deletion ...-plugin/it/src/it/volume-permission/expected/custom-storageclass-annotation/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ items:
name: jkube-docker-registry
spec:
port:
targetPort: 80
targetPort: 5000
to:
kind: Service
name: jkube-docker-registry
2 changes: 1 addition & 1 deletion gradle-plugin/it/src/it/volume-permission/expected/custom-storageclass/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ items:
name: jkube-docker-registry
spec:
port:
targetPort: 80
targetPort: 5000
to:
kind: Service
name: jkube-docker-registry
2 changes: 1 addition & 1 deletion gradle-plugin/it/src/it/volume-permission/expected/default/openshift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ items:
name: jkube-docker-registry
spec:
port:
targetPort: 80
targetPort: 5000
to:
kind: Service
name: jkube-docker-registry
24 changes: 20 additions & 4 deletions ...cher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,22 +611,38 @@ private String ensureProtocol(ServicePort port) {
return protocol;
}

public static Integer getPortToExpose(ServiceBuilder serviceBuilder) {
private static ServicePort getServicePortToExpose(ServiceBuilder serviceBuilder){
ServiceSpec spec = serviceBuilder.buildSpec();
if (spec != null) {
if (spec != null) {
final List<ServicePort> ports = spec.getPorts();
if (ports != null && !ports.isEmpty()) {
for (ServicePort port : ports) {
if (Objects.equals(port.getName(), "http") || Objects.equals(port.getProtocol(), "http") ) {
return port.getPort();
return port;
}
}
ServicePort servicePort = ports.iterator().next();
if (servicePort.getPort() != null) {
return servicePort.getPort();
return servicePort;
}
}
}
return null;
}

public static Integer getPortToExpose(ServiceBuilder serviceBuilder) {
ServicePort servicePort = getServicePortToExpose(serviceBuilder);
if (servicePort == null){
return null;
}
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();
}
}
4 changes: 3 additions & 1 deletion ...her/generic/src/main/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +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.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;
Expand Down Expand Up @@ -122,7 +123,8 @@ private void addRoute(KubernetesListBuilder listBuilder, ServiceBuilder serviceB

private static RoutePort createRoutePort(ServiceBuilder serviceBuilder) {
RoutePort routePort = null;
final Integer servicePort = getPortToExpose(serviceBuilder);
final Integer serviceTargetPort = getTargetPortToExpose(serviceBuilder);
final Integer servicePort = serviceTargetPort != null ? serviceTargetPort : getPortToExpose(serviceBuilder);
if (servicePort != null) {
routePort = new RoutePort();
routePort.setTargetPort(new IntOrString(servicePort));
Expand Down
12 changes: 6 additions & 6 deletions ...c/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void create_withServiceWithNoWebPortAndCreateExternalUrls_shouldCreateRoute() {
// Given
context.getProject().getProperties().put("jkube.createExternalUrls", "true");
klb.addNewServiceItem().withNewMetadata().withName("http").endMetadata()
.withNewSpec().addNewPort().withPort(21).endPort().endSpec().endServiceItem();
.withNewSpec().addNewPort().withPort(21).withNewTargetPort(21).endPort().endSpec().endServiceItem();
// When
new RouteEnricher(context).create(PlatformMode.openshift, klb);
// Then
Expand All @@ -106,7 +106,7 @@ class ServiceWithWebPort {
@BeforeEach
void setUp() {
klb.addNewServiceItem().withNewMetadata().withName("http").endMetadata()
.withNewSpec().addNewPort().withPort(80).endPort().endSpec().endServiceItem();
.withNewSpec().addNewPort().withPort(80).withNewTargetPort(8080).endPort().endSpec().endServiceItem();
}

@Test
Expand All @@ -129,7 +129,7 @@ void inOpenShift_shouldCreateRoute() {
.last()
.hasFieldOrPropertyWithValue("apiVersion", "route.openshift.io/v1")
.hasFieldOrPropertyWithValue("metadata.name", "http")
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 80)
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 8080)
.hasFieldOrPropertyWithValue("spec.to.kind", "Service")
.hasFieldOrPropertyWithValue("spec.to.name", "http");
}
Expand All @@ -147,7 +147,7 @@ void withFragmentWithNoName_shouldMergeRoute() {
.last()
.hasFieldOrPropertyWithValue("apiVersion", "route.openshift.io/v1")
.hasFieldOrPropertyWithValue("metadata.name", "http")
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 80)
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 8080)
.hasFieldOrPropertyWithValue("spec.to.kind", "Service")
.hasFieldOrPropertyWithValue("spec.to.name", "http")
.extracting("metadata.annotations")
Expand All @@ -170,7 +170,7 @@ void withFragmentWithMatchingName_shouldMergeRoute() {
.last()
.hasFieldOrPropertyWithValue("apiVersion", "route.openshift.io/v1")
.hasFieldOrPropertyWithValue("metadata.name", "http")
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 80)
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 8080)
.hasFieldOrPropertyWithValue("spec.to.kind", "Service")
.hasFieldOrPropertyWithValue("spec.to.name", "http")
.extracting("metadata.annotations")
Expand All @@ -193,7 +193,7 @@ void withFragmentWithDifferentName_shouldCreateNewRoute() {
.last()
.hasFieldOrPropertyWithValue("apiVersion", "route.openshift.io/v1")
.hasFieldOrPropertyWithValue("metadata.name", "http")
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 80)
.hasFieldOrPropertyWithValue("spec.port.targetPort.value", 8080)
.hasFieldOrPropertyWithValue("spec.to.kind", "Service")
.hasFieldOrPropertyWithValue("spec.to.name", "http")
.extracting("metadata.annotations")
Expand Down
2 changes: 1 addition & 1 deletion ...generic/src/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ 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", 80);
.contains("test-svc", "example.com", "Service", "test-svc", 8080);
}

@Test
Expand Down