From 8f138687afe8e407ec4aa31c56fc0dec8db7410a Mon Sep 17 00:00:00 2001
From: Dhiraj Bokde <dhirajsb@users.noreply.github.com>
Date: Mon, 19 Feb 2024 11:01:53 -0800
Subject: [PATCH] fix: istio manifest cleanup, fixes RHOAIENG-1947 (#318)

---
 .github/workflows/build-image-pr.yml           |  9 +--------
 manifests/kustomize/base/kustomization.yaml    |  3 ---
 .../options/istio/virtual-service.yaml         | 18 +++++++++++-------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-image-pr.yml b/.github/workflows/build-image-pr.yml
index ce4b2e7f..1c3cc003 100644
--- a/.github/workflows/build-image-pr.yml
+++ b/.github/workflows/build-image-pr.yml
@@ -50,12 +50,5 @@ jobs:
           kubectl apply -k "https://github.com/opendatahub-io/model-registry-operator.git/config/samples?ref=${BRANCH}"
           kubectl get mr
       - name: Wait for Test Registry Deployment
-        timeout-minutes: 5
         run: |
-          CONDITION="false"
-          while [ "${CONDITION}" != "True" ]
-          do
-            sleep 5
-            CONDITION="`kubectl get mr modelregistry-sample --output=jsonpath='{.status.conditions[?(@.type=="Available")].status}'`"
-            echo "Registry Available=${CONDITION}"
-          done
+          kubectl wait --for=condition=Available=true modelregistries/modelregistry-sample --timeout=5m
diff --git a/manifests/kustomize/base/kustomization.yaml b/manifests/kustomize/base/kustomization.yaml
index 5d497c83..bf9c0720 100644
--- a/manifests/kustomize/base/kustomization.yaml
+++ b/manifests/kustomize/base/kustomization.yaml
@@ -5,6 +5,3 @@ resources:
   - model-registry-deployment.yaml
   - model-registry-service.yaml
   - model-registry-sa.yaml
-images:
-  - name: gcr.io/ml-pipeline/metadata-envoy
-    newTag: 2.0.5
diff --git a/manifests/kustomize/options/istio/virtual-service.yaml b/manifests/kustomize/options/istio/virtual-service.yaml
index 1cbdaeb2..3544365e 100644
--- a/manifests/kustomize/options/istio/virtual-service.yaml
+++ b/manifests/kustomize/options/istio/virtual-service.yaml
@@ -8,14 +8,18 @@ spec:
   - kubeflow-gateway
   hosts:
   - '*'
-  http:
+  tcp:
   - match:
-    - uri:
-        prefix: /ml_metadata
-    rewrite:
-      uri: /ml_metadata
+    - port: 8080
     route:
     - destination:
-        host: metadata-envoy-service.kubeflow.svc.cluster.local
+        host: model-registry-service.kubeflow.svc.cluster.local
         port:
-          number: 9090
+          number: 8080
+  - match:
+      - port: 9090
+    route:
+      - destination:
+          host: model-registry-service.kubeflow.svc.cluster.local
+          port:
+            number: 9090