Merge pull request opendatahub-io#17 from VaishnaviHire/cherry_pick_1_08

Sync with upstream
VaishnaviHire · Aug 1, 2023 · ed29675 · ed29675
2 parents c4795f4 + 2905ac7
commit ed29675
Show file tree

Hide file tree

Showing 15 changed files with 101 additions and 689 deletions.
diff --git a/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml b/bundle/manifests/dashboard.opendatahub.io_odhapplications.yaml
@@ -118,10 +118,6 @@ spec:
                 type: string
               isEnabled:
                 type: boolean
-              kfdefApplications:
-                items:
-                  type: string
-                type: array
               link:
                 type: string
               provider:

diff --git a/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml b/bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
@@ -39,7 +39,7 @@ spec:
                 description: Override and fine tune specific component configurations.
                 properties:
                   codeflare:
-                    description: CodeFlare component configuration Require CodeFlare
+                    description: CodeFlare component configuration. Require CodeFlare
                       operator to be installed before enable component
                     properties:
                       enabled:
@@ -90,7 +90,7 @@ spec:
                     - enabled
                     type: object
                   ray:
-                    description: Ray component configuration Require CodeFlare operator
+                    description: Ray component configuration. Require CodeFlare operator
                       to be installed before enable component
                     properties:
                       enabled:

diff --git a/bundle/manifests/kfdef.apps.kubeflow.org_kfdefs.yaml b/bundle/manifests/kfdef.apps.kubeflow.org_kfdefs.yaml
diff --git a/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml b/bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -206,9 +206,6 @@ spec:
         displayName: Conditions
         path: conditions
       version: v1alpha1
-    - kind: KfDef
-      name: kfdefs.kfdef.apps.kubeflow.org
-      version: v1
     - kind: OdhApplication
       name: odhapplications.dashboard.opendatahub.io
       version: v1
@@ -221,10 +218,6 @@ spec:
     - kind: OdhQuickStart
       name: odhquickstarts.console.openshift.io
       version: v1
-    required:
-    - kind: KfDef
-      name: kfdefs.kfdef.apps.kubeflow.org
-      version: v1
   description: "The Open Data Hub is a machine-learning-as-a-service platform built
     on Red Hat's Kubernetes-based OpenShift® Container Platform. Open Data Hub integrates
     multiple AI/ML open source components into one operator that can easily be downloaded

diff --git a/components/dashboard/dashboard.go b/components/dashboard/dashboard.go
@@ -17,6 +17,7 @@ import (
 
 const (
 	ComponentName          = "odh-dashboard"
+	ComponentNameSupported = "rhods-dashboard"
 	Path                   = deploy.DefaultManifestPath + "/" + ComponentName + "/base"
 	PathSupported          = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/authentication"
 	PathISVSM              = deploy.DefaultManifestPath + "/" + ComponentName + "/overlays/apps-onprem"
@@ -85,7 +86,7 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 			}
 		}
 		// Create ODHDashboardConfig if it doesn't exist already
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathODHDashboardConfig,
 			namespace,
 			scheme, enabled)
@@ -94,7 +95,7 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 		}
 
 		// Apply modelserving config
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathOVMS,
 			namespace,
 			scheme, enabled)
@@ -119,7 +120,7 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 		}
 	} else {
 		// Apply authentication overlay
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathSupported,
 			namespace,
 			scheme, enabled)
@@ -131,7 +132,7 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 	// ISV handling
 	switch platform {
 	case deploy.SelfManagedRhods:
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathISVSM,
 			namespace,
 			scheme, enabled)
@@ -140,7 +141,7 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 		}
 		return err
 	case deploy.ManagedRhods:
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathISVAddOn,
 			namespace,
 			scheme, enabled)
@@ -161,14 +162,14 @@ func (d *Dashboard) ReconcileComponent(owner metav1.Object, cli client.Client, s
 		if err != nil {
 			return fmt.Errorf("Error replacing with correct dashboard url for ConsoleLink: %v", err)
 		}
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathConsoleLink,
 			namespace,
 			scheme, enabled)
 		if err != nil {
 			return fmt.Errorf("failed to set dashboard consolelink from %s", PathConsoleLink)
 		}
-		err = deploy.DeployManifestsFromPath(owner, cli, ComponentName,
+		err = deploy.DeployManifestsFromPath(owner, cli, ComponentNameSupported,
 			PathConsoleLink,
 			namespace,
 			scheme, enabled)