From 13b1c252c42455ef3ebf5fa84bbeee4061b5ac72 Mon Sep 17 00:00:00 2001 From: Mercedes Coyle Date: Wed, 6 Nov 2019 05:21:51 -0800 Subject: [PATCH] [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 Signed-off-by: Mercedes Coyle * Remove release namespace The services and endpoints should always use the kube-system namespace. Signed-off-by: Mercedes Coyle * Bump chart version Signed-off-by: Mercedes Coyle --- stable/prometheus-operator/Chart.yaml | 2 +- .../templates/exporters/core-dns/service.yaml | 1 - .../templates/exporters/kube-controller-manager/endpoints.yaml | 3 +-- .../templates/exporters/kube-controller-manager/service.yaml | 1 - .../templates/exporters/kube-dns/service.yaml | 1 - .../templates/exporters/kube-etcd/endpoints.yaml | 1 - .../templates/exporters/kube-etcd/service.yaml | 1 - .../templates/exporters/kube-proxy/endpoints.yaml | 1 - .../templates/exporters/kube-proxy/service.yaml | 1 - .../templates/exporters/kube-scheduler/endpoints.yaml | 1 - .../templates/exporters/kube-scheduler/service.yaml | 1 - 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 69d926621f..858306b7c3 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.1.0 +version: 8.1.1 appVersion: 0.34.0 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/templates/exporters/core-dns/service.yaml b/stable/prometheus-operator/templates/exporters/core-dns/service.yaml index 0bf202ae16..707e5ca328 100644 --- a/stable/prometheus-operator/templates/exporters/core-dns/service.yaml +++ b/stable/prometheus-operator/templates/exporters/core-dns/service.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml index cbeb8d2bb4..205364fc3e 100644 --- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml @@ -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 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml b/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml index 2646cbb385..70458fdae4 100644 --- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml b/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml index 55ed36a253..84ffb9685b 100644 --- a/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml index 59d25e4f5a..ee603de76f 100644 --- a/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml index b716914be1..af9e8cae40 100644 --- a/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml index 4c83068afb..3a71c397e6 100644 --- a/stable/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml b/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml index 62567cc7c6..b111752378 100644 --- a/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml index aabbfd7769..2c0c327f60 100644 --- a/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml @@ -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 diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml index fa0e763cb6..d74409658d 100644 --- a/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml @@ -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