From 3541f78f8403f57d408ea143e048e424fd5071ee Mon Sep 17 00:00:00 2001 From: Raul Marrero Date: Thu, 2 May 2019 09:54:15 +0100 Subject: [PATCH] Add release namespace to all helm charts --- deployments/helm-chart/Chart.yaml | 2 +- deployments/helm-chart/templates/controller-configmap.yaml | 1 + deployments/helm-chart/templates/controller-daemonset.yaml | 1 + deployments/helm-chart/templates/controller-deployment.yaml | 1 + deployments/helm-chart/templates/controller-secret.yaml | 1 + deployments/helm-chart/templates/controller-service.yaml | 1 + deployments/helm-chart/templates/controller-serviceaccount.yaml | 1 + .../helm-chart/templates/controller-wildcard-secret.yaml | 1 + deployments/helm-chart/templates/rbac.yaml | 1 + 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/deployments/helm-chart/Chart.yaml b/deployments/helm-chart/Chart.yaml index 8bc4b61a83..be50fb392b 100644 --- a/deployments/helm-chart/Chart.yaml +++ b/deployments/helm-chart/Chart.yaml @@ -1,5 +1,5 @@ name: nginx-ingress -version: 0.5.0 +version: 0.6.0 appVersion: edge description: NGINX Ingress Controller icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/master/deployments/helm-chart/chart-icon.png diff --git a/deployments/helm-chart/templates/controller-configmap.yaml b/deployments/helm-chart/templates/controller-configmap.yaml index cead0fee23..4ccfc5e856 100644 --- a/deployments/helm-chart/templates/controller-configmap.yaml +++ b/deployments/helm-chart/templates/controller-configmap.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "nginx-ingress.configName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} data: diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml index 7a351715ff..628a93c47e 100644 --- a/deployments/helm-chart/templates/controller-daemonset.yaml +++ b/deployments/helm-chart/templates/controller-daemonset.yaml @@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: {{ default (include "nginx-ingress.name" .) .Values.controller.name }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} spec: diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml index 0cd1259aae..2a1097628b 100644 --- a/deployments/helm-chart/templates/controller-deployment.yaml +++ b/deployments/helm-chart/templates/controller-deployment.yaml @@ -3,6 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: {{ default (include "nginx-ingress.name" .) .Values.controller.name }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} spec: diff --git a/deployments/helm-chart/templates/controller-secret.yaml b/deployments/helm-chart/templates/controller-secret.yaml index bcb83b7ac4..2c12d2208c 100644 --- a/deployments/helm-chart/templates/controller-secret.yaml +++ b/deployments/helm-chart/templates/controller-secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "nginx-ingress.defaultTLSName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} type: Opaque diff --git a/deployments/helm-chart/templates/controller-service.yaml b/deployments/helm-chart/templates/controller-service.yaml index 6148d7725a..ece002cf39 100644 --- a/deployments/helm-chart/templates/controller-service.yaml +++ b/deployments/helm-chart/templates/controller-service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "nginx-ingress.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} {{- if .Values.controller.service.annotations }} diff --git a/deployments/helm-chart/templates/controller-serviceaccount.yaml b/deployments/helm-chart/templates/controller-serviceaccount.yaml index c6b868d6bd..741c28d000 100644 --- a/deployments/helm-chart/templates/controller-serviceaccount.yaml +++ b/deployments/helm-chart/templates/controller-serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "nginx-ingress.serviceAccountName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} {{- if .Values.controller.serviceAccount.imagePullSecrets }} diff --git a/deployments/helm-chart/templates/controller-wildcard-secret.yaml b/deployments/helm-chart/templates/controller-wildcard-secret.yaml index 457667d0f7..0d852132c4 100644 --- a/deployments/helm-chart/templates/controller-wildcard-secret.yaml +++ b/deployments/helm-chart/templates/controller-wildcard-secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ include "nginx-ingress.wildcardTLSName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} type: Opaque diff --git a/deployments/helm-chart/templates/rbac.yaml b/deployments/helm-chart/templates/rbac.yaml index 9a26c6056f..d20483ffa8 100644 --- a/deployments/helm-chart/templates/rbac.yaml +++ b/deployments/helm-chart/templates/rbac.yaml @@ -3,6 +3,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: {{ include "nginx-ingress.name" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} rules: