feat: pass platform from env variable or fall back to use old logic (o…

…pendatahub-io#1252) * feat: pass platform from env variables or fall back to use old logic - introduce new env var ODH_PLATFORM_TYPE, value set during build time - if value not match, fall back to detect managed then self-managed Signed-off-by: Wen Zhou <[email protected]> --------- Signed-off-by: Wen Zhou <[email protected]> (cherry picked from commit 283d350)
red-hat-data-services · Oct 17, 2024 · e5b9904 · e5b9904
1 parent 4263893
commit e5b9904
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -103,7 +103,7 @@ metadata:
     categories: AI/Machine Learning, Big Data
     certified: "False"
     containerImage: REPLACE_IMAGE:latest
-    createdAt: "2024-10-17T12:04:27Z"
+    createdAt: "2024-10-17T12:29:02Z"
     description: Operator for deployment and management of Red Hat OpenShift AI
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -1177,6 +1177,8 @@ spec:
                       fieldPath: metadata.namespace
                 - name: DEFAULT_MANIFESTS_PATH
                   value: /opt/manifests
+                # - name: ODH_PLATFORM_TYPE # comment this out due to konflux is not ready to support different value
+                #   value: SelfManagedRHOAI # for the managed we need to set it to ManagedRHOAI
                 image: REPLACE_IMAGE:latest
                 imagePullPolicy: Always
                 livenessProbe:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -43,9 +43,8 @@ spec:
                 fieldPath: metadata.namespace
           - name: DEFAULT_MANIFESTS_PATH
             value: /opt/manifests
-        args:
-        - --leader-elect
-        - --operator-name=opendatahub
+          - name: ODH_PLATFORM_TYPE
+            value: SelfManagedRHOAI
         image: controller:latest
         imagePullPolicy: Always
         name: manager

diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go
@@ -117,15 +117,21 @@ func detectManagedRHODS(ctx context.Context, cli client.Client) (Platform, error
 }
 
 func getPlatform(ctx context.Context, cli client.Client) (Platform, error) {
-	// First check if its addon installation to return 'ManagedRhods, nil'
-	if platform, err := detectManagedRHODS(ctx, cli); err != nil {
-		return Unknown, err
-	} else if platform == ManagedRhods {
+	switch os.Getenv("ODH_PLATFORM_TYPE") {
+	case "OpenDataHub", "":
+		return OpenDataHub, nil
+	case "ManagedRHOAI":
 		return ManagedRhods, nil
+	case "SelfManagedRHOAI":
+		return SelfManagedRhods, nil
+	default: // fall back to detect platform if ODH_PLATFORM_TYPE env is not provided
+		if platform, err := detectManagedRHODS(ctx, cli); err != nil {
+			return Unknown, err
+		} else if platform == ManagedRhods {
+			return ManagedRhods, nil
+		}
+		return detectSelfManaged(ctx, cli)
 	}
-
-	// check and return whether ODH or self-managed platform
-	return detectSelfManaged(ctx, cli)
 }
 
 // Release includes information on operator version and platform
@@ -153,6 +159,7 @@ func GetRelease(ctx context.Context, cli client.Client) (Release, error) {
 	if os.Getenv("CI") == "true" {
 		return initRelease, nil
 	}
+
 	// Set Version
 	// Get watchNamespace
 	operatorNamespace, err := GetOperatorNamespace()