fix: ingress issue that didn't discover the right service
Signed-off-by: Thomas Stocker <thomas.stocker.pro@gmail.com>
This commit is contained in:
committed by
Bryan Frimin
parent
566a8e6c6d
commit
6ae6c6875b
@@ -24,6 +24,8 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
|
{{- $fullName := include "probo.fullname" . }}
|
||||||
|
{{- $servicePort := .Values.service.port }}
|
||||||
{{- range .Values.ingress.hosts }}
|
{{- range .Values.ingress.hosts }}
|
||||||
- host: {{ .host | quote }}
|
- host: {{ .host | quote }}
|
||||||
http:
|
http:
|
||||||
@@ -33,9 +35,9 @@ spec:
|
|||||||
pathType: {{ .pathType }}
|
pathType: {{ .pathType }}
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: {{ default (include "probo.fullname" $) .backend.service.name }}
|
name: {{ if and .backend .backend.service .backend.service.name }}{{ .backend.service.name }}{{ else }}{{ $fullName }}{{ end }}
|
||||||
port:
|
port:
|
||||||
number: {{ default $.Values.service.port .backend.service.port.number }}
|
number: {{ if and .backend .backend.service .backend.service.port .backend.service.port.number }}{{ .backend.service.port.number }}{{ else }}{{ $servicePort }}{{ end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@@ -85,11 +85,8 @@ ingress:
|
|||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
backend:
|
# backend service name and port are automatically set to the probo service
|
||||||
service:
|
# unless explicitly overridden here
|
||||||
name: probo
|
|
||||||
port:
|
|
||||||
number: 8080
|
|
||||||
tls: []
|
tls: []
|
||||||
# - secretName: probo-tls
|
# - secretName: probo-tls
|
||||||
# hosts:
|
# hosts:
|
||||||
|
|||||||
Reference in New Issue
Block a user