added additional ports option for prometheus-operator prometheus serv…

…ice (helm#11506) * added additional ports option for prometheus-operator prometheus service Signed-off-by: GIBSON, NICHOLAS R <[email protected]> * updated version, readme, fixed data type, added ci values Signed-off-by: GIBSON, NICHOLAS R <[email protected]> * trailing spaces Signed-off-by: GIBSON, NICHOLAS R <[email protected]> * bumped version to 2.2.7 Signed-off-by: GIBSON, NICHOLAS R <[email protected]> * bumped version to 3.0.1 Signed-off-by: GIBSON, NICHOLAS R <[email protected]> * fixed merge conflict with appVersion Signed-off-by: GIBSON, NICHOLAS R <[email protected]>
agolo · Feb 28, 2019 · 40aee78 · 40aee78
1 parent 6a78c5a
commit 40aee78
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml
@@ -9,7 +9,7 @@ name: prometheus-operator
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://coreos.com/operators/prometheus
-version: 4.2.0
+version: 4.2.1
 appVersion: 0.29.0
 home: https://github.com/coreos/prometheus-operator
 keywords:

diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md
@@ -158,6 +158,7 @@ The following tables lists the configurable parameters of the prometheus-operato
 | `prometheus.service.clusterIP` | Prometheus service clusterIP IP | `""` |
 | `prometheus.service.targetPort` |  Prometheus Service internal port | `9090` |
 | `prometheus.service.nodePort` |  Prometheus Service port for NodePort service type | `39090` |
+| `prometheus.service.additionalPorts` |  Additional Prometheus Service ports to add for NodePort service type | `[]` |
 | `prometheus.service.annotations` |  Prometheus Service Annotations | `{}` |
 | `prometheus.service.labels` |  Prometheus Service Labels | `{}` |
 | `prometheus.service.externalIPs` | List of IP addresses at which the Prometheus server service is available  | `[]` |

diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml
@@ -721,6 +721,14 @@ prometheus:
     ##
     nodePort: 39090
 
+    ## Additional ports to open for Prometheus service
+    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services
+    ##
+    additionalPorts: []
+    #  - name: thanos-cluster
+    #    port: 10900
+    #    nodePort: 30111
+
     ## Loadbalancer IP
     ## Only use if service.type is "loadbalancer"
     loadBalancerIP: ""

diff --git a/stable/prometheus-operator/templates/prometheus/service.yaml b/stable/prometheus-operator/templates/prometheus/service.yaml
@@ -34,6 +34,9 @@ spec:
     {{- end }}
     port: 9090
     targetPort: {{ .Values.prometheus.service.targetPort }}
+{{- if .Values.prometheus.service.additionalPorts }}
+{{ toYaml .Values.prometheus.service.additionalPorts | indent 2 }}
+{{- end }}
   selector:
     app: prometheus
     prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus

diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml
@@ -566,6 +566,13 @@ prometheusOperator:
   ##
     nodePort: 38080
 
+  ## Additional ports to open for Prometheus service
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services
+  ##
+    additionalPorts: []
+    #  - name: thanos-cluster
+    #    port: 10900
+    #    nodePort: 30111
 
   ## Loadbalancer IP
   ## Only use if service.type is "loadbalancer"