feat(trait): service and container ports

Enable `container.ports` and `service.ports` to expose any generic port internally and externally (through Service),

Close #6248

Author: squakez

docs/modules/ROOT/partials/apis/camel-k-crds.adoc

@@ -6670,40 +6670,51 @@ string
 
 The maximum amount of memory to be provided (default 512 Mi).
 
+|`ports` +
+[]string
+|
+
+
+List of container ports available in the container (syntax: <port-name>;<port-number>[;port-protocol]).
+When omitted, `port-protocol` (admitted values `TCP`, `UDP` or `SCTP`) is `TCP`.
+Don't use this for the primary http managed port (for which case you need to use `portName` and `port`).
+Don't use in Knative based environments.
+
 |`expose` +
 bool
 |
 
 
-Can be used to enable/disable exposure via kubernetes Service.
+Can be used to enable/disable http exposure via kubernetes Service.
 
 |`port` +
 int32
 |
 
 
-To configure a different port exposed by the container (default `8080`).
+To configure a different http port exposed by the container (default `8080`).
 
 |`portName` +
 string
 |
 
 
-To configure a different port name for the port exposed by the container. It defaults to `http` only when the `expose` parameter is true.
+To configure a different http port name for the port exposed by the container.
+It defaults to `http` only when the `expose` parameter is true.
 
 |`servicePort` +
 int32
 |
 
 
-To configure under which service port the container port is to be exposed (default `80`).
+To configure under which service port the http container port is to be exposed (default `80`).
 
 |`servicePortName` +
 string
 |
 
 
-To configure under which service port name the container port is to be exposed (default `http`).
+To configure under which service port name the http container port is to be exposed (default `http`).
 
 |`name` +
 string
@@ -8957,8 +8968,8 @@ List of Services in the form [[apigroup/]version:]kind:[namespace/]name
 
 * <<#_camel_apache_org_v1_Traits, Traits>>
 
-The Service trait exposes the integration with a Service resource so that it can be accessed by other applications
-(or integrations) in the same namespace.
+The Service trait exposes the Integration with a Service resource so that it can be accessed by other applications
+(or Integrations) in the same namespace.
 
 NOTE: this trait is automatically disabled if the Knative Service trait is enabled.
 
@@ -9013,6 +9024,17 @@ map[string]string
 
 The labels added to the Service object.
 
+|`ports` +
+[]string
+|
+
+
+List of container ports available in the container to expose
+(syntax: <port-name>;<port-number>;<container-port-number>[;<port-protocol]).
+When omitted, `port-protocol` (admitted values `TCP`, `UDP` or `SCTP`) is `TCP`.
+Don't use this for the primary http managed port (which is managed by container trait).
+Don't use in Knative based environments.
+
 
 |===
 

docs/modules/traits/pages/container.adoc

@@ -51,25 +51,33 @@ The following configuration options are available:
 | string
 | The maximum amount of memory to be provided (default 512 Mi).
 
+| container.ports
+| []string
+| List of container ports available in the container (syntax: <port-name>;<port-number>[;port-protocol]).
+When omitted, `port-protocol` (admitted values `TCP`, `UDP` or `SCTP`) is `TCP`.
+Don't use this for the primary http managed port (for which case you need to use `portName` and `port`).
+Don't use in Knative based environments.
+
 | container.expose
 | bool
-| Can be used to enable/disable exposure via kubernetes Service.
+| Can be used to enable/disable http exposure via kubernetes Service.
 
 | container.port
 | int32
-| To configure a different port exposed by the container (default `8080`).
+| To configure a different http port exposed by the container (default `8080`).
 
 | container.port-name
 | string
-| To configure a different port name for the port exposed by the container. It defaults to `http` only when the `expose` parameter is true.
+| To configure a different http port name for the port exposed by the container.
+It defaults to `http` only when the `expose` parameter is true.
 
 | container.service-port
 | int32
-| To configure under which service port the container port is to be exposed (default `80`).
+| To configure under which service port the http container port is to be exposed (default `80`).
 
 | container.service-port-name
 | string
-| To configure under which service port name the container port is to be exposed (default `http`).
+| To configure under which service port name the http container port is to be exposed (default `http`).
 
 | container.name
 | string

docs/modules/traits/pages/service.adoc

@@ -3,8 +3,8 @@
 // Start of autogenerated code - DO NOT EDIT! (badges)
 // End of autogenerated code - DO NOT EDIT! (badges)
 // Start of autogenerated code - DO NOT EDIT! (description)
-The Service trait exposes the integration with a Service resource so that it can be accessed by other applications
-(or integrations) in the same namespace.
+The Service trait exposes the Integration with a Service resource so that it can be accessed by other applications
+(or Integrations) in the same namespace.
 
 NOTE: this trait is automatically disabled if the Knative Service trait is enabled.
 
@@ -53,6 +53,26 @@ Deprecated: Use service type instead.
 | map[string]string
 | The labels added to the Service object.
 
+| service.ports
+| []string
+| List of container ports available in the container to expose
+(syntax: <port-name>;<port-number>;<container-port-number>[;<port-protocol]).
+When omitted, `port-protocol` (admitted values `TCP`, `UDP` or `SCTP`) is `TCP`.
+Don't use this for the primary http managed port (which is managed by container trait).
+Don't use in Knative based environments.
+
 |===
 
 // End of autogenerated code - DO NOT EDIT! (configuration)
+
+== Examples
+
+* Expose a Service (we call it `hello`) on a port (`85``) which is used internally by your application (`8085`):
++
+[source,console]
+$ kamel run PlatformHttpServer.java -p quarkus.http.port=8085 -t container.ports=hello;8085 -t service.ports=hello;85;8085
+
+* Expose an UDP Service (we call it `udp`) on a port (`95`) which is used internally by your application (`9095`):
++
+[source,console]
+$ kamel run MyUDPServer.java -t container.ports=udp;95;UDP -t service.ports=udp;95;9095;UDP

e2e/common/traits/service_test.go

@@ -24,13 +24,16 @@ package common
 
 import (
 	"context"
+	"fmt"
 	"testing"
+	"time"
 
 	. "github.com/onsi/gomega"
 
 	corev1 "k8s.io/api/core/v1"
 
 	. "github.com/apache/camel-k/v2/e2e/support"
+	v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
 )
 
 func TestServiceTrait(t *testing.T) {
@@ -97,3 +100,33 @@ func TestServiceTrait(t *testing.T) {
 		})
 	})
 }
+
+func TestPortsServiceTrait(t *testing.T) {
+	t.Parallel()
+	WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
+		t.Run("Service on port 8085", func(t *testing.T) {
+			name := RandomizedSuffixName("svc")
+			g.Expect(KamelRun(t, ctx, ns, "files/PlatformHttpServer.java",
+				"-p", "quarkus.http.port=8085",
+				"-t", "container.ports=hello;8085",
+				"-t", "service.ports=hello;85;8085",
+				"--name", name,
+			).Execute()).To(Succeed())
+			g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady)).
+				Should(Equal(corev1.ConditionTrue))
+			// We cannot use the health trait to make sure the application is ready to
+			// get requests as we're sharing the service port.
+			g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutMedium).Should(ContainSubstring("Listening on: http://0.0.0.0:8085"))
+
+			response, err := TestClient(t).CoreV1().RESTClient().Get().
+				AbsPath(fmt.Sprintf("/api/v1/namespaces/%s/services/%s:%d/proxy/hello/", ns, name, 85)).
+				SetHeader("name", "service-test").
+				Timeout(30 * time.Second).
+				DoRaw(ctx)
+
+			g.Expect(err).ToNot(HaveOccurred())
+			g.Expect(string(response)).To(Equal("Hello service-test"))
+		})
+
+	})
+}