update: use namespace dyniamically from operator env than hardcode va…

…lue (opendatahub-io#1298) - thses are only needed when it is downstream speicific cases Signed-off-by: Wen Zhou <[email protected]>
red-hat-data-services · Oct 11, 2024 · fa63b4d · fa63b4d
1 parent e8e266f
commit fa63b4d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/controllers/dscinitialization/utils.go b/controllers/dscinitialization/utils.go
@@ -195,8 +195,14 @@ func (r *DSCInitializationReconciler) createDefaultRoleBinding(ctx context.Conte
 func (r *DSCInitializationReconciler) reconcileDefaultNetworkPolicy(ctx context.Context, name string, dscInit *dsciv1.DSCInitialization, platform cluster.Platform) error {
 	log := r.Log
 	if platform == cluster.ManagedRhods || platform == cluster.SelfManagedRhods {
+		// Get operator namepsace
+		operatorNs, err := cluster.GetOperatorNamespace()
+		if err != nil {
+			log.Error(err, "error getting operator namespace for networkplicy creation")
+			return err
+		}
 		// Deploy networkpolicy for operator namespace
-		err := deploy.DeployManifestsFromPath(ctx, r.Client, dscInit, networkpolicyPath+"/operator", "redhat-ods-operator", "networkpolicy", true)
+		err = deploy.DeployManifestsFromPath(ctx, r.Client, dscInit, networkpolicyPath+"/operator", operatorNs, "networkpolicy", true)
 		if err != nil {
 			log.Error(err, "error to set networkpolicy in operator namespace", "path", networkpolicyPath)
 			return err

diff --git a/main.go b/main.go
@@ -359,7 +359,11 @@ func createSecretCacheConfig(platform cluster.Platform) map[string]cache.Config
 	case cluster.ManagedRhods:
 		namespaceConfigs["redhat-ods-monitoring"] = cache.Config{}
 		namespaceConfigs["redhat-ods-applications"] = cache.Config{}
-		namespaceConfigs["redhat-ods-operator"] = cache.Config{}
+		operatorNs, err := cluster.GetOperatorNamespace()
+		if err != nil {
+			operatorNs = "redhat-ods-operator" // fall back case
+		}
+		namespaceConfigs[operatorNs] = cache.Config{}
 	case cluster.SelfManagedRhods:
 		namespaceConfigs["redhat-ods-applications"] = cache.Config{}
 	default:

diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go
@@ -160,7 +160,11 @@ func detectSelfManaged(ctx context.Context, cli client.Client) (Platform, error)
 // detectManagedRHODS checks if catsrc CR add-on exists ManagedRhods.
 func detectManagedRHODS(ctx context.Context, cli client.Client) (Platform, error) {
 	catalogSource := &ofapiv1alpha1.CatalogSource{}
-	err := cli.Get(ctx, client.ObjectKey{Name: "addon-managed-odh-catalog", Namespace: "redhat-ods-operator"}, catalogSource)
+	operatorNs, err := GetOperatorNamespace()
+	if err != nil {
+		operatorNs = "redhat-ods-operator"
+	}
+	err = cli.Get(ctx, client.ObjectKey{Name: "addon-managed-odh-catalog", Namespace: operatorNs}, catalogSource)
 	if err != nil {
 		return Unknown, client.IgnoreNotFound(err)
 	}