FEATURE/MINOR: kubernetes-ingress: Merge Prometheus ServiceMonitor from

Dario. Update controller image to 1.4.13. Tag 1.10.0 release.

Signed-off-by: Dinko Korunic <[email protected]>

Author: dkorunic

kubernetes-ingress/Chart.yaml

@@ -14,7 +14,7 @@
 
 apiVersion: v1
 name: kubernetes-ingress
-version: 1.9.0
+version: 1.10.0
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:
@@ -31,4 +31,4 @@ maintainers:
     email: [email protected]
   - name: Dinko Korunic
     email: [email protected]
-appVersion: 1.4.10
+appVersion: 1.4.13

kubernetes-ingress/README.md

@@ -129,7 +129,7 @@ If you're using the [Prometheus Operator](https://github.com/prometheus-operator
 
 ```console
 helm install my-ingress5 haproxytech/kubernetes-ingress \
-  --set "serviceMonitor.enabled=true"
+  --set "controller.serviceMonitor.enabled=true"
 ```
 
 ### Using values from YAML file

kubernetes-ingress/values.yaml

@@ -372,8 +372,10 @@ controller:
   serviceMonitor:
     ## Toggle the ServiceMonitor, true if you have Prometheus Operator installed and configured
     enabled: false
+
     ## Specify the labels to add to the ServiceMonitors to be selected for target discovery
     extraLabels: {}
+
     ## Specify the endpoints
     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md#servicemonitor
     endpoints: