Merge pull request #585 from spolti/250424_sync_upstream

250424 sync upstream

Author: openshift-merge-bot[bot]

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,9 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
 1. If this is your first time, read our contributor guidelines https://www.kubeflow.org/docs/about/contributing/ and developer guide https://github.com/kserve/kserve/blob/master/docs/DEVELOPER_GUIDE.md
-2. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
-3. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
-4. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
+2. Before raising a PR, please run `make go-lint` and `make py-fmt` to check the code style.
+3. If you want *faster* PR reviews, read how: https://git.k8s.io/community/contributors/guide/pull-requests.md#best-practices-for-faster-reviews
+4. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
+5. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
 -->
 
 **What this PR does / why we need it**:

.github/workflows/automated-release.yml

@@ -3,27 +3,27 @@ on:
   workflow_dispatch:
     inputs:
       releaseBranch:
-        description: 'The existing branch name to release from, e.g. release-0.12'
+        description: "The existing branch name to release from, e.g. release-0.12"
         required: true
       releaseTag:
-        description: 'The release tag, e.g. v0.12.0-rc1'
+        description: "The release tag, e.g. v0.12.0-rc1"
         required: true
 
 jobs:
   prepare-release:
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22
-
       - name: Checkout source code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ inputs.releaseBranch }}
 
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
       - name: Install dependencies
         run: |
           go mod download
@@ -39,12 +39,12 @@ jobs:
           cd $KSERVE_PATH
           export RELEASE_BRANCH=${{ inputs.releaseBranch }}
           export RELEASE_TAG=${{ inputs.releaseTag }}
-          
+
           # Bump Versions
           make bump-version
           ./hack/generate-install.sh $RELEASE_TAG
           ./hack/python-release.sh
-          
+
           # Update Release Branch and Push Tag
           git diff
           git config --global user.email "[email protected]"

.github/workflows/e2e-test.yml

@@ -79,7 +79,7 @@ jobs:
           path: ${{ env.DOCKER_IMAGES_PATH }}/${{ env.CONTROLLER_IMG }}-${{ github.sha }}
           compression-level: 0
           if-no-files-found: error
-      
+
       - name: Upload localmodel controller image
         uses: actions/upload-artifact@v4
         with:
@@ -295,11 +295,7 @@ jobs:
 
   test-predictor:
     runs-on: ubuntu-22.04
-    needs:
-      [
-        kserve-image-build,
-        predictor-runtime-build,
-      ]
+    needs: [kserve-image-build, predictor-runtime-build]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -310,7 +306,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -372,8 +368,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
-      
+          go-version-file: go.mod
+
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -424,7 +420,7 @@ jobs:
       - name: Install KServe
         run: |
           ./test/scripts/gh-actions/setup-kserve.sh
-          
+
           kubectl get pods -n kserve
           kubectl describe pods -n kserve
 
@@ -441,19 +437,15 @@ jobs:
   test-graph:
     runs-on: ubuntu-22.04
     needs:
-      [
-        kserve-image-build,
-        predictor-runtime-build,
-        graph-tests-images-build,
-      ]
+      [kserve-image-build, predictor-runtime-build, graph-tests-images-build]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -516,23 +508,18 @@ jobs:
         run: |
           ./test/scripts/gh-actions/status-check.sh
 
-
   test-path-based-routing:
     runs-on: ubuntu-22.04
     needs:
-      [
-        kserve-image-build,
-        predictor-runtime-build,
-        explainer-runtime-build
-      ]
+      [kserve-image-build, predictor-runtime-build, explainer-runtime-build]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -624,7 +611,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -678,16 +665,15 @@ jobs:
 
   test-with-helm:
     runs-on: ubuntu-22.04
-    needs:
-      [kserve-image-build]
+    needs: [kserve-image-build]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
 
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -711,7 +697,6 @@ jobs:
 
       - name: Install Kserve from helm
         run: |
-          ./test/scripts/gh-actions/setup-modelmesh-dep.sh
           ./test/scripts/gh-actions/setup-kserve-helm.sh
           kubectl get pods -n kserve
           kubectl describe pods -n kserve
@@ -746,7 +731,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -818,13 +803,13 @@ jobs:
         timeout-minutes: 30
         run: |
           ./test/scripts/gh-actions/run-e2e-tests.sh "raw" "6" ${{ matrix.network-layer }}
-      
+
       - name: Patch inferenceservice config for path based routing
         if: matrix.network-layer == 'envoy-gatewayapi' || matrix.network-layer == 'istio-gatewayapi'
         run: |
           kubectl patch configmaps -n kserve inferenceservice-config --patch-file config/overlays/test/configmap/inferenceservice-path-template.yaml
           kubectl describe configmaps -n kserve inferenceservice-config
-  
+
       - name: Run E2E tests with path based routing
         if: matrix.network-layer == 'envoy-gatewayapi' || matrix.network-layer == 'istio-gatewayapi'
         timeout-minutes: 30
@@ -860,7 +845,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -933,8 +918,7 @@ jobs:
 
   test-llm:
     runs-on: ubuntu-22.04
-    needs:
-      [kserve-image-build, predictor-runtime-build]
+    needs: [kserve-image-build, predictor-runtime-build]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -945,7 +929,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -993,8 +977,7 @@ jobs:
 
   test-huggingface-server-vllm:
     runs-on: ubuntu-22.04
-    needs:
-      [kserve-image-build, predictor-runtime-build]
+    needs: [kserve-image-build, predictor-runtime-build]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -1005,7 +988,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -1050,11 +1033,10 @@ jobs:
         if: always()
         run: |
           ./test/scripts/gh-actions/status-check.sh
-  
+
   test-modelcache:
     runs-on: ubuntu-22.04
-    needs:
-      [kserve-image-build, predictor-runtime-build]
+    needs: [kserve-image-build, predictor-runtime-build]
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -1065,13 +1047,13 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      
+
       - name: Create tmp-images directory
         run: |
           sudo mkdir -p /tmp-images
@@ -1083,7 +1065,7 @@ jobs:
           nodes: 3
           driver: "docker"
           start-args: "--mount --mount-string=/tmp-images:/tmp-images"
-      
+
       - name: Create minikube tunnel
         run: |
           nohup minikube tunnel > minikube-tunnel.log 2>&1 &
@@ -1129,7 +1111,7 @@ jobs:
           done
           sudo rm -rf tmp-images/*
           minikube ssh -n minikube-m02 -- docker image ls
-      
+
       - name: Create model root directory
         run: |
           minikube ssh -n minikube-m02 -- sudo mkdir -p -m=777 /models
@@ -1144,7 +1126,7 @@ jobs:
 
           kubectl get pods -n kserve
           kubectl describe pods -n kserve
-      
+
       - name: Enable modelcache
         run: |
           sed -i -e "s/latest/${GITHUB_SHA}/g" config/overlays/test/configmap/inferenceservice-enable-modelcache.yaml
@@ -1154,15 +1136,15 @@ jobs:
       - name: Create localmodel job namespace
         run: |
           kubectl create ns kserve-localmodel-jobs
-      
+
       - name: Label worker nodes for modelcache
         run: |
           kubectl label nodes -l '!node-role.kubernetes.io/control-plane' kserve/localmodel=worker
-      
+
       - name: Enable nodeselector in knative
         run: |
           kubectl patch configmaps -n knative-serving config-features --patch '{"data": {"kubernetes.podspec-nodeselector": "enabled"}}'
-      
+
       - name: Run E2E tests
         timeout-minutes: 15
         run: |
@@ -1174,4 +1156,4 @@ jobs:
           echo "::group::Minikube tunnel logs"
           cat minikube-tunnel.log
           echo "::endgroup::"
-          ./test/scripts/gh-actions/status-check.sh
+          ./test/scripts/gh-actions/status-check.sh

.github/workflows/go.yml

@@ -16,15 +16,15 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version-file: go.mod
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
@@ -55,4 +55,4 @@ jobs:
           filename: coverage.json
           label: coverage
           message: ${{ steps.test.outputs.coverage }}
-          color: green
+          color: green