use diff addon namespace for each hub

Signed-off-by: Coleen Iona Quadros <[email protected]>
stolostron · Jul 31, 2024 · 3c4e651 · 3c4e651
1 parent 16c5e81
commit 3c4e651
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/operators/multiclusterobservability/controllers/placementrule/manifestwork.go b/operators/multiclusterobservability/controllers/placementrule/manifestwork.go
@@ -214,6 +214,7 @@ func generateGlobalManifestResources(c client.Client, mco *mcov1beta2.MultiClust
 	works := []workv1.Manifest{}
 
 	// inject the namespace
+	spokeNameSpace = getSpokeNameSpace(c)
 	works = injectIntoWork(works, generateNamespace())
 
 	// inject the image pull secret

diff --git a/operators/multiclusterobservability/controllers/placementrule/namespace.go b/operators/multiclusterobservability/controllers/placementrule/namespace.go
@@ -5,7 +5,10 @@
 package placementrule
 
 import (
+	"context"
+	"github.com/stolostron/multicluster-observability-operator/operators/endpointmetrics/pkg/openshift"
 	"os"
+	client "sigs.k8s.io/controller-runtime/pkg/client"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -17,7 +20,14 @@ var (
 	spokeNameSpace = os.Getenv("SPOKE_NAMESPACE")
 )
 
+func getSpokeNameSpace(c client.Client) string {
+	clusterID, _ := openshift.GetClusterID(context.TODO(), c)
+	spokeNameSpace = spokeNameSpace + "-" + clusterID
+	return spokeNameSpace
+}
+
 func generateNamespace() *corev1.Namespace {
+
 	return &corev1.Namespace{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: corev1.SchemeGroupVersion.String(),