bitnami/prometheus: Changes Ingress backend to match services (#18391)

* changed server.service.name to "common.names.fullname" to be compatible with ingress

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>

* Chart-version bumped

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>

* Update ingress.yaml

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>

* Update ingress.yaml

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>

* Update service.yaml

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>

---------

Signed-off-by: DarthBlair <Marcel.Bassuener@googlemail.com>
This commit is contained in:
DarthBlair
2023-08-15 09:31:19 +02:00
committed by GitHub
parent 4172b9a6f2
commit d0ab7023a9
4 changed files with 5 additions and 5 deletions

View File

@@ -26,4 +26,4 @@ sources:
- https://github.com/bitnami/containers/tree/main/bitnami/prometheus
- https://github.com/prometheus/prometheus
- https://github.com/prometheus-community/helm-charts
version: 0.1.9
version: 0.1.10

View File

@@ -40,7 +40,7 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.alertmanager.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.alertmanager.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.alertmanager.ingress.extraHosts }}
- host: {{ .name | quote }}

View File

@@ -40,7 +40,7 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.server.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.server.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.server.ingress.extraHosts }}
- host: {{ .name | quote }}
@@ -50,7 +50,7 @@ spec:
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "prometheus.server.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.server.ingress.extraRules }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.ingress.extraRules "context" $) | nindent 4 }}

View File

@@ -58,4 +58,4 @@ spec:
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/part-of: prometheus
app.kubernetes.io/component: server
app.kubernetes.io/component: server