added additional ports option for prometheus-operator prometheus service (#11506)

* added additional ports option for prometheus-operator prometheus service

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* updated version, readme, fixed data type, added ci values

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* trailing spaces

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* bumped version to 2.2.7

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* bumped version to 3.0.1

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

* fixed merge conflict with appVersion

Signed-off-by: GIBSON, NICHOLAS R <ng560p@us.att.com>

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:

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  | `[]` |

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: ""

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

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"