fix

Signed-off-by: Harshvir Potpose <[email protected]>

Author: akagami-harsh

.github/workflows/model_registry_test.yaml

@@ -88,8 +88,8 @@ jobs:
           -H 'accept: application/json'
 
     # for these steps below ensure same steps as kserve (ie: Istio with external authentication, cert-manager, knative) so to achieve same setup
-    - name: Port forward Istio gateway
-      run: ./tests/port_forward_istio_gateway.sh
+    - name: Port forward
+      run: ./tests/port_forward_gateway.sh
 
     - name: Dry-run KF Model Registry REST API
       run: |

tests/kserve_test.sh

@@ -6,7 +6,7 @@ SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TEST_DIRECTORY="${SCRIPT_DIRECTORY}/kserve"
 
 echo "=== KServe Predictor Service Labels ==="
-kubectl get pods -n ${NAMESPACE} -l serving.knative.dev/service=isvc-sklearn-predictor --show-labels
+kubectl get pods -n ${NAMESPACE} -l serving.knative.dev/service=isvc-sklearn-predictor --show-labels || true
 
 cat <<EOF | kubectl apply -f -
 apiVersion: security.istio.io/v1beta1
@@ -27,31 +27,38 @@ spec:
 EOF
 
 cat <<EOF | kubectl apply -f -
-apiVersion: networking.istio.io/v1beta1
-kind: VirtualService
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
 metadata:
   name: isvc-sklearn-external
   namespace: ${NAMESPACE}
 spec:
-  gateways:
-    - kubeflow/kubeflow-gateway
-  hosts:
-    - '*'
-  http:
-    - match:
-        - uri:
-            prefix: /kserve/${NAMESPACE}/isvc-sklearn/
-      rewrite:
-        uri: /
-      route:
-        - destination:
-            host: knative-local-gateway.istio-system.svc.cluster.local
-          headers:
-            request:
-              set:
-                Host: isvc-sklearn-predictor.${NAMESPACE}.svc.cluster.local
-          weight: 100
-      timeout: 300s
+  parentRefs:
+  - name: kubeflow-gateway
+    namespace: istio-system
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /kserve/${NAMESPACE}/isvc-sklearn/
+    filters:
+    - type: URLRewrite
+      urlRewrite:
+        path:
+          type: ReplacePrefixMatch
+          replacePrefixMatch: /
+    - type: RequestHeaderModifier
+      requestHeaderModifier:
+        set:
+        - name: Host
+          value: isvc-sklearn-predictor.${NAMESPACE}.svc.cluster.local
+    backendRefs:
+    - name: knative-local-gateway
+      namespace: istio-system
+      port: 80
+      weight: 100
+    timeouts:
+      request: 300s
 EOF
 
 if ! command -v pytest &> /dev/null; then