From b46d3fe4ddffa1dd6605255ed98d13f6e4d28f93 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:44:28 +0200 Subject: [PATCH] fix(helm): remove orborus container ports Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> --- functions/kubernetes/charts/shuffle/README.md | 2 +- .../shuffle/templates/orborus/orborus-dpl.yaml | 11 ----------- .../templates/orborus/orborus-network-policy.yaml | 12 ------------ .../shuffle-worker-network-policy.yaml | 10 ---------- .../kubernetes/charts/shuffle/values.schema.json | 10 ---------- functions/kubernetes/charts/shuffle/values.yaml | 4 ---- 6 files changed, 1 insertion(+), 48 deletions(-) diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md index ff3885d1..ecc8c265 100644 --- a/functions/kubernetes/charts/shuffle/README.md +++ b/functions/kubernetes/charts/shuffle/README.md @@ -381,7 +381,6 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia | `orborus.image.pullPolicy` | orborus image pull policy | `IfNotPresent` | | `orborus.image.pullSecrets` | orborus image pull secrets | `[]` | | `orborus.replicaCount` | Number of orborus replicas to deploy | `1` | -| `orborus.containerPorts.http` | orborus HTTP container port | `8080` | | `orborus.extraContainerPorts` | Optionally specify extra list of additional ports for orborus containers | `[]` | | `orborus.livenessProbe.enabled` | Enable livenessProbe on orborus containers | `false` | | `orborus.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `0` | @@ -607,3 +606,4 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia ### Other Parameters + diff --git a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml index a2d9c278..62a23242 100644 --- a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml +++ b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml @@ -110,8 +110,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 }} @@ -120,25 +118,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 }} diff --git a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml index f6a22339..f55bf957 100644 --- a/functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml +++ b/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 }} diff --git a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml b/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml index 0ad96ada..3637d975 100644 --- a/functions/kubernetes/charts/shuffle/templates/shuffle-worker/shuffle-worker-network-policy.yaml +++ b/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: diff --git a/functions/kubernetes/charts/shuffle/values.schema.json b/functions/kubernetes/charts/shuffle/values.schema.json index b785b76e..c4687857 100644 --- a/functions/kubernetes/charts/shuffle/values.schema.json +++ b/functions/kubernetes/charts/shuffle/values.schema.json @@ -1471,16 +1471,6 @@ "description": "Number of orborus replicas to deploy", "default": 1 }, - "containerPorts": { - "type": "object", - "properties": { - "http": { - "type": "number", - "description": "orborus HTTP container port", - "default": 8080 - } - } - }, "extraContainerPorts": { "type": "array", "description": "Optionally specify extra list of additional ports for orborus containers", diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml index 507c2468..7b2feaa5 100644 --- a/functions/kubernetes/charts/shuffle/values.yaml +++ b/functions/kubernetes/charts/shuffle/values.yaml @@ -958,10 +958,6 @@ orborus: ## @param orborus.replicaCount Number of orborus replicas to deploy ## replicaCount: 1 - ## @param orborus.containerPorts.http orborus HTTP container port - ## - containerPorts: - http: 8080 ## @param orborus.extraContainerPorts Optionally specify extra list of additional ports for orborus containers ## e.g: ## extraContainerPorts: