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

helm · Feb 20, 2018 · f9cad1d · f9cad1d
1 parent b3a825a
commit f9cad1d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml
@@ -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

diff --git a/stable/prometheus/templates/alertmanager-ingress.yaml b/stable/prometheus/templates/alertmanager-ingress.yaml
@@ -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 -}}

diff --git a/stable/prometheus/templates/pushgateway-ingress.yaml b/stable/prometheus/templates/pushgateway-ingress.yaml
@@ -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 -}}

diff --git a/stable/prometheus/templates/server-ingress.yaml b/stable/prometheus/templates/server-ingress.yaml
@@ -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 -}}

diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
@@ -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