From 30b43ea0feea26755677bb07b8b6df9c4b0193f9 Mon Sep 17 00:00:00 2001 From: "Riccardo M. Cefala" Date: Wed, 8 Jul 2020 16:53:08 +0200 Subject: [PATCH] [stable/prometheus-operator] remove namespace field from non-namespaced resources (#22949) * [stable/prometheus-operator] remove namespace field from non-namespaced resources Signed-off-by: Riccardo M. Cefala * [stable/prometheus-operator] bump chart version Signed-off-by: Riccardo M. Cefala --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/templates/alertmanager/psp.yaml | 1 - .../admission-webhooks/job-patch/clusterrolebinding.yaml | 1 - .../prometheus-operator/admission-webhooks/job-patch/psp.yaml | 1 - .../prometheus-operator/templates/prometheus-operator/psp.yaml | 1 - stable/prometheus-operator/templates/prometheus/psp.yaml | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index ba91022f59..62ca5d036d 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.15.12 +version: 8.15.13 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/templates/alertmanager/psp.yaml b/stable/prometheus-operator/templates/alertmanager/psp.yaml index 7c9949c2db..9726175abe 100644 --- a/stable/prometheus-operator/templates/alertmanager/psp.yaml +++ b/stable/prometheus-operator/templates/alertmanager/psp.yaml @@ -3,7 +3,6 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} labels: app: {{ template "prometheus-operator.name" . }}-alertmanager {{- if .Values.global.rbac.pspAnnotations }} 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 a1313b9a99..8da76caaa0 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,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.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/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml index 782157802a..42ad8828e9 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,7 +3,6 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.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/psp.yaml b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml index e202042412..307bc312d9 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/psp.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/psp.yaml @@ -3,7 +3,6 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} labels: app: {{ template "prometheus-operator.name" . }}-operator {{- if .Values.global.rbac.pspAnnotations }} diff --git a/stable/prometheus-operator/templates/prometheus/psp.yaml b/stable/prometheus-operator/templates/prometheus/psp.yaml index 6a238f88b9..4ba198155d 100644 --- a/stable/prometheus-operator/templates/prometheus/psp.yaml +++ b/stable/prometheus-operator/templates/prometheus/psp.yaml @@ -3,7 +3,6 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} labels: app: {{ template "prometheus-operator.name" . }}-prometheus {{- if .Values.global.rbac.pspAnnotations }}