Skip to content

add option to use targetPortName in create service port function #11510

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 11 commits into from
Jul 9, 2025
Merged

add option to use targetPortName in create service port function #11510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8fc9f2
add option to use targetPortName in create service port function
KyriosGN0 Jun 7, 2025
09ed33c
fix checkstyle
KyriosGN0 Jun 7, 2025
da8c21b
fix missing imports
KyriosGN0 Jun 7, 2025
d51ebd2
fix infinite-recursion
KyriosGN0 Jun 7, 2025
6f1893f
fix checkstyle
KyriosGN0 Jun 7, 2025
2ef2df8
fix tests
KyriosGN0 Jun 7, 2025
81bcd63
fix tests
KyriosGN0 Jun 7, 2025
bbf7684
add test to test creation of not named target port
KyriosGN0 Jun 20, 2025
4d4b13d
address CR comments, remove the usage of int target port in serviceUtils
KyriosGN0 Jun 26, 2025
3162a5f
address CR comments, remove the usage of int target port in serviceUtils
KyriosGN0 Jun 26, 2025
4c3b6e1
address CR comments, remove the usage of int target port in serviceUtils
KyriosGN0 Jun 26, 2025
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
2 changes: 1 addition & 1 deletion cluster-operator/src/main/java/io/strimzi/operator/cluster/model/CruiseControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public Service generateService() {
labels,
ownerReference,
templateService,
List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT, "TCP"))
List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT_NAME, "TCP"))
);
}

Expand Down
2 changes: 1 addition & 1 deletion cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaBridgeCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public Service generateService() {
labels,
ownerReference,
templateService,
List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, port, port, "TCP")),
List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, port, REST_API_PORT_NAME, "TCP")),
labels.strimziSelectorLabels(),
ModelUtils.getCustomLabelsOrAnnotations(CO_ENV_VAR_CUSTOM_SERVICE_LABELS),
Util.mergeLabelsOrAnnotations(getDiscoveryAnnotation(port), ModelUtils.getCustomLabelsOrAnnotations(CO_ENV_VAR_CUSTOM_SERVICE_ANNOTATIONS))
Expand Down
16 changes: 8 additions & 8 deletions cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,10 +650,10 @@ private List<ServicePort> getServicePorts() {
List<GenericKafkaListener> internalListeners = ListenersUtils.internalListeners(listeners);

List<ServicePort> ports = new ArrayList<>(internalListeners.size() + 1);
ports.add(ServiceUtils.createServicePort(REPLICATION_PORT_NAME, REPLICATION_PORT, REPLICATION_PORT, "TCP"));
ports.add(ServiceUtils.createServicePort(REPLICATION_PORT_NAME, REPLICATION_PORT, REPLICATION_PORT_NAME, "TCP"));

for (GenericKafkaListener listener : internalListeners) {
ports.add(ServiceUtils.createServicePort(ListenersUtils.backwardsCompatiblePortName(listener), listener.getPort(), listener.getPort(), "TCP"));
ports.add(ServiceUtils.createServicePort(ListenersUtils.backwardsCompatiblePortName(listener), listener.getPort(), ListenersUtils.backwardsCompatiblePortName(listener), "TCP"));
}

return ports;
Expand All @@ -669,12 +669,12 @@ private List<ServicePort> getHeadlessServicePorts() {
List<GenericKafkaListener> internalListeners = ListenersUtils.internalListeners(listeners);

List<ServicePort> ports = new ArrayList<>(internalListeners.size() + 3);
ports.add(ServiceUtils.createServicePort(CONTROLPLANE_PORT_NAME, CONTROLPLANE_PORT, CONTROLPLANE_PORT, "TCP"));
ports.add(ServiceUtils.createServicePort(REPLICATION_PORT_NAME, REPLICATION_PORT, REPLICATION_PORT, "TCP"));
ports.add(ServiceUtils.createServicePort(KAFKA_AGENT_PORT_NAME, KAFKA_AGENT_PORT, KAFKA_AGENT_PORT, "TCP"));
ports.add(ServiceUtils.createServicePort(CONTROLPLANE_PORT_NAME, CONTROLPLANE_PORT, CONTROLPLANE_PORT_NAME, "TCP"));
ports.add(ServiceUtils.createServicePort(REPLICATION_PORT_NAME, REPLICATION_PORT, REPLICATION_PORT_NAME, "TCP"));
ports.add(ServiceUtils.createServicePort(KAFKA_AGENT_PORT_NAME, KAFKA_AGENT_PORT, KAFKA_AGENT_PORT_NAME, "TCP"));

for (GenericKafkaListener listener : internalListeners) {
ports.add(ServiceUtils.createServicePort(ListenersUtils.backwardsCompatiblePortName(listener), listener.getPort(), listener.getPort(), "TCP"));
ports.add(ServiceUtils.createServicePort(ListenersUtils.backwardsCompatiblePortName(listener), listener.getPort(), ListenersUtils.backwardsCompatiblePortName(listener), "TCP"));
}

ports.addAll(jmx.servicePorts());
Expand Down Expand Up @@ -747,7 +747,7 @@ public List<Service> generateExternalBootstrapServices() {
List<ServicePort> ports = Collections.singletonList(
ServiceUtils.createServicePort(ListenersUtils.backwardsCompatiblePortName(listener),
listener.getPort(),
listener.getPort(),
ListenersUtils.backwardsCompatiblePortName(listener),
ListenersUtils.bootstrapNodePort(listener),
"TCP")
);
Expand Down Expand Up @@ -838,7 +838,7 @@ public List<Service> generatePerPodServices() {
ServiceUtils.createServicePort(
ListenersUtils.backwardsCompatiblePortName(listener),
listener.getPort(),
listener.getPort(),
ListenersUtils.backwardsCompatiblePortName(listener),
ListenersUtils.brokerNodePort(listener, node.nodeId()),
"TCP")
);
Expand Down
4 changes: 2 additions & 2 deletions cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaConnectCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public String getServiceName() {
*/
public Service generateService() {
List<ServicePort> ports = new ArrayList<>(1);
ports.add(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT, "TCP"));
ports.add(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT_NAME, "TCP"));

ports.addAll(jmx.servicePorts());

Expand All @@ -362,7 +362,7 @@ public Service generateService() {
* @return The generated Service
*/
public Service generateHeadlessService() {
List<ServicePort> ports = List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT, "TCP"));
List<ServicePort> ports = List.of(ServiceUtils.createServicePort(REST_API_PORT_NAME, REST_API_PORT, REST_API_PORT_NAME, "TCP"));

return ServiceUtils.createHeadlessService(
componentName,
Expand Down
12 changes: 6 additions & 6 deletions cluster-operator/src/main/java/io/strimzi/operator/cluster/model/ServiceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,32 +219,32 @@ private static List<IpFamily> ipFamilies(InternalServiceTemplate template) {
*
* @param name Name of the port
* @param port The port on the service which can be accessed by clients
* @param targetPort The port on the container / Pod where the connections will be routed
* @param targetPortName the name of the target port on the container / Pod where the connections will be routed
* @param protocol Protocol used by this port
*
* @return Created port
*/
public static ServicePort createServicePort(String name, int port, int targetPort, String protocol) {
return createServicePort(name, port, targetPort, null, protocol);
public static ServicePort createServicePort(String name, int port, String targetPortName, String protocol) {
return createServicePort(name, port, targetPortName, null, protocol);
}

/**
* Creates Service port with a specific node port
*
* @param name Name of the port
* @param port The port on the service which can be accessed by clients
* @param targetPort The port on the container / Pod where the connections will be routed
* @param targetPortName the name of the target port on the container / Pod where the connections will be routed
* @param nodePort The desired node port number
* @param protocol Protocol used by this port
*
* @return Created port
*/
public static ServicePort createServicePort(String name, int port, int targetPort, Integer nodePort, String protocol) {
public static ServicePort createServicePort(String name, int port, String targetPortName, Integer nodePort, String protocol) {
return new ServicePortBuilder()
.withName(name)
.withProtocol(protocol)
.withPort(port)
.withNewTargetPort(targetPort)
.withNewTargetPort(targetPortName)
.withNodePort(nodePort)
.build();
}
Expand Down
2 changes: 1 addition & 1 deletion cluster-operator/src/main/java/io/strimzi/operator/cluster/model/jmx/JmxModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public String secretName() {
*/
public List<ServicePort> servicePorts() {
if (isEnabled) {
return List.of(ServiceUtils.createServicePort(JMX_PORT_NAME, JMX_PORT, JMX_PORT, "TCP"));
return List.of(ServiceUtils.createServicePort(JMX_PORT_NAME, JMX_PORT, JMX_PORT_NAME, "TCP"));
} else {
return List.of();
}
Expand Down
Loading
Loading