switch to hostPort for backwards compatibility

operations/helm/charts/alloy/README.md

@@ -176,14 +176,16 @@ container. The list of available arguments is documented on [alloy run][].
 
 `alloy.extraPorts` allows for configuring specific open ports.
 
-The detained specification of ports can be found at the [Kubernetes Pod documents](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#ports).
+The detained specification of ports for pods and services can be found at the
+[Kubernetes Pod documents](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#ports) and
+[Kubernetes Service documents](https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/#ServiceSpec)
 
 Port numbers specified must be 0 < x < 65535.
 
 | ChartPort | KubePort | Description |
 |-----------|----------|-------------|
 | targetPort | containerPort | Number of port to expose on the pod's IP address. |
-| port | port | (Optional) Number of port to expose on the host. Daemonsets taking traffic might find this useful. |
+| hostPort | hostPort | Number of port to expose on the host and by the service. This is optional if not using a service. Daemonsets taking traffic might find this useful. |
 | name | name | If specified, this must be an `IANA_SVC_NAME` and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.
 | protocol | protocol | Must be UDP, TCP, or SCTP. Defaults to "TCP". |
 | appProtocol | appProtocol | Hint on application protocol. This is used to expose Alloy externally on OpenShift clusters using "h2c". Optional. No default value. |

operations/helm/charts/alloy/README.md.gotmpl

@@ -66,14 +66,16 @@ container. The list of available arguments is documented on [alloy run][].
 
 `alloy.extraPorts` allows for configuring specific open ports.
 
-The detained specification of ports can be found at the [Kubernetes Pod documents](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#ports).
+The detained specification of ports for pods and services can be found at the
+[Kubernetes Pod documents](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#ports) and
+[Kubernetes Service documents](https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/#ServiceSpec)
 
 Port numbers specified must be 0 < x < 65535.
 
 | ChartPort | KubePort | Description |
 |-----------|----------|-------------|
 | targetPort | containerPort | Number of port to expose on the pod's IP address. |
-| port | port | (Optional) Number of port to expose on the host. Daemonsets taking traffic might find this useful. |
+| hostPort | hostPort | Number of port to expose on the host and by the service. This is optional if not using a service. Daemonsets taking traffic might find this useful. |
 | name | name | If specified, this must be an `IANA_SVC_NAME` and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.
 | protocol | protocol | Must be UDP, TCP, or SCTP. Defaults to "TCP". |
 | appProtocol | appProtocol | Hint on application protocol. This is used to expose Alloy externally on OpenShift clusters using "h2c". Optional. No default value. |

operations/helm/charts/alloy/ci/extra-ports-values.yaml

@@ -2,6 +2,6 @@
 alloy:
   extraPorts:
     - name: jaeger-thrift
-      port: 14268
+      hostPort: 14268
       targetPort: 14268
       protocol: TCP

operations/helm/charts/alloy/ci/faro-ingress-values.yaml

@@ -1,7 +1,7 @@
 alloy:
   extraPorts:
     - name: "faro"
-      port: 12347
+      hostPort: 12347
       targetPort: 12347
       protocol: "TCP"
 

operations/helm/charts/alloy/templates/cluster_service.yaml

@@ -26,7 +26,7 @@ spec:
       protocol: "TCP"
   {{- range $portMap := $values.extraPorts }}
     - name: {{ $portMap.name }}
-      port: {{ $portMap.port }}
+      port: {{ $portMap.hostPort }}
       targetPort: {{ $portMap.targetPort }}
       protocol: {{ coalesce $portMap.protocol "TCP" }}
       {{- if not (empty $portMap.appProtocol) }}

operations/helm/charts/alloy/templates/containers/_agent.yaml

@@ -44,7 +44,9 @@
       name: http-metrics
     {{- range $portMap := $values.extraPorts }}
     - containerPort: {{ $portMap.targetPort }}
-      port: {{ $portMap.port }}
+      {{- if $portMap.hostPort }}
+      hostPort: {{ $portMap.hostPort }}
+      {{- end}}
       name: {{ $portMap.name }}
       protocol: {{ coalesce $portMap.protocol "TCP" }}
     {{- end }}

operations/helm/charts/alloy/templates/service.yaml

@@ -31,7 +31,7 @@ spec:
       protocol: "TCP"
 {{- range $portMap := $values.extraPorts }}
     - name: {{ $portMap.name }}
-      port: {{ $portMap.port }}
+      port: {{ $portMap.hostPort }}
       targetPort: {{ $portMap.targetPort }}
       protocol: {{ coalesce $portMap.protocol "TCP" }}
       {{- if not (empty $portMap.appProtocol) }}

operations/helm/tests/extra-ports/alloy/templates/controllers/daemonset.yaml

@@ -47,6 +47,7 @@ spec:
             - containerPort: 12345
               name: http-metrics
             - containerPort: 14268
+              hostPort: 14268
               name: jaeger-thrift
               protocol: TCP
           readinessProbe:

operations/helm/tests/faro-ingress/alloy/templates/controllers/daemonset.yaml

@@ -47,6 +47,7 @@ spec:
             - containerPort: 12345
               name: http-metrics
             - containerPort: 12347
+              hostPort: 12347
               name: faro
               protocol: TCP
           readinessProbe: