fix issue caused by #22288 (#22839)

* [stable/prometheus-operator] namespace override

Signed-off-by: yoninl2 <yong.jiang1@hp.com>

* bump chart version

Signed-off-by: Jeremy <yong.jiang1@hp.com>

* revert changes in hack folder

Signed-off-by: Jeremy <yong.jiang1@hp.com>

* [stable/prometheus-operator]fix template inside range

Signed-off-by: jeremy <yong.jiang1@hp.com>

* [stable/prometheus-operator]bump up version

Signed-off-by: jeremy <yong.jiang1@hp.com>
This commit is contained in:
yoninl2
2020-06-17 12:20:05 -07:00
committed by GitHub
parent dd4724abcc
commit 12a2824442
8 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 8.15.4
version: 8.15.5
appVersion: 0.38.1
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
@@ -17,7 +17,7 @@ items:
{{ end -}}
metadata:
name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ include "prometheus-operator.name" $ }}-alertmanager
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -12,7 +12,7 @@ items:
kind: Service
metadata:
name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ include "prometheus-operator.name" $ }}-alertmanager
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -8,7 +8,7 @@ items:
kind: PrometheusRule
metadata:
name: {{ template "prometheus-operator.name" $ }}-{{ $prometheusRuleName }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ template "prometheus-operator.name" $ }}
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -25,7 +25,7 @@ items:
kind: PrometheusRule
metadata:
name: {{ template "prometheus-operator.name" $ }}-{{ .name }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ template "prometheus-operator.name" $ }}
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -6,7 +6,7 @@ apiVersion: v1
kind: List
metadata:
name: {{ include "prometheus-operator.fullname" $ }}-prometheus-ingressperreplica
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
items:
{{ range $i, $e := until $count }}
- kind: Ingress
@@ -17,7 +17,7 @@ items:
{{ end -}}
metadata:
name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ include "prometheus-operator.name" $ }}-prometheus
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -7,7 +7,7 @@ items:
kind: PodMonitor
metadata:
name: {{ .name }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ template "prometheus-operator.name" $ }}-prometheus
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -7,7 +7,7 @@ items:
kind: ServiceMonitor
metadata:
name: {{ .name }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ template "prometheus-operator.name" $ }}-prometheus
{{ include "prometheus-operator.labels" $ | indent 8 }}
@@ -12,7 +12,7 @@ items:
kind: Service
metadata:
name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }}
namespace: {{ template "prometheus-operator.namespace" . }}
namespace: {{ template "prometheus-operator.namespace" $ }}
labels:
app: {{ include "prometheus-operator.name" $ }}-prometheus
{{ include "prometheus-operator.labels" $ | indent 8 }}