From 565fa0094f1bd319af8ee10f713393b287f2764c Mon Sep 17 00:00:00 2001 From: anantadwi13 Date: Thu, 23 Apr 2026 11:46:11 +0700 Subject: [PATCH 1/3] fix: update setup-cluster.sh script to fix e2e test --- scripts/e2e/setup-cluster.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/e2e/setup-cluster.sh b/scripts/e2e/setup-cluster.sh index 4a50183e6..91c2c68ce 100755 --- a/scripts/e2e/setup-cluster.sh +++ b/scripts/e2e/setup-cluster.sh @@ -22,7 +22,7 @@ KNATIVE_VERSION=1.10.2 KNATIVE_NET_ISTIO_VERSION=1.10.1 CERT_MANAGER_VERSION=1.12.2 MINIO_VERSION=3.6.3 -KSERVE_VERSION=0.11.0 +KSERVE_VERSION=0.14.0 TIMEOUT=180s @@ -70,7 +70,7 @@ install_istio() { kubectl rollout status deployment/istiod -w -n istio-system --timeout=${TIMEOUT} kubectl rollout status deployment/cluster-local-gateway -n istio-system -w --timeout=${TIMEOUT} - kubectl apply -f config/istio/ingress-class.yaml + kubectl apply --server-side -f config/istio/ingress-class.yaml sleep 30 @@ -79,7 +79,7 @@ install_istio() { set_ingress_host() { echo "::group::Set Ingress Host" - if [[ -z "${INGRESS_HOST}" ]]; then + if [[ -z "${INGRESS_HOST:-}" ]]; then export INGRESS_HOST="$(kubectl -n istio-system get service istio-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}').nip.io" fi echo "INGRESS_HOST=${INGRESS_HOST}" @@ -90,11 +90,11 @@ install_knative() { echo "::group::Knative Deployment" # Install CRD - kubectl apply -f https://github.com/knative/serving/releases/download/knative-v${KNATIVE_VERSION}/serving-crds.yaml + kubectl apply --server-side -f https://github.com/knative/serving/releases/download/knative-v${KNATIVE_VERSION}/serving-crds.yaml # Install knative serving wget https://github.com/knative/serving/releases/download/knative-v${KNATIVE_VERSION}/serving-core.yaml -O config/knative/serving-core.yaml - kubectl apply -k config/knative + kubectl apply --server-side -k config/knative kubectl rollout status deployment/autoscaler -n knative-serving -w --timeout=${TIMEOUT} kubectl rollout status deployment/controller -n knative-serving -w --timeout=${TIMEOUT} @@ -106,11 +106,11 @@ install_knative() { # Update knative config-deployment config map to allow resolving of the local e2e image repository kubectl get configmap -n knative-serving config-deployment -o yaml > temp.yaml yq -i '.data.registries-skipping-tag-resolving |= ("\(.),${DOCKER_REGISTRY}" | envsubst)' temp.yaml - kubectl apply -f temp.yaml + kubectl apply --server-side -f temp.yaml kubectl rollout restart deployment -n knative-serving controller # Install knative-istio - kubectl apply -f https://github.com/knative-sandbox/net-istio/releases/download/knative-v${KNATIVE_NET_ISTIO_VERSION}/net-istio.yaml + kubectl apply --server-side -f https://github.com/knative-sandbox/net-istio/releases/download/knative-v${KNATIVE_NET_ISTIO_VERSION}/net-istio.yaml kubectl rollout status deployment/net-istio-controller -n knative-serving -w --timeout=${TIMEOUT} kubectl rollout status deployment/net-istio-webhook -n knative-serving -w --timeout=${TIMEOUT} @@ -121,7 +121,7 @@ install_knative() { install_cert_manager() { echo "::group::Cert Manager Deployment" - kubectl apply --filename=https://github.com/jetstack/cert-manager/releases/download/v${CERT_MANAGER_VERSION}/cert-manager.yaml + kubectl apply --server-side --filename=https://github.com/jetstack/cert-manager/releases/download/v${CERT_MANAGER_VERSION}/cert-manager.yaml kubectl rollout status deployment/cert-manager-webhook -n cert-manager -w --timeout=${TIMEOUT} kubectl rollout status deployment/cert-manager-cainjector -n cert-manager -w --timeout=${TIMEOUT} @@ -147,9 +147,9 @@ install_kserve() { echo "::group::KServe Deployment" wget https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve.yaml -O config/kserve/kserve.yaml - kubectl apply -k config/kserve + kubectl apply --server-side -k config/kserve kubectl rollout status deployment/kserve-controller-manager -n kserve -w --timeout=${TIMEOUT} - kubectl apply -f https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve-runtimes.yaml + kubectl apply --server-side -f https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve-cluster-resources.yaml echo "::endgroup::" } From 25ee4c79fd142cb8109ed37fd6f79fb56de2abfa Mon Sep 17 00:00:00 2001 From: anantadwi13 Date: Fri, 24 Apr 2026 11:04:45 +0700 Subject: [PATCH 2/3] fix: pin setuptools dependency to 81.0.0 (to fix error missing `pkg_tools`) --- python/sdk/Pipfile | 1 + 1 file changed, 1 insertion(+) diff --git a/python/sdk/Pipfile b/python/sdk/Pipfile index 10a90835f..01a922245 100644 --- a/python/sdk/Pipfile +++ b/python/sdk/Pipfile @@ -8,6 +8,7 @@ ipykernel = "*" jupyter = "*" pytest = "*" pytest-xdist = "*" +setuptools = "==81.0.0" [packages] merlin-sdk = {extras = ["test"],path = "."} From a4a8cf9268a143d7b43fd3a1825708909f0f8d29 Mon Sep 17 00:00:00 2001 From: anantadwi13 Date: Fri, 24 Apr 2026 15:04:16 +0700 Subject: [PATCH 3/3] fix: rollback change & patch image registry --- scripts/e2e/config/kserve/kustomization.yaml | 4 ++++ scripts/e2e/setup-cluster.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/e2e/config/kserve/kustomization.yaml b/scripts/e2e/config/kserve/kustomization.yaml index b30f245ae..c6745f5fb 100644 --- a/scripts/e2e/config/kserve/kustomization.yaml +++ b/scripts/e2e/config/kserve/kustomization.yaml @@ -2,3 +2,7 @@ resources: - kserve.yaml patchesStrategicMerge: - overlay.yaml +images: + - name: gcr.io/kubebuilder/kube-rbac-proxy + newName: kubebuilder/kube-rbac-proxy + newTag: v0.13.1 \ No newline at end of file diff --git a/scripts/e2e/setup-cluster.sh b/scripts/e2e/setup-cluster.sh index 91c2c68ce..883566159 100755 --- a/scripts/e2e/setup-cluster.sh +++ b/scripts/e2e/setup-cluster.sh @@ -22,7 +22,7 @@ KNATIVE_VERSION=1.10.2 KNATIVE_NET_ISTIO_VERSION=1.10.1 CERT_MANAGER_VERSION=1.12.2 MINIO_VERSION=3.6.3 -KSERVE_VERSION=0.14.0 +KSERVE_VERSION=0.11.0 TIMEOUT=180s @@ -149,7 +149,7 @@ install_kserve() { wget https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve.yaml -O config/kserve/kserve.yaml kubectl apply --server-side -k config/kserve kubectl rollout status deployment/kserve-controller-manager -n kserve -w --timeout=${TIMEOUT} - kubectl apply --server-side -f https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve-cluster-resources.yaml + kubectl apply --server-side -f https://raw.githubusercontent.com/kserve/kserve/master/install/v${KSERVE_VERSION}/kserve-runtimes.yaml echo "::endgroup::" }