From 2ea77442d176f194b82b38fed7d5fa0fc9470883 Mon Sep 17 00:00:00 2001 From: eduardo aleixo Date: Tue, 21 May 2019 17:48:08 -0300 Subject: [PATCH] add namespace metadata (#13956) this is needed for when helm is used purely as a templating tool, since helm template does not add the namespace helm/helm#3553 Signed-off-by: eduardo aleixo --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/templates/configmap.yaml | 1 + stable/rabbitmq-ha/templates/ingress.yaml | 1 + stable/rabbitmq-ha/templates/pdb.yaml | 1 + stable/rabbitmq-ha/templates/role.yaml | 1 + stable/rabbitmq-ha/templates/rolebinding.yaml | 2 ++ stable/rabbitmq-ha/templates/secret.yaml | 1 + stable/rabbitmq-ha/templates/service-discovery.yaml | 1 + stable/rabbitmq-ha/templates/service.yaml | 1 + stable/rabbitmq-ha/templates/serviceaccount.yaml | 3 ++- stable/rabbitmq-ha/templates/statefulset.yaml | 1 + 11 files changed, 13 insertions(+), 2 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 5011ed11aa..b6fd261b95 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.12 -version: 1.27.0 +version: 1.27.1 description: Highly available RabbitMQ cluster, the open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). keywords: diff --git a/stable/rabbitmq-ha/templates/configmap.yaml b/stable/rabbitmq-ha/templates/configmap.yaml index 7f160a057d..ff9ebe2b3c 100644 --- a/stable/rabbitmq-ha/templates/configmap.yaml +++ b/stable/rabbitmq-ha/templates/configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/ingress.yaml b/stable/rabbitmq-ha/templates/ingress.yaml index b0aa443446..4949948d03 100644 --- a/stable/rabbitmq-ha/templates/ingress.yaml +++ b/stable/rabbitmq-ha/templates/ingress.yaml @@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/pdb.yaml b/stable/rabbitmq-ha/templates/pdb.yaml index f165e59ab4..60a8dc80c0 100644 --- a/stable/rabbitmq-ha/templates/pdb.yaml +++ b/stable/rabbitmq-ha/templates/pdb.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/role.yaml b/stable/rabbitmq-ha/templates/role.yaml index 1a2ff8101d..0e0fcf7f82 100644 --- a/stable/rabbitmq-ha/templates/role.yaml +++ b/stable/rabbitmq-ha/templates/role.yaml @@ -11,6 +11,7 @@ metadata: {{ toYaml .Values.extraLabels | indent 4 }} {{- end }} name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} rules: - apiGroups: [""] resources: ["endpoints"] diff --git a/stable/rabbitmq-ha/templates/rolebinding.yaml b/stable/rabbitmq-ha/templates/rolebinding.yaml index 60b83e3547..620b0b71ac 100644 --- a/stable/rabbitmq-ha/templates/rolebinding.yaml +++ b/stable/rabbitmq-ha/templates/rolebinding.yaml @@ -11,9 +11,11 @@ metadata: {{ toYaml .Values.extraLabels | indent 4 }} {{- end }} name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} subjects: - kind: ServiceAccount name: {{ template "rabbitmq-ha.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/stable/rabbitmq-ha/templates/secret.yaml b/stable/rabbitmq-ha/templates/secret.yaml index b3ad273ef9..16c89e239f 100644 --- a/stable/rabbitmq-ha/templates/secret.yaml +++ b/stable/rabbitmq-ha/templates/secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/service-discovery.yaml b/stable/rabbitmq-ha/templates/service-discovery.yaml index e4985196d3..e9cee944fd 100644 --- a/stable/rabbitmq-ha/templates/service-discovery.yaml +++ b/stable/rabbitmq-ha/templates/service-discovery.yaml @@ -7,6 +7,7 @@ metadata: {{ toYaml .Values.service.annotations | indent 4 }} {{- end }} name: {{ printf "%s-discovery" (include "rabbitmq-ha.fullname" .) | trunc 63 | trimSuffix "-" }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/service.yaml b/stable/rabbitmq-ha/templates/service.yaml index 52c48b806d..8a6ac8a2dd 100644 --- a/stable/rabbitmq-ha/templates/service.yaml +++ b/stable/rabbitmq-ha/templates/service.yaml @@ -12,6 +12,7 @@ metadata: prometheus.io/port: {{ .Values.prometheus.exporter.port | quote }} {{- end }} name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }} diff --git a/stable/rabbitmq-ha/templates/serviceaccount.yaml b/stable/rabbitmq-ha/templates/serviceaccount.yaml index 268bce1432..04a438f654 100644 --- a/stable/rabbitmq-ha/templates/serviceaccount.yaml +++ b/stable/rabbitmq-ha/templates/serviceaccount.yaml @@ -11,4 +11,5 @@ metadata: {{ toYaml .Values.extraLabels | indent 4 }} {{- end }} name: {{ template "rabbitmq-ha.serviceAccountName" . }} -{{- end }} + namespace: {{ .Release.Namespace }} +{{- end }} \ No newline at end of file diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index b1106b40b6..c3943c19dc 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: {{ template "rabbitmq-ha.fullname" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "rabbitmq-ha.name" . }} chart: {{ template "rabbitmq-ha.chart" . }}