diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 47e9bdfc92..dc9a312e9e 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -10,7 +10,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 6.14.1 +version: 6.14.2 appVersion: 0.32.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml index ff448105b4..b7ef3d32b8 100644 --- a/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml +++ b/stable/prometheus-operator/templates/alertmanager/alertmanager.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: Alertmanager metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/ingress.yaml b/stable/prometheus-operator/templates/alertmanager/ingress.yaml index ac6306bf07..333c83b157 100644 --- a/stable/prometheus-operator/templates/alertmanager/ingress.yaml +++ b/stable/prometheus-operator/templates/alertmanager/ingress.yaml @@ -7,6 +7,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $serviceName }} + namespace: {{ .Release.Namespace }} {{- if .Values.alertmanager.ingress.annotations }} annotations: {{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml index f240fe768c..4260a48905 100644 --- a/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml +++ b/stable/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} @@ -17,4 +18,4 @@ spec: matchLabels: app: alertmanager alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml b/stable/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml index e83d8bc732..d7bb0a5947 100644 --- a/stable/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml +++ b/stable/prometheus-operator/templates/alertmanager/psp-clusterrole.yaml @@ -3,6 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml b/stable/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml index e1d06ab4bf..3755f6999c 100644 --- a/stable/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/alertmanager/psp-clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/psp.yaml b/stable/prometheus-operator/templates/alertmanager/psp.yaml index 01eda24016..e4cb5e770f 100644 --- a/stable/prometheus-operator/templates/alertmanager/psp.yaml +++ b/stable/prometheus-operator/templates/alertmanager/psp.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/secret.yaml b/stable/prometheus-operator/templates/alertmanager/secret.yaml index f12e77f906..91714ab1e6 100644 --- a/stable/prometheus-operator/templates/alertmanager/secret.yaml +++ b/stable/prometheus-operator/templates/alertmanager/secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} {{- if .Values.alertmanager.secret.annotations }} annotations: {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/service.yaml b/stable/prometheus-operator/templates/alertmanager/service.yaml index d10bf74583..b48a7787ae 100644 --- a/stable/prometheus-operator/templates/alertmanager/service.yaml +++ b/stable/prometheus-operator/templates/alertmanager/service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml index ccdd15df41..cb3af54b1e 100644 --- a/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml +++ b/stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml index cf93c5c8c5..d5f9d670bb 100644 --- a/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/alertmanager/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/core-dns/service.yaml b/stable/prometheus-operator/templates/exporters/core-dns/service.yaml index f66d1c7d85..5804186b03 100644 --- a/stable/prometheus-operator/templates/exporters/core-dns/service.yaml +++ b/stable/prometheus-operator/templates/exporters/core-dns/service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "prometheus-operator.fullname" . }}-coredns + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-coredns jobLabel: coredns @@ -17,4 +18,4 @@ spec: targetPort: {{ .Values.coreDns.service.targetPort }} selector: {{ include "prometheus-operator.rangeskipempty" .Values.coreDns.service.selector | indent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml index 5ce1446aea..a6d5430479 100644 --- a/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-coredns + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-coredns {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml index 0a921f8c1a..c191cdf60e 100644 --- a/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-apiserver + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-apiserver {{ include "prometheus-operator.labels" . | indent 4 }} 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 a74077657e..fd4aadcda8 100644 --- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml @@ -3,6 +3,7 @@ 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 @@ -17,4 +18,4 @@ subsets: - name: http-metrics port: {{ .Values.kubeControllerManager.service.port }} protocol: TCP -{{- end }} \ No newline at end of file +{{- end }} 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 f680ac36a8..841c8e0ebb 100644 --- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml @@ -3,6 +3,7 @@ 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 @@ -20,4 +21,4 @@ spec: {{ include "prometheus-operator.rangeskipempty" .Values.kubeControllerManager.service.selector | indent 4 }} {{- end }} type: ClusterIP -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml index 2f1ecab27a..3ed98bbd25 100644 --- a/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-controller-manager {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml b/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml index 6a13b7469e..441273e031 100644 --- a/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-dns/service.yaml @@ -3,6 +3,7 @@ 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 @@ -21,4 +22,4 @@ spec: targetPort: 10055 selector: {{ include "prometheus-operator.rangeskipempty" .Values.kubeDns.service.selector | indent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml index f6cc098548..8797fdec81 100644 --- a/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-dns + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-dns {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml index 537acaec8b..640eb659be 100644 --- a/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml @@ -3,6 +3,7 @@ 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 @@ -17,4 +18,4 @@ subsets: - name: http-metrics port: {{ .Values.kubeEtcd.service.port }} protocol: TCP -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml index 7b0cacb1f0..65479f68df 100644 --- a/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-etcd/service.yaml @@ -3,6 +3,7 @@ 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 @@ -20,4 +21,4 @@ spec: {{ include "prometheus-operator.rangeskipempty" .Values.kubeEtcd.service.selector | indent 4 }} {{- end }} type: ClusterIP -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml index 7d485d3bbb..1bfacbf931 100644 --- a/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-etcd + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-etcd {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml b/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml index e0bb9cb8cf..bfc577a054 100644 --- a/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-proxy/service.yaml @@ -3,6 +3,7 @@ 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 @@ -18,4 +19,4 @@ spec: selector: {{ include "prometheus-operator.rangeskipempty" .Values.kubeProxy.service.selector | indent 4 }} type: ClusterIP -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml index 541efcf8e1..262f352226 100644 --- a/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-proxy + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-proxy {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml index 26426c8478..81e33794f7 100644 --- a/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml @@ -3,6 +3,7 @@ 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 @@ -17,4 +18,4 @@ subsets: - name: http-metrics port: {{ .Values.kubeScheduler.service.port }} protocol: TCP -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml index 264b8acfe8..19531ab8e9 100644 --- a/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/service.yaml @@ -3,6 +3,7 @@ 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 @@ -20,4 +21,4 @@ spec: {{ include "prometheus-operator.rangeskipempty" .Values.kubeScheduler.service.selector | indent 4 }} {{- end }} type: ClusterIP -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml index c2a7c74ac7..c5bd33361e 100644 --- a/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-scheduler {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml index e8399a5ef2..be8a650be9 100644 --- a/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kube-state-metrics + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kube-state-metrics {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml index 196c0763f2..9a7e460dfc 100644 --- a/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-kubelet + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-kubelet {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml index bf8cd3b194..729529448f 100644 --- a/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-node-exporter + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-node-exporter {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml index 0289154b9f..4f28174ca5 100644 --- a/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml +++ b/stable/prometheus-operator/templates/grafana/configmap-dashboards.yaml @@ -10,6 +10,7 @@ items: kind: ConfigMap metadata: name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} + namespace: {{ .Release.Namespace }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" diff --git a/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml index a359bb7f8e..ecc4775ea3 100644 --- a/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml +++ b/stable/prometheus-operator/templates/grafana/configmaps-datasources.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "prometheus-operator.fullname" . }}-grafana-datasource + namespace: {{ .Release.Namespace }} labels: {{ $.Values.grafana.sidecar.datasources.label }}: "1" app: {{ template "prometheus-operator.name" $ }}-grafana diff --git a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml index eed5e18d6e..a7bf866fd5 100644 --- a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-grafana + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-grafana {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml index f8728e56cb..ba5e2701a5 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -25,4 +26,4 @@ rules: resourceNames: - {{ template "prometheus-operator.fullname" . }}-admission {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml index 51c5bd9d37..eb16c0ece9 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -17,4 +18,4 @@ subjects: - kind: ServiceAccount name: {{ template "prometheus-operator.fullname" . }}-admission namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml index 11a28cb944..ba3f75dfcf 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml @@ -3,6 +3,7 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ template "prometheus-operator.fullname" . }}-admission-create + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml index 6f1a94fd38..8af854e4a9 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -3,6 +3,7 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ template "prometheus-operator.fullname" . }}-admission-patch + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml index 1f15a6c812..e40e58435f 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml index 13cf84ed1f..e067bcc945 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -17,4 +18,4 @@ rules: verbs: - get - create -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml index 1ae2f2286f..3ed31c2cad 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -17,4 +18,4 @@ subjects: - kind: ServiceAccount name: {{ template "prometheus-operator.fullname" . }}-admission namespace: {{ .Release.Namespace }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml index cba67200b8..a8b47da202 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml @@ -3,10 +3,11 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: app: {{ template "prometheus-operator.name" $ }}-admission {{- include "prometheus-operator.labels" $ | indent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml index 2065e2ea20..749616afc5 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml @@ -3,6 +3,7 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: MutatingWebhookConfiguration metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }}-admission {{- include "prometheus-operator.labels" $ | indent 4 }} @@ -28,4 +29,4 @@ webhooks: namespace: {{ .Release.Namespace }} name: {{ template "prometheus-operator.operator.fullname" $ }} path: /admission-prometheusrules/mutate -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml index bc45ceca6d..0dbdddebbe 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml @@ -3,6 +3,7 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: ValidatingWebhookConfiguration metadata: name: {{ template "prometheus-operator.fullname" . }}-admission + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }}-admission {{- include "prometheus-operator.labels" $ | indent 4 }} @@ -28,4 +29,4 @@ webhooks: namespace: {{ .Release.Namespace }} name: {{ template "prometheus-operator.operator.fullname" $ }} path: /admission-prometheusrules/validate -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/stable/prometheus-operator/templates/prometheus-operator/clusterrole.yaml index 2969ca2531..932a90430a 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/clusterrole.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/clusterrole.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml index 13f0ca0702..28f15462c1 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml b/stable/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml index 429214c640..f39271b549 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/crd-alertmanager.yaml @@ -5,6 +5,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: {{ printf "alertmanagers.%s" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/crd-podmonitor.yaml b/stable/prometheus-operator/templates/prometheus-operator/crd-podmonitor.yaml index f9b6dce393..521dfb7d81 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/crd-podmonitor.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/crd-podmonitor.yaml @@ -5,6 +5,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: {{ printf "podmonitors.%s" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml b/stable/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml index a0e30d3399..dba54cdbc4 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/crd-prometheus.yaml @@ -5,6 +5,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: {{ printf "prometheuses.%s" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/stable/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml index 932a3acb0e..b2f756c122 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml @@ -5,6 +5,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: {{ printf "prometheusrules.%s" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml b/stable/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml index 9ccb7bc1f4..834143c567 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/crd-servicemonitor.yaml @@ -5,6 +5,7 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: {{ printf "servicemonitors.%s" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml index 5a483abbc6..603dccdf18 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/deployment.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml index 748ec293e0..0af7e5b9db 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml @@ -3,6 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "prometheus-operator.fullname" . }}-operator-psp + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml index 77a87a3948..2101305c9d 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -3,6 +3,7 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "prometheus-operator.fullname" . }}-operator-psp + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml index 38491a213f..63dde8f1de 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/service.yaml b/stable/prometheus-operator/templates/prometheus-operator/service.yaml index 8c5780b39b..faeafcc09b 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/service.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml index fbf876855e..bfd28586c8 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "prometheus-operator.operator.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml index 93da125968..4679accd73 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-operator + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml index 1c54f40b07..08adf60043 100644 --- a/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/stable/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml @@ -3,9 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-relabel-confg + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus-am-relabel-confg {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alert-relabel-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml index 4475e7bd47..ef22f25216 100644 --- a/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/stable/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml @@ -3,9 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-confg + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus-am-confg {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alertmanager-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml index e2cc8a9b7c..125b4382e1 100644 --- a/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml +++ b/stable/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml @@ -8,6 +8,7 @@ items: kind: PrometheusRule metadata: name: {{ template "prometheus-operator.name" $ }}-{{ $prometheusRuleName }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }} {{ include "prometheus-operator.labels" $ | indent 8 }} @@ -24,6 +25,7 @@ items: kind: PrometheusRule metadata: name: {{ template "prometheus-operator.name" $ }}-{{ .name }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }} {{ include "prometheus-operator.labels" $ | indent 8 }} diff --git a/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml index 9d6bb616e1..6f4ebf8046 100644 --- a/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml +++ b/stable/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml @@ -3,9 +3,10 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus-scrape-confg + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus-scrape-confg {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-scrape-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalScrapeConfigs | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus/clusterrole.yaml b/stable/prometheus-operator/templates/prometheus/clusterrole.yaml index 4dc3dc183a..31c6b63a22 100644 --- a/stable/prometheus-operator/templates/prometheus/clusterrole.yaml +++ b/stable/prometheus-operator/templates/prometheus/clusterrole.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml index b0c0e9e175..471892dfa7 100644 --- a/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus/clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/ingress.yaml b/stable/prometheus-operator/templates/prometheus/ingress.yaml index d6b16ace3b..dca48b52e2 100644 --- a/stable/prometheus-operator/templates/prometheus/ingress.yaml +++ b/stable/prometheus-operator/templates/prometheus/ingress.yaml @@ -11,6 +11,7 @@ metadata: {{ toYaml .Values.prometheus.ingress.annotations | indent 4 }} {{- end }} name: {{ $serviceName }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml b/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml index 8b1caf1c25..89fc23df4e 100644 --- a/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml +++ b/stable/prometheus-operator/templates/prometheus/ingressperreplica.yaml @@ -6,12 +6,14 @@ apiVersion: extensions/v1beta1 kind: IngressList metadata: name: {{ include "prometheus-operator.fullname" $ }}-prometheus-ingressperreplica + namespace: {{ .Release.Namespace }} items: {{ range $i, $e := until $count }} - apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "prometheus-operator.name" $ }}-prometheus {{ include "prometheus-operator.labels" $ | indent 8 }} diff --git a/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml index a51cda5d2e..db5c882b21 100644 --- a/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml +++ b/stable/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} @@ -17,4 +18,4 @@ spec: matchLabels: app: prometheus prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus -{{- end }} \ No newline at end of file +{{- end }} diff --git a/stable/prometheus-operator/templates/prometheus/podmonitors.yaml b/stable/prometheus-operator/templates/prometheus/podmonitors.yaml index 8b8a0cc62b..e84576d7f4 100644 --- a/stable/prometheus-operator/templates/prometheus/podmonitors.yaml +++ b/stable/prometheus-operator/templates/prometheus/podmonitors.yaml @@ -7,6 +7,7 @@ items: kind: PodMonitor metadata: name: {{ .name }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }}-prometheus {{ include "prometheus-operator.labels" $ | indent 8 }} diff --git a/stable/prometheus-operator/templates/prometheus/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/prometheus.yaml index 4623a0a0f5..5466db3d5f 100644 --- a/stable/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/prometheus.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: Prometheus metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/stable/prometheus-operator/templates/prometheus/psp-clusterrole.yaml index a2ab02dbd4..771cdef8a3 100644 --- a/stable/prometheus-operator/templates/prometheus/psp-clusterrole.yaml +++ b/stable/prometheus-operator/templates/prometheus/psp-clusterrole.yaml @@ -3,6 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml index 08faa722f7..d11d28d7fc 100644 --- a/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml +++ b/stable/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/psp.yaml b/stable/prometheus-operator/templates/prometheus/psp.yaml index da6f108db9..2e3771efd6 100644 --- a/stable/prometheus-operator/templates/prometheus/psp.yaml +++ b/stable/prometheus-operator/templates/prometheus/psp.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/service.yaml b/stable/prometheus-operator/templates/prometheus/service.yaml index e1736dd496..c4ef28c1a5 100644 --- a/stable/prometheus-operator/templates/prometheus/service.yaml +++ b/stable/prometheus-operator/templates/prometheus/service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml index bed5f58f14..ac4faba445 100644 --- a/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml +++ b/stable/prometheus-operator/templates/prometheus/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml b/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml index 82eddcba1a..4584625def 100644 --- a/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/prometheus/servicemonitor.yaml @@ -3,6 +3,7 @@ apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default kind: ServiceMonitor metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml b/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml index 92ffa2d3ee..7b14cb9e84 100644 --- a/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml +++ b/stable/prometheus-operator/templates/prometheus/servicemonitors.yaml @@ -7,6 +7,7 @@ items: kind: ServiceMonitor metadata: name: {{ .name }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "prometheus-operator.name" $ }}-prometheus {{ include "prometheus-operator.labels" $ | indent 8 }} diff --git a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml index 8058bb6132..0595e270bb 100644 --- a/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml +++ b/stable/prometheus-operator/templates/prometheus/serviceperreplica.yaml @@ -5,12 +5,14 @@ apiVersion: v1 kind: ServiceList metadata: name: {{ include "prometheus-operator.fullname" $ }}-prometheus-serviceperreplica + namespace: {{ .Release.Namespace }} items: {{ range $i, $e := until $count }} - apiVersion: v1 kind: Service metadata: name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ .Release.Namespace }} labels: app: {{ include "prometheus-operator.name" $ }}-prometheus {{ include "prometheus-operator.labels" $ | indent 8 }}