From 7ef9218de9fb06ecff7e1c156ab59bf469fe2baf Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Fri, 24 Apr 2020 12:17:33 +0300
Subject: [PATCH] deploy: reusable config

---
 config/default/kustomization.yaml          | 3 ++-
 config/{manager => default}/namespace.yaml | 2 +-
 config/manager/deployment.yaml             | 3 +--
 config/manager/kustomization.yaml          | 1 -
 config/manager/service.yaml                | 3 +--
 config/rbac/kustomization.yaml             | 1 +
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename config/{manager => default}/namespace.yaml (78%)

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index f9dba8ba..78b97f6a 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,8 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: source-system
-namePrefix: source-
 bases:
 - ../crd
 - ../rbac
 - ../manager
+resources:
+  - namespace.yaml
diff --git a/config/manager/namespace.yaml b/config/default/namespace.yaml
similarity index 78%
rename from config/manager/namespace.yaml
rename to config/default/namespace.yaml
index 51b2818c..6743d7fa 100644
--- a/config/manager/namespace.yaml
+++ b/config/default/namespace.yaml
@@ -3,4 +3,4 @@ kind: Namespace
 metadata:
   labels:
     control-plane: controller
-  name: system
+  name: source-system
diff --git a/config/manager/deployment.yaml b/config/manager/deployment.yaml
index 8c0f3f5d..95dc466a 100644
--- a/config/manager/deployment.yaml
+++ b/config/manager/deployment.yaml
@@ -1,8 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller
-  namespace: system
+  name: source-controller
   labels:
     control-plane: controller
 spec:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 2edf08b8..ffc17fa3 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,7 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- namespace.yaml
 - service.yaml
 - deployment.yaml
 images:
diff --git a/config/manager/service.yaml b/config/manager/service.yaml
index e03b237b..66ee36bd 100644
--- a/config/manager/service.yaml
+++ b/config/manager/service.yaml
@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: controller
-  namespace: system
+  name: source-controller
   labels:
     control-plane: controller
 spec:
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
index eaa92570..b77a5ae1 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namePrefix: source-
 resources:
 - role.yaml
 - role_binding.yaml