Skip to content

Commit f17e0dd

Browse files
authored
Merge pull request #976 from mholder6/20251118_sync_upstream
20251118 sync upstream
2 parents 788bfca + 544df8e commit f17e0dd

File tree

87 files changed

+2455
-3474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+2455
-3474
lines changed

.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ exclude =
1515
python/kserve/test/__init__.py,
1616
python/kserve/test/test_knative*.py,
1717
python/kserve/kserve/protocol/grpc/grpc_predict_v2*.py
18+
python/kserve/build/**/*.py
1819
python/*_pb2.py
1920
docs/**/*.py
2021
python/kserve/kserve/protocol/rest/openai/types/openapi.py

.github/workflows/e2e-test.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,12 @@ jobs:
415415
- name: Run E2E tests
416416
timeout-minutes: 30
417417
run: |
418-
./test/scripts/gh-actions/run-e2e-tests.sh "transformer or mms or collocation or explainer" "6"
418+
./test/scripts/gh-actions/run-e2e-tests.sh "transformer or mms or collocation" "6"
419+
420+
- name: Run E2E tests - explainer
421+
timeout-minutes: 30
422+
run: |
423+
./test/scripts/gh-actions/run-e2e-tests.sh "explainer" "1"
419424
420425
- name: Check system status
421426
if: always()
@@ -583,6 +588,11 @@ jobs:
583588
run: |
584589
./test/scripts/gh-actions/run-e2e-tests.sh "path_based_routing" "6"
585590
591+
- name: Run E2E tests with path-based routing - Explainer
592+
timeout-minutes: 30
593+
run: |
594+
./test/scripts/gh-actions/run-e2e-tests.sh "explainer" "1"
595+
586596
- name: Check system status
587597
if: always()
588598
run: |

.github/workflows/python-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ jobs:
7474
cd python
7575
source kserve/.venv/bin/activate
7676
pytest --cov=kserve ./kserve
77+
- name: Test kserve Storage
78+
run: |
79+
cd python
80+
source kserve/.venv/bin/activate
81+
pytest --cov=storage ./storage
7782
7883
# ----------------------------------------Kserve Numpy 1.x Unit Tests--------------------------------------------
7984
- name: Setup kserve numpy 1-x directory

.github/workflows/scheduled-image-scan.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
name: scan images
1515
runs-on: ubuntu-latest
1616
strategy:
17+
fail-fast: false
1718
matrix:
1819
image:
1920
[
@@ -53,15 +54,16 @@ jobs:
5354
5455
- name: Upload sarif file to Github Code Scanning
5556
if: always()
56-
continue-on-error: true #avoid fail the pipeline if the SARIF upload fails.
5757
uses: github/codeql-action/upload-sarif@v3
5858
with:
5959
sarif_file: application/${{ matrix.image.name }}/docker.snyk.sarif
60+
category: ${{ matrix.image.name }}
6061

6162
predictor-image-scan:
6263
name: scan predictor images
6364
runs-on: ubuntu-latest
6465
strategy:
66+
fail-fast: false
6567
matrix:
6668
image:
6769
[
@@ -104,11 +106,13 @@ jobs:
104106
uses: github/codeql-action/upload-sarif@v3
105107
with:
106108
sarif_file: application/${{ matrix.image.name }}/docker.snyk.sarif
109+
category: ${{ matrix.image.name }}
107110

108111
explainer-image-scan:
109112
name: scan explainer images
110113
runs-on: ubuntu-latest
111114
strategy:
115+
fail-fast: false
112116
matrix:
113117
image: [{ name: art-explainer, file: python/artexplainer.Dockerfile }]
114118

@@ -143,3 +147,4 @@ jobs:
143147
uses: github/codeql-action/upload-sarif@v3
144148
with:
145149
sarif_file: application/${{ matrix.image.name }}/docker.snyk.sarif
150+
category: ${{ matrix.image.name }}

charts/llmisvc-crd/templates/serving.kserve.io_llminferenceserviceconfigs.yaml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,7 @@ spec:
4646
lora:
4747
properties:
4848
adapters:
49-
items:
50-
properties:
51-
framework:
52-
type: string
53-
memory:
54-
anyOf:
55-
- type: integer
56-
- type: string
57-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
58-
x-kubernetes-int-or-string: true
59-
storageUri:
60-
type: string
61-
required:
62-
- framework
63-
- memory
64-
- storageUri
65-
type: object
66-
type: array
49+
x-kubernetes-preserve-unknown-fields: true
6750
type: object
6851
name:
6952
type: string

charts/llmisvc-crd/templates/serving.kserve.io_llminferenceservices.yaml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,7 @@ spec:
6565
lora:
6666
properties:
6767
adapters:
68-
items:
69-
properties:
70-
framework:
71-
type: string
72-
memory:
73-
anyOf:
74-
- type: integer
75-
- type: string
76-
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
77-
x-kubernetes-int-or-string: true
78-
storageUri:
79-
type: string
80-
required:
81-
- framework
82-
- memory
83-
- storageUri
84-
type: object
85-
type: array
68+
x-kubernetes-preserve-unknown-fields: true
8669
type: object
8770
name:
8871
type: string

charts/llmisvc-resources/templates/config-llm-decode-template.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
template:
77
containers:
8-
- image: ghcr.io/llm-d/llm-d:v0.2.0
8+
- image: ghcr.io/llm-d/llm-d-dev:v0.2.2
99
imagePullPolicy: IfNotPresent
1010
name: main
1111
ports:
@@ -14,6 +14,7 @@ spec:
1414
command:
1515
- vllm
1616
- serve
17+
- /mnt/models
1718
args:
1819
- --served-model-name
1920
- "{{ .Spec.Model.Name }}"
@@ -34,9 +35,13 @@ spec:
3435
value: /models
3536
securityContext:
3637
allowPrivilegeEscalation: false
38+
readOnlyRootFilesystem: false
39+
runAsNonRoot: true
3740
capabilities:
3841
drop:
39-
- MKNOD
42+
- ALL
43+
seccompProfile:
44+
type: RuntimeDefault
4045
terminationMessagePath: /dev/termination-log
4146
terminationMessagePolicy: FallbackToLogsOnError
4247
livenessProbe:
@@ -76,7 +81,13 @@ spec:
7681
- containerPort: 8000
7782
protocol: TCP
7883
resources: { }
79-
securityContext: { }
84+
securityContext:
85+
allowPrivilegeEscalation: false
86+
readOnlyRootFilesystem: false
87+
runAsNonRoot: true
88+
capabilities:
89+
drop:
90+
- ALL
8091
terminationMessagePath: /dev/termination-log
8192
terminationMessagePolicy: FallbackToLogsOnError
8293
livenessProbe:
@@ -100,6 +111,7 @@ spec:
100111
args:
101112
- "--port=8000"
102113
- "--vllm-port=8001"
114+
- "--connector=nixlv2"
103115
- "--secure-proxy=true"
104116
- "--cert-path=/etc/ssl/certs"
105117
- "--decoder-use-tls=true"
@@ -128,4 +140,4 @@ spec:
128140
name: model-cache
129141
- name: tls-certs
130142
secret:
131-
secretName: "{{ ChildName .ObjectMeta.Name `-kserve-self-signed-certs` }}"
143+
secretName: "{{ ChildName .ObjectMeta.Name `-kserve-self-signed-certs` }}"

0 commit comments

Comments
 (0)