feat(helm): allow to configure exposed app container port

Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>

functions/kubernetes/charts/shuffle/README.md

@@ -510,6 +510,7 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia
 | `app.networkPolicy.allowExternalEgress`           | Allow the pod to access any range of port and all destinations.                    | `true` |
 | `app.networkPolicy.extraIngress`                  | Add extra ingress rules to the NetworkPolicy                                       | `[]`   |
 | `app.networkPolicy.extraEgress`                   | Add extra ingress rules to the NetworkPolicy (ignored if allowExternalEgress=true) | `[]`   |
+| `app.exposedContainerPort`                        | The port that shuffle app containers will listen on for new requests.              | `80`   |
 
 ### Traffic Exposure Parameters
 
@@ -607,3 +608,4 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia
 
 ### Other Parameters
 
+

functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml

@@ -88,6 +88,8 @@ spec:
               value: "true"
             - name: SHUFFLE_WORKER_SERVICE_ACCOUNT_NAME
               value: {{ include "shuffle.worker.serviceAccount.name" . }}
+            - name: SHUFFLE_APP_EXPOSED_PORT
+              value: {{ .Values.app.exposedContainerPort | quote }}
             - name: SHUFFLE_APP_SERVICE_ACCOUNT_NAME
               value: {{ include "shuffle.app.serviceAccount.name" . }}
             {{- if .Values.orborus.extraEnvVars }}

functions/kubernetes/charts/shuffle/templates/shuffle-app/shuffle-app-network-policy.yaml

@@ -44,17 +44,18 @@ spec:
     {{- end }}
     {{- end }}
   ingress:
-    {{- if .Values.app.networkPolicy.allowExternal }}
-    - {}
-    {{- else }}
-    # Allow access from workers. Apps will typicaly use port 80/TCP, but this is not enforced.
-    - from:
+    - ports:
+        - port: {{ .Values.app.exposedContainerPort }}
+          protocol: TCP
+      {{- if not .Values.app.networkPolicy.allowExternal }}
+      # Allow traffic from workers
+      from:
         - namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
           podSelector:
             matchLabels: {{ include "shuffle.worker.matchLabels" . | nindent 14 }}
-    {{- end }}
+      {{- end }}
     {{- if .Values.app.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.app.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}

functions/kubernetes/charts/shuffle/values.schema.json

@@ -2224,6 +2224,11 @@
                             "items": {}
                         }
                     }
+                },
+                "exposedContainerPort": {
+                    "type": "number",
+                    "description": "The port that shuffle app containers will listen on for new requests. ",
+                    "default": 80
                 }
             }
         },

functions/kubernetes/charts/shuffle/values.yaml

@@ -1449,6 +1449,10 @@ app:
     ##
     extraEgress: []
 
+  ## @param app.exposedContainerPort The port that shuffle app containers will listen on for new requests. 
+  ##
+  exposedContainerPort: 80
+
 ## @section Traffic Exposure Parameters
 ##