marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1687 from P4sca1/fix-helm-orborus-container-ports

Browse Source 
fix(helm): remove orborus container ports
This commit is contained in:
Frikky
2025-04-14 05:53:43 +02:00
committed by GitHub
parent eeb8c3ba4c b46d3fe4dd
commit e2761d10aa
6 changed files with 1 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions/kubernetes/charts/shuffle/README.md
+1 -1
View File
@@ -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
functions/kubernetes/charts/shuffle/templates/orborus/orborus-dpl.yaml
-11
View File
@@ -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 }}
functions/kubernetes/charts/shuffle/templates/orborus/orborus-network-policy.yaml
-12
View File
@@ -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
-10
View File
@@ -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:
functions/kubernetes/charts/shuffle/values.schema.json
-10
View File
@@ -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",
functions/kubernetes/charts/shuffle/values.yaml
-4
View File
@@ -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: