Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus-operator]Moving out PrometheusSpec.portName from range loop to Global Scope. #20495

Merged
merged 8 commits into from
Feb 22, 2020
Merged

[stable/prometheus-operator]Moving out PrometheusSpec.portName from range loop to Global Scope. #20495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54d91b7
Update Prometheus-operator for accept prometheusSpec.portName to Glob…
sc2borges Feb 3, 2020
1c2609e
Merge branch 'master' into Fixing-PrometheusSpec.portName-from-range-…
sc2borges Feb 4, 2020
ff42ef3
Changing the variable field to use the global $ scope context
sc2borges Feb 4, 2020
8fd5f95
Update the Chart Version
sc2borges Feb 4, 2020
d57b9fb
Merge branch 'master' into Fixing-PrometheusSpec.portName-from-range-…
sc2borges Feb 20, 2020
a0ba9ab
Bumps the Chart version to 8.9.1
sc2borges Feb 21, 2020
e19be91
Bump the Chart Version
sc2borges Feb 21, 2020
80ca1db
Merge branch 'master' into Fixing-PrometheusSpec.portName-from-range-…
sc2borges Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/prometheus-operator/Chart.yaml
View file
Open in desktop
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
5 changes: 2 additions & 3 deletions stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml
View file
Open in desktop
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