fix(helm): remove orborus container ports
Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
This commit is contained in:
@@ -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.pullPolicy` | orborus image pull policy | `IfNotPresent` |
|
||||||
| `orborus.image.pullSecrets` | orborus image pull secrets | `[]` |
|
| `orborus.image.pullSecrets` | orborus image pull secrets | `[]` |
|
||||||
| `orborus.replicaCount` | Number of orborus replicas to deploy | `1` |
|
| `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.extraContainerPorts` | Optionally specify extra list of additional ports for orborus containers | `[]` |
|
||||||
| `orborus.livenessProbe.enabled` | Enable livenessProbe on orborus containers | `false` |
|
| `orborus.livenessProbe.enabled` | Enable livenessProbe on orborus containers | `false` |
|
||||||
| `orborus.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `0` |
|
| `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
|
### Other Parameters
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -110,8 +110,6 @@ spec:
|
|||||||
resources: {{- include "common.resources.preset" (dict "type" .Values.orborus.resourcesPreset) | nindent 12 }}
|
resources: {{- include "common.resources.preset" (dict "type" .Values.orborus.resourcesPreset) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
|
||||||
containerPort: {{ .Values.orborus.containerPorts.http }}
|
|
||||||
{{- if .Values.orborus.extraContainerPorts }}
|
{{- if .Values.orborus.extraContainerPorts }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraContainerPorts "context" $) | nindent 12 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.orborus.extraContainerPorts "context" $) | nindent 12 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -120,25 +118,16 @@ spec:
|
|||||||
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customLivenessProbe "context" $) | nindent 12 }}
|
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customLivenessProbe "context" $) | nindent 12 }}
|
||||||
{{- else if .Values.orborus.livenessProbe.enabled }}
|
{{- else if .Values.orborus.livenessProbe.enabled }}
|
||||||
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.livenessProbe "enabled") "context" $) | nindent 12 }}
|
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.livenessProbe "enabled") "context" $) | nindent 12 }}
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: {{ .Values.orborus.containerPorts.http }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.orborus.customReadinessProbe }}
|
{{- if .Values.orborus.customReadinessProbe }}
|
||||||
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customReadinessProbe "context" $) | nindent 12 }}
|
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customReadinessProbe "context" $) | nindent 12 }}
|
||||||
{{- else if .Values.orborus.readinessProbe.enabled }}
|
{{- else if .Values.orborus.readinessProbe.enabled }}
|
||||||
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.readinessProbe "enabled") "context" $) | nindent 12 }}
|
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.readinessProbe "enabled") "context" $) | nindent 12 }}
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: {{ .Values.orborus.containerPorts.http }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.orborus.customStartupProbe }}
|
{{- if .Values.orborus.customStartupProbe }}
|
||||||
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customStartupProbe "context" $) | nindent 12 }}
|
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.orborus.customStartupProbe "context" $) | nindent 12 }}
|
||||||
{{- else if .Values.orborus.startupProbe.enabled }}
|
{{- else if .Values.orborus.startupProbe.enabled }}
|
||||||
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.startupProbe "enabled") "context" $) | nindent 12 }}
|
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.orborus.startupProbe "enabled") "context" $) | nindent 12 }}
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: {{ .Values.orborus.containerPorts.http }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.orborus.lifecycleHooks }}
|
{{- if .Values.orborus.lifecycleHooks }}
|
||||||
|
|||||||
@@ -54,18 +54,6 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
ingress:
|
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 }}
|
{{- if .Values.orborus.networkPolicy.extraIngress }}
|
||||||
{{- include "common.tplvalues.render" ( dict "value" .Values.orborus.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
|
{{- include "common.tplvalues.render" ( dict "value" .Values.orborus.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
-10
@@ -29,16 +29,6 @@ spec:
|
|||||||
- namespaceSelector:
|
- namespaceSelector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
kubernetes.io/metadata.name: kube-system
|
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.
|
# Allow arbitrary connections to apps. Apps will typically use port 80/TCP, but this is not enforced.
|
||||||
- to:
|
- to:
|
||||||
- namespaceSelector:
|
- namespaceSelector:
|
||||||
|
|||||||
@@ -1471,16 +1471,6 @@
|
|||||||
"description": "Number of orborus replicas to deploy",
|
"description": "Number of orborus replicas to deploy",
|
||||||
"default": 1
|
"default": 1
|
||||||
},
|
},
|
||||||
"containerPorts": {
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
||||||
"http": {
|
|
||||||
"type": "number",
|
|
||||||
"description": "orborus HTTP container port",
|
|
||||||
"default": 8080
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"extraContainerPorts": {
|
"extraContainerPorts": {
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"description": "Optionally specify extra list of additional ports for orborus containers",
|
"description": "Optionally specify extra list of additional ports for orborus containers",
|
||||||
|
|||||||
@@ -958,10 +958,6 @@ orborus:
|
|||||||
## @param orborus.replicaCount Number of orborus replicas to deploy
|
## @param orborus.replicaCount Number of orborus replicas to deploy
|
||||||
##
|
##
|
||||||
replicaCount: 1
|
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
|
## @param orborus.extraContainerPorts Optionally specify extra list of additional ports for orborus containers
|
||||||
## e.g:
|
## e.g:
|
||||||
## extraContainerPorts:
|
## extraContainerPorts:
|
||||||
|
|||||||
Reference in New Issue
Block a user