Got the tests to run

Signed-off-by: Mariah Holder <marholde@redhat.com>

Author: mholder6

config/manager/kustomization.yaml

@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 resources:
-  - manager.yaml
+- manager.yaml
 
-images:
-  - name: modelmesh-controller
-    newName: kserve/modelmesh-controller
     ## NOTE THIS SHOULD BE REPLACED WITH LATEST CONTROLLER IMAGE TAG
-    newTag: latest
+images:
+- name: modelmesh-controller
+  newName: kserve/modelmesh-controller
+  newTag: latest
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization

fvt/globals.go

@@ -90,7 +90,7 @@ const (
 	SecretKind                 = "Secret"
 	DefaultTestNamespace       = "modelmesh-serving"
 	DefaultTestServiceName     = "modelmesh-serving"
-	DefaultControllerNamespace = "modelmesh-serving"
+	DefaultControllerNamespace = "opendatahub"
 	UserConfigMapName          = "model-serving-config"
 	SamplesPath                = "predictors/"
 	IsvcSamplesPath            = "isvcs/"

opendatahub/scripts/deploy_fvt.sh

@@ -6,7 +6,7 @@ source "$(dirname "$0")/utils.sh"
 set -Eeuo pipefail
 
 namespace=modelmesh-serving
-ctrlnamespace=${namespace}
+ctrlnamespace=opendatahub
 tag=none
 force=false
 img_map=none
@@ -129,6 +129,7 @@ oc get ns nfs-provisioner|| $SCRIPT_DIR/deploy_nfs_provisioner.sh nfs-provisione
 info ".. Creating a namespace for fvt test"
 oc get ns $namespace || oc new-project $namespace #for openshift-ci
 oc project $namespace || echo "ignored this due to openshift-ci"
+oc apply -f $MANIFESTS_DIR/mm-configmap.yaml -n $namespace 
 
 # Download images on each node
 echo "* Download Images on Nodes"

opendatahub/scripts/install_odh.sh

@@ -10,7 +10,7 @@ img_name=
 img_url=
 mm_user=opendatahub-io
 mm_branch=main
-odhoperator=false
+odhoperator=true
 repo_uri=local
 stable_manifests=false
 

opendatahub/scripts/manifests/dsc.yaml

@@ -1,15 +1,38 @@
+kind: DSCInitialization
+apiVersion: dscinitialization.opendatahub.io/v1
+metadata:
+  labels:
+    app.kubernetes.io/created-by: opendatahub-operator
+    app.kubernetes.io/instance: default
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: dscinitialization
+    app.kubernetes.io/part-of: opendatahub-operator
+  name: default-dsci
+spec:
+  applicationsNamespace: opendatahub
+  monitoring:
+    managementState: Managed
+    namespace: opendatahub
+  serviceMesh:
+    controlPlane:
+      metricsCollection: Istio
+      name: data-science-smcp
+      namespace: istio-system
+    managementState: Removed
+  trustedCABundle:
+    customCABundle: ''
+    managementState: Managed
+---
 apiVersion: datasciencecluster.opendatahub.io/v1
 kind: DataScienceCluster
 metadata:
-  finalizers:
-    - datasciencecluster.opendatahub.io/finalizer
   labels:
-    app.kubernetes.io/created-by: rhods-operator
-    app.kubernetes.io/instance: rhods
+    app.kubernetes.io/created-by: opendatahub-operator
+    app.kubernetes.io/instance: default
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: datasciencecluster
-    app.kubernetes.io/part-of: rhods-operator
-  name: rhods
+    app.kubernetes.io/part-of: opendatahub-operator
+  name: default-dsc
 spec:
   components:
     codeflare:
@@ -24,17 +47,9 @@ spec:
         ingressGateway:
           certificate:
             type: SelfSigned
-        managementState: Managed
+        managementState: Removed
         name: knative-serving
     modelmeshserving:
-      devFlags:
-        manifests:
-          - contextDir: config
-            sourcePath: overlays/odh
-            uri: "https://github.com/opendatahub-io/modelmesh-serving/tarball/main"
-          - contextDir: config
-            sourcePath: ""
-            uri: "https://github.com/VedantMahabaleshwarkar/odh-model-controller/tarball/monitoringnsdisable_test"
       managementState: Managed
     ray:
       managementState: Removed

opendatahub/scripts/manifests/fvt/fvt.yaml

@@ -135,6 +135,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: "models-pvc-1"
 spec:
+  storageClassName: nfs
   accessModes:
     - ReadWriteMany
   resources:
@@ -146,6 +147,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: "models-pvc-2"
 spec:
+  storageClassName: nfs
   accessModes:
     - ReadWriteMany
   resources:
@@ -157,6 +159,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: "models-pvc-3"
 spec:
+  storageClassName: nfs
   accessModes:
     - ReadWriteMany
   resources:

opendatahub/scripts/manifests/fvt/kustomization.yaml

@@ -4,4 +4,4 @@ resources:
 - fvt.yaml
 patchesStrategicMerge:
 - remove_etcd_patch.yaml
-namespace: model-serving
+namespace: modelmesh-serving

opendatahub/scripts/manifests/mm-configmap.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: model-serving-config
+data:
+  config.yaml: |
+    #Sample config overrides
+    inferenceServiceName: "modelmesh-serving"
+    inferenceServicePort: 8033
+    podsPerRuntime: 2
+    metrics:
+      enabled: true
+    restProxy:
+      enabled: true
+    runtimePodLabels:
+      app: myApp
+      network-policy: allow-ingress
+    runtimePodAnnotations:
+      app: myApp

opendatahub/scripts/manifests/subs_odh_operator.yaml

@@ -6,7 +6,7 @@ metadata:
   name: opendatahub-operator
   namespace: openshift-operators
 spec:
-  channel: stable
+  channel: fast
   installPlanApproval: Automatic
   name: opendatahub-operator
   source: community-operators