Skip to content
Permalink
Browse files

feature(prometheus): allow path element in ingress values (#3546)

  • Loading branch information...
hoesler authored and k8s-ci-robot committed Feb 20, 2018
1 parent b3a825a commit f9cad1de7afcf8fce054f2719c90f06f00480c2e
@@ -1,5 +1,5 @@
name: prometheus
version: 5.2.1
version: 5.3.0
description: Prometheus is a monitoring system and time series database.
home: https://prometheus.io/
icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png
@@ -19,10 +19,12 @@ metadata:
spec:
rules:
{{- range .Values.alertmanager.ingress.hosts }}
- host: {{ . }}
{{- $url := splitList "/" . }}
- host: {{ first $url }}
http:
paths:
- backend:
- path: /{{ rest $url | join "/" }}
backend:
serviceName: {{ $serviceName }}
servicePort: {{ $servicePort }}
{{- end -}}
@@ -19,10 +19,12 @@ metadata:
spec:
rules:
{{- range .Values.pushgateway.ingress.hosts }}
- host: {{ . }}
{{- $url := splitList "/" . }}
- host: {{ first $url }}
http:
paths:
- backend:
- path: /{{ rest $url | join "/" }}
backend:
serviceName: {{ $serviceName }}
servicePort: {{ $servicePort }}
{{- end -}}
@@ -19,10 +19,12 @@ metadata:
spec:
rules:
{{- range .Values.server.ingress.hosts }}
- host: {{ . }}
{{- $url := splitList "/" . }}
- host: {{ first $url }}
http:
paths:
- backend:
- path: /{{ rest $url | join "/" }}
backend:
serviceName: {{ $serviceName }}
servicePort: {{ $servicePort }}
{{- end -}}
@@ -55,11 +55,12 @@ alertmanager:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: 'true'

## alertmanager Ingress hostnames
## alertmanager Ingress hostnames with optinal path
## Must be provided if Ingress is enabled
##
hosts: []
# - alertmanager.domain.com
# - domain.com/alertmanager

## alertmanager Ingress TLS configuration
## Secrets must be manually created in the namespace
@@ -424,11 +425,12 @@ server:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: 'true'

## Prometheus server Ingress hostnames
## Prometheus server Ingress hostnames with optinal path
## Must be provided if Ingress is enabled
##
hosts: []
# - prometheus.domain.com
# - domain.com/prometheus

## Prometheus server Ingress TLS configuration
## Secrets must be manually created in the namespace
@@ -572,11 +574,12 @@ pushgateway:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: 'true'

## pushgateway Ingress hostnames
## pushgateway Ingress hostnames with optinal path
## Must be provided if Ingress is enabled
##
hosts: []
# - pushgateway.domain.com
# - domain.com/pushgateway

## pushgateway Ingress TLS configuration
## Secrets must be manually created in the namespace

0 comments on commit f9cad1d

Please sign in to comment.
You can’t perform that action at this time.