Skip to content

Commit

Permalink
[stable/prometheus-operator]Moving out PrometheusSpec.portName from r…
Browse files Browse the repository at this point in the history
…ange loop to Global Scope. (helm#20495)

* Update Prometheus-operator for accept prometheusSpec.portName to Global Scope and Chart Version

Signed-off-by: Sergio Borges <sergio.borges@safetyculture.io>

* Changing the variable field to use the global $ scope context

Signed-off-by: Sergio Borges <sergio.borges@safetyculture.io>

* Update the Chart Version

Signed-off-by: Sergio Borges <sergio.borges@safetyculture.io>

* Bumps the Chart version to 8.9.1

Signed-off-by: Sergio Borges <sergio.borges@safetyculture.io>

* Bump the Chart Version

Signed-off-by: Sergio Borges <sergio.borges@safetyculture.io>
Signed-off-by: Adrien Loiseau <adrien.loiseau@logic-immo.com>
  • Loading branch information
sc2borges authored and li-adrienloiseau committed Jul 29, 2020
1 parent 8bde89d commit 7083733
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion stable/prometheus-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 8.9.1
version: 8.9.2
appVersion: 0.36.0
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{- if and .Values.prometheus.enabled .Values.prometheus.servicePerReplica.enabled }}
{{- $count := .Values.prometheus.prometheusSpec.replicas | int -}}
{{- $serviceValues := .Values.prometheus.servicePerReplica -}}
{{- $portName := .Values.prometheus.prometheusSpec.portName -}}
{{- $serviceValues := .Values.prometheus.servicePerReplica -}}
apiVersion: v1
kind: List
metadata:
Expand Down Expand Up @@ -32,7 +31,7 @@ items:
{{- end }}
{{- end }}
ports:
- name: {{ $portName }}
- name: {{ $.Values.prometheus.prometheusSpec.portName }}
{{- if eq $serviceValues.type "NodePort" }}
nodePort: {{ $serviceValues.nodePort }}
{{- end }}
Expand Down

0 comments on commit 7083733

Please sign in to comment.