From 54d91b7f1f3e80d5e9dd2a4e36b307f1481ed42f Mon Sep 17 00:00:00 2001 From: Sergio Borges Date: Mon, 3 Feb 2020 11:29:10 +1100 Subject: [PATCH 1/5] Update Prometheus-operator for accept prometheusSpec.portName to Global Scope and Chart Version Signed-off-by: Sergio Borges --- stable/prometheus-operator/Chart.yaml | 4 ++-- .../templates/prometheus/serviceperreplica.yaml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 2dfebe8a156d..487a86289338 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,8 +12,8 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.5.15 -appVersion: 0.34.0 +version: 8.7.1 +appVersion: 0.35.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml index 6b6fec53f756..4f18778a5941 100644 --- a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml +++ b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml @@ -1,6 +1,7 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.servicePerReplica.enabled }} {{- $count := .Values.prometheus.prometheusSpec.replicas | int -}} -{{- $serviceValues := .Values.prometheus.servicePerReplica -}} +{{- $serviceValues := .Values.prometheus.servicePerReplica -}} +{{- $portName := .Values.prometheus.prometheusSpec.portName -}} apiVersion: v1 kind: ServiceList metadata: @@ -31,7 +32,7 @@ items: {{- end }} {{- end }} ports: - - name: {{ .Values.prometheus.prometheusSpec.portName }} + - name: {{ $portName }} {{- if eq $serviceValues.type "NodePort" }} nodePort: {{ $serviceValues.nodePort }} {{- end }} From ff42ef31dd87bfde3346dab0aabd5ef26c2e0cf7 Mon Sep 17 00:00:00 2001 From: Sergio Borges Date: Tue, 4 Feb 2020 14:58:55 +1100 Subject: [PATCH 2/5] Changing the variable field to use the global $ scope context Signed-off-by: Sergio Borges --- .../templates/prometheus/serviceperreplica.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml index 4f18778a5941..2ba1edb024b4 100644 --- a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml +++ b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml @@ -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 -}} apiVersion: v1 kind: ServiceList metadata: @@ -32,7 +31,7 @@ items: {{- end }} {{- end }} ports: - - name: {{ $portName }} + - name: {{ $.Values.prometheus.prometheusSpec.portName }} {{- if eq $serviceValues.type "NodePort" }} nodePort: {{ $serviceValues.nodePort }} {{- end }} From 8fd5f9580ebfe835994f3dc668c076a451fd9b0e Mon Sep 17 00:00:00 2001 From: Sergio Borges Date: Wed, 5 Feb 2020 09:39:09 +1100 Subject: [PATCH 3/5] Update the Chart Version Signed-off-by: Sergio Borges --- stable/prometheus-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 487a86289338..bf3e3747924d 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 8.7.1 +version: 8.7.2 appVersion: 0.35.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator From a0ba9ab43bae9b8a99f8f04a2270d636dc46da81 Mon Sep 17 00:00:00 2001 From: Sergio Borges Date: Fri, 21 Feb 2020 21:57:36 +1100 Subject: [PATCH 4/5] Bumps the Chart version to 8.9.1 Signed-off-by: Sergio Borges --- stable/prometheus-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 65f818b842f5..4485001dfdb8 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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.0 +version: 8.9.1 appVersion: 0.36.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator From e19be91df5d4594f87b6cf1cdbca0685fd7f70a8 Mon Sep 17 00:00:00 2001 From: Sergio Borges Date: Sat, 22 Feb 2020 09:49:31 +1100 Subject: [PATCH 5/5] Bump the Chart Version Signed-off-by: Sergio Borges --- stable/prometheus-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 4485001dfdb8..a6df8ea49846 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -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