From 935ccfc80f3176255e405142e2ff1b7b32a72dc5 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 12 May 2022 09:45:45 +0200 Subject: [PATCH] [bitnami/wordpress-intel] Add missing namespace metadata (#10162) * [bitnami/wordpress-intel] Add missing namespace metadata Signed-off-by: Miguel Ruiz * ServiceMonitor namespace Signed-off-by: Miguel Ruiz * Add quotes Signed-off-by: Miguel Ruiz --- .../templates/networkpolicy-backend-ingress.yaml | 1 + bitnami/wordpress-intel/templates/networkpolicy-egress.yaml | 1 + .../wordpress-intel/templates/networkpolicy-ingress.yaml | 1 + bitnami/wordpress-intel/templates/servicemonitor.yaml | 6 +----- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bitnami/wordpress-intel/templates/networkpolicy-backend-ingress.yaml b/bitnami/wordpress-intel/templates/networkpolicy-backend-ingress.yaml index 99ce711daa..e69a024e70 100644 --- a/bitnami/wordpress-intel/templates/networkpolicy-backend-ingress.yaml +++ b/bitnami/wordpress-intel/templates/networkpolicy-backend-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-backend" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/wordpress-intel/templates/networkpolicy-egress.yaml b/bitnami/wordpress-intel/templates/networkpolicy-egress.yaml index d8b8242da6..d908e9b883 100644 --- a/bitnami/wordpress-intel/templates/networkpolicy-egress.yaml +++ b/bitnami/wordpress-intel/templates/networkpolicy-egress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-egress" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/wordpress-intel/templates/networkpolicy-ingress.yaml b/bitnami/wordpress-intel/templates/networkpolicy-ingress.yaml index 4581bd06ef..caecddd9b6 100644 --- a/bitnami/wordpress-intel/templates/networkpolicy-ingress.yaml +++ b/bitnami/wordpress-intel/templates/networkpolicy-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-ingress" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/wordpress-intel/templates/servicemonitor.yaml b/bitnami/wordpress-intel/templates/servicemonitor.yaml index fef498241c..4d20e7d475 100644 --- a/bitnami/wordpress-intel/templates/servicemonitor.yaml +++ b/bitnami/wordpress-intel/templates/servicemonitor.yaml @@ -3,11 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "common.names.fullname" . }} - {{- if .Values.metrics.serviceMonitor.namespace }} - namespace: {{ .Values.metrics.serviceMonitor.namespace | quote }} - {{- else }} - namespace: {{ .Release.Namespace | quote }} - {{- end }} + namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: metrics {{- if .Values.metrics.serviceMonitor.additionalLabels }}