Merge pull request #42 from israel-hdez/rhods-promote-0111

Promote upstream v0.11.1
spolti · Jan 10, 2024 · f93e586 · f93e586
2 parents 65ab888 + f996dcc
commit f93e586
Show file tree

Hide file tree

Showing 267 changed files with 59,598 additions and 4,456 deletions.
diff --git a/.github/actions/base-download/action.yml b/.github/actions/base-download/action.yml
@@ -19,3 +19,8 @@ runs:
       uses: ishworkh/docker-image-artifact-download@v1
       with:
         image: "kserve/storage-initializer:${{ github.sha }}"
+
+    - name: Download router image
+      uses: ishworkh/docker-image-artifact-download@v1
+      with:
+        image: "kserve/router:${{ github.sha }}"
diff --git a/.github/actions/kserve-dep-setup/action.yml b/.github/actions/kserve-dep-setup/action.yml
@@ -22,8 +22,6 @@ runs:
         elif [[ "${{ inputs.network-layer }}" == "kourier" ]]; then
             echo "Selected network layer ${{ inputs.network-layer }}"
             ./test/scripts/gh-actions/setup-kourier.sh
-             
-             kubectl describe pods -n kourier-system
         else
           echo "Unsupported network layer"
         fi

diff --git a/.github/actions/minikube-setup/action.yml b/.github/actions/minikube-setup/action.yml
@@ -7,16 +7,18 @@ runs:
     - name: Install kubectl
       uses: azure/setup-kubectl@v3
       with:
-        version: 'v1.26.0'
+        version: 'v1.27.4'
 
     - name: Setup Minikube
       uses: medyagh/setup-minikube@latest
       with:
-        minikube-version: '1.28.0'
-        kubernetes-version: 'v1.26.4'
+        minikube-version: '1.31.1'
+        kubernetes-version: 'v1.27.4'
         driver: 'none'
+        network-plugin: 'cni'
+        cni: 'calico'
         wait: 'all'
-        start-args: --wait-timeout=120s
+        start-args: --wait-timeout=6m0s
 
     - name: Check Kubernetes pods
       shell: bash

diff --git a/.github/workflows/auto-add-issues-to-project.yaml b/.github/workflows/auto-add-issues-to-project.yaml
@@ -0,0 +1,28 @@
+name: Auto Add Issues to Tracking boards
+on:
+  issues:
+    types:
+      - opened
+jobs:
+  add-to-project:
+    name: Add issue to projects
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate github-app token
+        id: app-token
+        uses: getsentry/action-github-app-token@v2
+        with:
+          app_id: ${{ secrets.DEVOPS_APP_ID }}
+          private_key: ${{ secrets.DEVOPS_APP_PRIVATE_KEY }}
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/opendatahub-io/projects/40
+          github-token: ${{ steps.app-token.outputs.token }}
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/opendatahub-io/projects/45
+          github-token: ${{ steps.app-token.outputs.token }}
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          project-url: https://github.com/orgs/opendatahub-io/projects/42
+          github-token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -41,6 +41,11 @@ jobs:
         with:
           image: "kserve/storage-initializer:${{ github.sha }}"
 
+      - name: Upload router image
+        uses: ishworkh/docker-image-artifact-upload@v1
+        with:
+          image: "kserve/router:${{ github.sha }}"
+
   poetry-check:
     runs-on: ubuntu-latest
     steps:
@@ -110,7 +115,7 @@ jobs:
         uses: ishworkh/docker-image-artifact-upload@v1
         with:
           image: "kserve/custom-image-transformer-grpc:${{ github.sha }}"
-  
+
   explainer-runtime-build:
     runs-on: ubuntu-latest
     needs: [poetry-check]
@@ -133,9 +138,33 @@ jobs:
         with:
           image: "kserve/art-explainer:${{ github.sha }}"
 
+  graph-tests-images-build:
+    runs-on: ubuntu-latest
+    needs: [ poetry-check ]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
+      - name: Build test images needed for graph tests
+        run: |
+          ./test/scripts/gh-actions/build-graph-tests-images.sh
+          docker image ls
+
+      - name: Upload success_200_isvc predictor image
+        uses: ishworkh/docker-image-artifact-upload@v1
+        with:
+          image: "kserve/success-200-isvc:${{ github.sha }}"
+
+      - name: Upload error_404_isvc predictor image
+        uses: ishworkh/docker-image-artifact-upload@v1
+        with:
+          image: "kserve/error-404-isvc:${{ github.sha }}"
+
   test-fast:
     runs-on: ubuntu-latest
-    needs: [kserve-image-build, predictor-runtime-build, explainer-runtime-build]
+    needs: [kserve-image-build, predictor-runtime-build, explainer-runtime-build, graph-tests-images-build]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -187,6 +216,16 @@ jobs:
         with:
           image: "kserve/image-transformer:${{ github.sha }}"
 
+      - name: Download success_200_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/success-200-isvc:${{ github.sha }}"
+
+      - name: Download error_404_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/error-404-isvc:${{ github.sha }}"
+
       - name: Install Poetry and version plugin
         run: ./test/scripts/gh-actions/setup-poetry.sh
 
@@ -197,13 +236,100 @@ jobs:
           kubectl get pods -n kserve
           kubectl describe pods -n kserve
 
-      - name: Run E2E tests
+      - name: Run all E2E tests except graph
         timeout-minutes: 60
         run: |
-          ./test/scripts/gh-actions/run-e2e-tests.sh "fast or pmml or graph"
+          ./test/scripts/gh-actions/run-e2e-tests.sh "fast or pmml"
 
           kubectl get pods -n kserve
 
+      - name: Run E2E tests for graph
+        timeout-minutes: 120
+        run: |
+          ./test/scripts/gh-actions/run-e2e-tests.sh "graph" "2"
+
+          kubectl get pods -n kserve
+
+      - name: Check system status
+        if: always()
+        run: |
+          ./test/scripts/gh-actions/status-check.sh
+
+
+  test-path-based-routing:
+    runs-on: ubuntu-latest
+    needs: [ kserve-image-build, predictor-runtime-build, explainer-runtime-build, graph-tests-images-build ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Free-up disk space
+        uses: ./.github/actions/free-up-disk-space
+
+      - name: Setup Minikube
+        uses: ./.github/actions/minikube-setup
+
+      - name: Download base images
+        uses: ./.github/actions/base-download
+
+      - name: KServe dependency setup
+        uses: ./.github/actions/kserve-dep-setup
+
+      - name: Download sklearn server image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/sklearnserver:${{ github.sha }}"
+
+      - name: Download xgb server image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/xgbserver:${{ github.sha }}"
+
+      - name: Download lgb server image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/lgbserver:${{ github.sha }}"
+
+      - name: Download pmml image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/pmmlserver:${{ github.sha }}"
+
+      - name: Download transformer image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/image-transformer:${{ github.sha }}"
+
+      - name: Download success_200_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/success-200-isvc:${{ github.sha }}"
+
+      - name: Download error_404_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/error-404-isvc:${{ github.sha }}"
+
+      - name: Install Poetry and version plugin
+        run: ./test/scripts/gh-actions/setup-poetry.sh
+
+      - name: Install KServe
+        run: |
+          ./test/scripts/gh-actions/setup-kserve.sh
+
+          kubectl get pods -n kserve
+          kubectl describe pods -n kserve
+
       - name: Patch inferenceservice config
         run : |
           kubectl patch configmaps -n kserve inferenceservice-config --patch-file config/overlays/test/configmap/inferenceservice-ingress.yaml
@@ -587,7 +713,7 @@ jobs:
 
   test-kourier:
     runs-on: ubuntu-latest
-    needs: [kserve-image-build, predictor-runtime-build]
+    needs: [kserve-image-build, predictor-runtime-build, graph-tests-images-build]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
@@ -614,6 +740,16 @@ jobs:
         with:
           image: "kserve/xgbserver:${{ github.sha }}"
 
+      - name: Download success_200_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/success-200-isvc:${{ github.sha }}"
+
+      - name: Download error_404_isvc predictor image
+        uses: ishworkh/docker-image-artifact-download@v1
+        with:
+          image: "kserve/error-404-isvc:${{ github.sha }}"
+
       - name: Install Poetry and version plugin
         run: ./test/scripts/gh-actions/setup-poetry.sh
 
@@ -630,10 +766,10 @@ jobs:
           kubectl describe configmaps -n kserve inferenceservice-config
 
       - name: Run E2E tests
-        timeout-minutes: 25
+        timeout-minutes: 120
         run: |
-          export KSERVE_INGRESS_HOST_PORT=$(kubectl get pod -n kourier-system -l "app=3scale-kourier-gateway" \
-          --output=jsonpath="{.items[0].status.podIP}"):$(kubectl get pod -n kourier-system -l "app=3scale-kourier-gateway" \
+          export KSERVE_INGRESS_HOST_PORT=$(kubectl get pod -n knative-serving -l "app=3scale-kourier-gateway" \
+          --output=jsonpath="{.items[0].status.podIP}"):$(kubectl get pod -n knative-serving -l "app=3scale-kourier-gateway" \
           --output=jsonpath="{.items[0].spec.containers[0].ports[0].containerPort}")
           
           ./test/scripts/gh-actions/run-e2e-tests.sh "kourier"
@@ -646,12 +782,13 @@ jobs:
           docker image ls
           kubectl get pods -n kserve
           kubectl get pods -n kserve-ci-e2e-test
+          kubectl get pods -A --field-selector=metadata.namespace!=kserve,metadata.namespace!=kserve-ci-e2e-test
           
           kubectl describe pods -n kserve-ci-e2e-test
           kubectl get events -n kserve-ci-e2e-test
           kubectl logs -l control-plane=kserve-controller-manager -n kserve -c manager
           kubectl logs -l 'component in (predictor)' -c kserve-container -n kserve-ci-e2e-test --tail 500
           kubectl logs -l 'component in (transformer)' -c kserve-container -n kserve-ci-e2e-test --tail 500
           kubectl logs -l 'component in (explainer)' -c kserve-container -n kserve-ci-e2e-test --tail 500
-          kubectl logs $(kubectl get pod -n kourier-system -l "app=3scale-kourier-gateway" --output=jsonpath="{.items[0].metadata.name}") -n kourier-system
+          kubectl logs $(kubectl get pod -n knative-serving -l "app=3scale-kourier-gateway" --output=jsonpath="{.items[0].metadata.name}") -n knative-serving
 
diff --git a/.github/workflows/storage-initializer-docker-publisher.yml b/.github/workflows/storage-initializer-docker-publisher.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to Quay
+      - name: Login to Quay.io
         uses: docker/login-action@v2
         with:
           registry: quay.io
@@ -81,9 +81,10 @@ jobs:
           TAGS=$IMAGE_ID:$VERSION
 
           # If a vX.Y.Z release is being built, also update the vX.Y tag.
-          [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && TAGS=$TAGS,$IMAGE_ID:$(echo $VERSION | sed 's/\(.*\)\.[[:digit:]]\+$/\1/')
-
-          echo CONTAINER_TAGS=$TAGS >> $GITHUB_ENV
+          [[ "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && MINOR_VERSION=$(echo $VERSION | sed 's/\(.*\)\.[[:digit:]]\+$/\1/')
+          [ ! -z "$MINOR_VERSION" ] && TAGS=$TAGS,$IMAGE_ID:$MINOR_VERSION
+          
+          echo TAGS=$TAGS >> $GITHUB_ENV
 
 
       - name: Build and push
@@ -93,4 +94,4 @@ jobs:
           context: python
           file: python/storage-initializer.Dockerfile
           push: true
-          tags: ${{ env.CONTAINER_TAGS }}
+          tags: ${{ env.TAGS }}
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,6 @@ RUN CGO_ENABLED=0 GOOS=linux GOFLAGS=-mod=mod go build -a -o manager ./cmd/manag
 
 # Copy the controller-manager into a thin image
 FROM gcr.io/distroless/static:nonroot
-WORKDIR /
-COPY third_party/ third_party/
-COPY --from=builder /go/src/github.com/kserve/kserve/manager .
+COPY third_party/ /third_party/
+COPY --from=builder /go/src/github.com/kserve/kserve/manager /
 ENTRYPOINT ["/manager"]