Merge pull request #517 from mbrancato/add_explicit_namespace

Add explicit namespace field to namespaced resources
fluxcd · Oct 9, 2020 · 90f4946 · 90f4946
2 parents 630065f + ea3c8e1
commit 90f4946
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 1 deletion.
diff --git a/chart/helm-operator/templates/deployment.yaml b/chart/helm-operator/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "helm-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "helm-operator.name" . }}
     chart: {{ template "helm-operator.chart" . }}

diff --git a/chart/helm-operator/templates/git-secret.yaml b/chart/helm-operator/templates/git-secret.yaml
@@ -3,5 +3,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "helm-operator.fullname" . }}-git-deploy
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 {{- end -}}
diff --git a/chart/helm-operator/templates/gitconfig.yaml b/chart/helm-operator/templates/gitconfig.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "git.config.secretName" . }}
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
   gitconfig: {{ .Values.git.config.data | b64enc }}

diff --git a/chart/helm-operator/templates/helm-repositories.yaml b/chart/helm-operator/templates/helm-repositories.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Values.configureRepositories.secretName }}
+  namespace: {{ .Release.Namespace }}
 type: Opaque
 data:
   repositories.yaml: {{ include "helm-operator.customRepositories" . | b64enc }}

diff --git a/chart/helm-operator/templates/helm-tls.yaml b/chart/helm-operator/templates/helm-tls.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "helm-operator.fullname" . }}-helm-tls-ca-config
+  namespace: {{ .Release.Namespace }}
 data:
   ca.crt: |
 {{ .Values.tls.caContent | indent 4 }}

diff --git a/chart/helm-operator/templates/kube.yaml b/chart/helm-operator/templates/kube.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "helm-operator.fullname" . }}-kube-config
+  namespace: {{ .Release.Namespace }}
 data:
   config: |
     {{- if not .Values.clusterRole.create }}
@@ -25,4 +26,4 @@ data:
       {{- else }}
     {{ .Values.kube.config }}
       {{- end }}
-    {{- end }}
+    {{- end }}
diff --git a/chart/helm-operator/templates/rbac-role.yaml b/chart/helm-operator/templates/rbac-role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
   name: {{ template "helm-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "helm-operator.name" . }}
     chart: {{ template "helm-operator.chart" . }}
@@ -20,6 +21,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
   name: {{ template "helm-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "helm-operator.name" . }}
     chart: {{ template "helm-operator.chart" . }}

diff --git a/chart/helm-operator/templates/service.yaml b/chart/helm-operator/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "helm-operator.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "helm-operator.name" . }}
     chart: {{ template "helm-operator.chart" . }}

diff --git a/chart/helm-operator/templates/serviceaccount.yaml b/chart/helm-operator/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "helm-operator.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "helm-operator.name" . }}
     chart: {{ template "helm-operator.chart" . }}

diff --git a/chart/helm-operator/templates/ssh.yaml b/chart/helm-operator/templates/ssh.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "helm-operator.fullname" . }}-ssh-config
+  namespace: {{ .Release.Namespace }}
 data:
   known_hosts: |
     {{- if .Values.git.ssh.known_hosts }}