[stable/prometheus-operator] Removed duplicate nodePort in prometheus service (#9684)

* Removed duplicate nodePort in prometheus service

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.com>

* Bumped version

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.com>

* [stable/prometheus-operator] Merged upstream master and bumped version again

Signed-off-by: Benjamin Lee <benjamintllee@hotmail.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: 2.1.3
+version: 2.1.4
 appVersion: 0.26.0
 home: https://github.com/coreos/prometheus-operator
 keywords:

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

@@ -33,9 +33,6 @@ spec:
     nodePort: {{ .Values.prometheus.service.nodePort }}
     {{- end }}
     port: 9090
-    {{- if eq .Values.prometheus.service.type "NodePort" }}
-    nodePort: {{ .Values.prometheus.service.nodePort }}
-    {{- end }}
     targetPort: web
   selector:
     app: prometheus