mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/prometheus-operator] Remove duplicate namespace values (#18363)
* Remove duplicate namespace values There were additional namespace keys in some service templates, which caused a duplicate namespace error. Signed-off-by: Mercedes Coyle <mercedes@harmonylabs.org> Signed-off-by: Mercedes Coyle <me@mercedescoyle.com> * Remove release namespace The services and endpoints should always use the kube-system namespace. Signed-off-by: Mercedes Coyle <me@mercedescoyle.com> * Bump chart version Signed-off-by: Mercedes Coyle <me@mercedescoyle.com>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
3eb622dfe7
commit
13b1c252c4
@@ -12,7 +12,7 @@ sources:
|
||||
- https://github.com/coreos/kube-prometheus
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
- https://coreos.com/operators/prometheus
|
||||
version: 8.1.0
|
||||
version: 8.1.1
|
||||
appVersion: 0.34.0
|
||||
tillerVersion: ">=2.12.0"
|
||||
home: https://github.com/coreos/prometheus-operator
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-coredns
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-coredns
|
||||
jobLabel: coredns
|
||||
|
||||
+1
-2
@@ -3,12 +3,11 @@ apiVersion: v1
|
||||
kind: Endpoints
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-controller-manager
|
||||
k8s-app: kube-controller-manager
|
||||
{{ include "prometheus-operator.labels" . | indent 4 }}
|
||||
namespace: kube-system
|
||||
namespace: kube-system
|
||||
subsets:
|
||||
- addresses:
|
||||
{{- range .Values.kubeControllerManager.endpoints }}
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-controller-manager
|
||||
jobLabel: kube-controller-manager
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-dns
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-dns
|
||||
jobLabel: kube-dns
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Endpoints
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-etcd
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-etcd
|
||||
k8s-app: etcd-server
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-etcd
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-etcd
|
||||
jobLabel: kube-etcd
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Endpoints
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-proxy
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-proxy
|
||||
k8s-app: kube-proxy
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-proxy
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-proxy
|
||||
jobLabel: kube-proxy
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Endpoints
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-scheduler
|
||||
k8s-app: kube-scheduler
|
||||
|
||||
@@ -3,7 +3,6 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler
|
||||
namespace: {{ $.Release.Namespace }}
|
||||
labels:
|
||||
app: {{ template "prometheus-operator.name" . }}-kube-scheduler
|
||||
jobLabel: kube-scheduler
|
||||
|
||||
Reference in New Issue
Block a user