[stable/prometheus-operator] Default Backend config in ingress

stable/prometheus-operator/Chart.yaml

@@ -12,7 +12,7 @@ sources:
   - https://github.com/coreos/kube-prometheus
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 9.3.1
+version: 9.3.2
 appVersion: 0.38.1
 tillerVersion: ">=2.12.0"
 home: https://github.com/coreos/prometheus-operator

stable/prometheus-operator/README.md

@@ -266,6 +266,7 @@ The following tables list the configurable parameters of the prometheus-operator
 | `prometheus.annotations` | Prometheus annotations | `{}` |
 | `prometheus.ingress.annotations` | Prometheus Ingress annotations | `{}` |
 | `prometheus.ingress.enabled` | If true, Prometheus Ingress will be created | `false` |
+| `prometheus.ingress.defaultBackend` | If true, Prometheus Ingress will be configured with default backend | `false` |
 | `prometheus.ingress.hosts` | Prometheus Ingress hostnames | `[]` |
 | `prometheus.ingress.labels` | Prometheus Ingress additional labels | `{}` |
 | `prometheus.ingress.paths` | Prometheus Ingress paths | `[]` |
@@ -421,6 +422,7 @@ The following tables list the configurable parameters of the prometheus-operator
 | `alertmanager.enabled` | Deploy alertmanager | `true` |
 | `alertmanager.ingress.annotations` | Alertmanager Ingress annotations | `{}` |
 | `alertmanager.ingress.enabled` | If true, Alertmanager Ingress will be created | `false` |
+| `alertmanager.ingress.defaultBackend` | If true, Alertmanager Ingress will be configured with default backend | `false` |  
 | `alertmanager.ingress.hosts` | Alertmanager Ingress hostnames | `[]` |
 | `alertmanager.ingress.labels` | Alertmanager Ingress additional labels | `{}` |
 | `alertmanager.ingress.paths` | Alertmanager Ingress paths | `[]` |

stable/prometheus-operator/templates/alertmanager/ingress.yaml

@@ -23,6 +23,11 @@ metadata:
 {{- end }}
 {{ include "prometheus-operator.labels" . | indent 4 }}
 spec:
+  {{- if .Values.alertmanager.ingress.defaultBackend }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+  {{- end }}
   rules:
   {{- if .Values.alertmanager.ingress.hosts }}
   {{- range $host := .Values.alertmanager.ingress.hosts }}

stable/prometheus-operator/templates/prometheus/ingress.yaml

@@ -23,6 +23,11 @@ metadata:
 {{ toYaml .Values.prometheus.ingress.labels | indent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.prometheus.ingress.defaultBackend }}
+  backend:
+    serviceName: {{ $serviceName }}
+    servicePort: {{ $servicePort }}
+  {{- end }}
   rules:
   {{- if .Values.prometheus.ingress.hosts }}
   {{- range $host := .Values.prometheus.ingress.hosts }}

stable/prometheus-operator/values.yaml

@@ -183,6 +183,9 @@ alertmanager:
   ingress:
     enabled: false
 
+    # Set default backend for ingress
+    defaultBackend: false
+
     annotations: {}
 
     labels: {}
@@ -1482,6 +1485,8 @@ prometheus:
 
   ingress:
     enabled: false
+    # Set default backend for ingress
+    defaultBackend: false
     annotations: {}
     labels: {}