From 291dd75caac2212b9163c20358a30a7557ae92e0 Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Fri, 2 Apr 2021 16:33:35 +0200
Subject: [PATCH] all in one namespace

---
 manage/00-namespace.yaml       |  2 +-
 manage/10-channel.yaml         |  2 +-
 manage/20-placement-rules.yaml |  4 ++--
 manage/30-subscriptions.yaml   | 10 ++++------
 manage/40-application.yaml     |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/manage/00-namespace.yaml b/manage/00-namespace.yaml
index 68801c7..c436fd0 100644
--- a/manage/00-namespace.yaml
+++ b/manage/00-namespace.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: mca-hub
+  name: multi-cluster-app
 spec:
   finalizers:
   - kubernetes
diff --git a/manage/10-channel.yaml b/manage/10-channel.yaml
index e00e824..110286b 100644
--- a/manage/10-channel.yaml
+++ b/manage/10-channel.yaml
@@ -2,7 +2,7 @@ apiVersion: apps.open-cluster-management.io/v1
 kind: Channel
 metadata:
   name: multi-cluster-app
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
   type: Git
   pathname: 'https://github.com/nmasse-itix/multi-cluster-app.git'
diff --git a/manage/20-placement-rules.yaml b/manage/20-placement-rules.yaml
index 6b5fa81..dab3288 100644
--- a/manage/20-placement-rules.yaml
+++ b/manage/20-placement-rules.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: mca-dc1
   name: mca-dc1
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
   clusterSelector:
     matchLabels:
@@ -17,7 +17,7 @@ metadata:
   labels:
     app: mca-dc2
   name: mca-dc2
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
   clusterSelector:
     matchLabels:
diff --git a/manage/30-subscriptions.yaml b/manage/30-subscriptions.yaml
index f51b42a..e4a50be 100644
--- a/manage/30-subscriptions.yaml
+++ b/manage/30-subscriptions.yaml
@@ -4,13 +4,12 @@ metadata:
   annotations:
     apps.open-cluster-management.io/git-branch: main
     apps.open-cluster-management.io/git-path: deploy/overlays/prod-dc1
-    apps.open-cluster-management.io/reconcile-option: merge
   labels:
     app: mca-dc1
   name: mca-dc1
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
-  channel: mca-hub/multi-cluster-app
+  channel: multi-cluster-app/multi-cluster-app
   placement:
     placementRef:
       kind: PlacementRule
@@ -22,13 +21,12 @@ metadata:
   annotations:
     apps.open-cluster-management.io/git-branch: main
     apps.open-cluster-management.io/git-path: deploy/overlays/prod-dc2
-    apps.open-cluster-management.io/reconcile-option: merge
   labels:
     app: mca-dc2
   name: mca-dc2
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
-  channel: mca-hub/multi-cluster-app
+  channel: multi-cluster-app/multi-cluster-app
   placement:
     placementRef:
       kind: PlacementRule
diff --git a/manage/40-application.yaml b/manage/40-application.yaml
index 3201529..f7da7fd 100644
--- a/manage/40-application.yaml
+++ b/manage/40-application.yaml
@@ -2,7 +2,7 @@ apiVersion: app.k8s.io/v1beta1
 kind: Application
 metadata:
   name: mca
-  namespace: mca-hub
+  namespace: multi-cluster-app
 spec:
   componentKinds:
     - group: apps.open-cluster-management.io