Merge branch 'main' into nightly

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

@@ -128,8 +128,6 @@ spec:
           resources: {{- include "common.resources.preset" (dict "type" .Values.orborus.resourcesPreset) | nindent 12 }}
           {{- end }}
           ports:
-            - name: http
-              containerPort: {{ .Values.orborus.containerPorts.http }}
             {{- if .Values.orborus.extraContainerPorts }}
             {{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraContainerPorts "context" $) | nindent 12 }}
             {{- end }}
@@ -138,25 +136,16 @@ spec:
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customLivenessProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.livenessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- if .Values.orborus.customReadinessProbe }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customReadinessProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- if .Values.orborus.customStartupProbe }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customStartupProbe "context" $) | nindent 12 }}
           {{- else if .Values.orborus.startupProbe.enabled }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.startupProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: {{ .Values.orborus.containerPorts.http }}
           {{- end }}
           {{- end }}
           {{- if .Values.orborus.lifecycleHooks }}

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

@@ -54,18 +54,6 @@ spec:
     {{- end }}
     {{- end }}
   ingress:
-    - ports:
-        - port: {{ .Values.orborus.containerPorts.http }}
-          protocol: TCP
-      {{- if not .Values.orborus.networkPolicy.allowExternal }}
-      from:
-        # Allow traffic from workers
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels: {{ include "shuffle.worker.matchLabels" . | nindent 14 }}
-      {{- end }}
     {{- if .Values.orborus.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.orborus.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}

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

@@ -29,16 +29,6 @@ spec:
         - namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: kube-system
-    # Allow access to orborus
-    - ports:
-        - port: {{ .Values.orborus.containerPorts.http }}
-          protocol: TCP
-      to:
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels: {{ include "shuffle.orborus.matchLabels" . | nindent 14 }}
     # Allow arbitrary connections to apps. Apps will typically use port 80/TCP, but this is not enforced.
     - to:
         - namespaceSelector: