allow to change container ports, fix default frontend ports

Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com>
This commit is contained in:
Pascal Sthamer
2025-01-02 09:09:36 +01:00
parent 95949415f3
commit 2980fba8c7
13 changed files with 144 additions and 26 deletions
@@ -103,7 +103,14 @@ spec:
{{- end }}
ports:
- name: http
containerPort: 8080
containerPort: {{ .Values.frontend.containerPorts.http }}
{{- if .Values.frontend.containerPorts.https }}
- name: https
containerPort: {{ .Values.frontend.containerPorts.https }}
{{- end }}
{{- if .Values.frontend.extraContainerPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.frontend.extraContainerPorts "context" $) | nindent 12 }}
{{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.frontend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customLivenessProbe "context" $) | nindent 12 }}
@@ -111,7 +118,7 @@ spec:
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: 8080
port: {{ .Values.frontend.containerPorts.http }}
{{- end }}
{{- if .Values.frontend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customReadinessProbe "context" $) | nindent 12 }}
@@ -119,7 +126,7 @@ spec:
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: 8080
port: {{ .Values.frontend.containerPorts.http }}
{{- end }}
{{- if .Values.frontend.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.frontend.customStartupProbe "context" $) | nindent 12 }}
@@ -127,7 +134,7 @@ spec:
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.frontend.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet:
path: /
port: 8080
port: {{ .Values.frontend.containerPorts.http }}
{{- end }}
{{- end }}
{{- if .Values.frontend.lifecycleHooks }}
@@ -36,7 +36,10 @@ spec:
ingress:
{{ if .Values.frontend.networkPolicy.allowExternal }}
- ports:
- port: 8080
- port: {{ .Values.frontend.containerPorts.http }}
{{- if .Values.frontend.containerPorts.https }}
- port: {{ .Values.frontend.containerPorts.https }}
{{- end }}
{{- end }}
{{- if .Values.frontend.networkPolicy.extraIngress }}
{{- include "common.tplvalues.render" ( dict "value" .Values.frontend.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
@@ -11,8 +11,14 @@ spec:
type: ClusterIP
ports:
- name: http
port: 8080
port: {{ .Values.frontend.containerPorts.http }}
targetPort: http
protocol: TCP
{{- if .Values.frontend.containerPorts.https }}
- name: https
port: {{ .Values.frontend.containerPorts.https }}
targetPort: https
protocol: TCP
{{- end }}
{{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.frontend.podLabels .Values.commonLabels) "context" .) }}
selector: {{- include "shuffle.frontend.matchLabels" (dict "customLabels" $podLabels "context" $) | nindent 4 }}