Skip to content

Commit ea020d0

Browse files
authored
Revert "20251118 sync upstream" (#991)
1 parent f17e0dd commit ea020d0

File tree

87 files changed

+3474
-2455
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

+3474
-2455
lines changed

.flake8

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ 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
1918
python/*_pb2.py
2019
docs/**/*.py
2120
python/kserve/kserve/protocol/rest/openai/types/openapi.py

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -415,12 +415,7 @@ 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" "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"
418+
./test/scripts/gh-actions/run-e2e-tests.sh "transformer or mms or collocation or explainer" "6"
424419
425420
- name: Check system status
426421
if: always()
@@ -588,11 +583,6 @@ jobs:
588583
run: |
589584
./test/scripts/gh-actions/run-e2e-tests.sh "path_based_routing" "6"
590585
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-
596586
- name: Check system status
597587
if: always()
598588
run: |

.github/workflows/python-test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ 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
8277
8378
# ----------------------------------------Kserve Numpy 1.x Unit Tests--------------------------------------------
8479
- name: Setup kserve numpy 1-x directory

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
name: scan images
1515
runs-on: ubuntu-latest
1616
strategy:
17-
fail-fast: false
1817
matrix:
1918
image:
2019
[
@@ -54,16 +53,15 @@ jobs:
5453
5554
- name: Upload sarif file to Github Code Scanning
5655
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 }}
6160

6261
predictor-image-scan:
6362
name: scan predictor images
6463
runs-on: ubuntu-latest
6564
strategy:
66-
fail-fast: false
6765
matrix:
6866
image:
6967
[
@@ -106,13 +104,11 @@ jobs:
106104
uses: github/codeql-action/upload-sarif@v3
107105
with:
108106
sarif_file: application/${{ matrix.image.name }}/docker.snyk.sarif
109-
category: ${{ matrix.image.name }}
110107

111108
explainer-image-scan:
112109
name: scan explainer images
113110
runs-on: ubuntu-latest
114111
strategy:
115-
fail-fast: false
116112
matrix:
117113
image: [{ name: art-explainer, file: python/artexplainer.Dockerfile }]
118114

@@ -147,4 +143,3 @@ jobs:
147143
uses: github/codeql-action/upload-sarif@v3
148144
with:
149145
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: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,24 @@ spec:
4646
lora:
4747
properties:
4848
adapters:
49-
x-kubernetes-preserve-unknown-fields: true
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
5067
type: object
5168
name:
5269
type: string

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,24 @@ spec:
6565
lora:
6666
properties:
6767
adapters:
68-
x-kubernetes-preserve-unknown-fields: true
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
6986
type: object
7087
name:
7188
type: string

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

Lines changed: 4 additions & 16 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-dev:v0.2.2
8+
- image: ghcr.io/llm-d/llm-d:v0.2.0
99
imagePullPolicy: IfNotPresent
1010
name: main
1111
ports:
@@ -14,7 +14,6 @@ spec:
1414
command:
1515
- vllm
1616
- serve
17-
- /mnt/models
1817
args:
1918
- --served-model-name
2019
- "{{ .Spec.Model.Name }}"
@@ -35,13 +34,9 @@ spec:
3534
value: /models
3635
securityContext:
3736
allowPrivilegeEscalation: false
38-
readOnlyRootFilesystem: false
39-
runAsNonRoot: true
4037
capabilities:
4138
drop:
42-
- ALL
43-
seccompProfile:
44-
type: RuntimeDefault
39+
- MKNOD
4540
terminationMessagePath: /dev/termination-log
4641
terminationMessagePolicy: FallbackToLogsOnError
4742
livenessProbe:
@@ -81,13 +76,7 @@ spec:
8176
- containerPort: 8000
8277
protocol: TCP
8378
resources: { }
84-
securityContext:
85-
allowPrivilegeEscalation: false
86-
readOnlyRootFilesystem: false
87-
runAsNonRoot: true
88-
capabilities:
89-
drop:
90-
- ALL
79+
securityContext: { }
9180
terminationMessagePath: /dev/termination-log
9281
terminationMessagePolicy: FallbackToLogsOnError
9382
livenessProbe:
@@ -111,7 +100,6 @@ spec:
111100
args:
112101
- "--port=8000"
113102
- "--vllm-port=8001"
114-
- "--connector=nixlv2"
115103
- "--secure-proxy=true"
116104
- "--cert-path=/etc/ssl/certs"
117105
- "--decoder-use-tls=true"
@@ -140,4 +128,4 @@ spec:
140128
name: model-cache
141129
- name: tls-certs
142130
secret:
143-
secretName: "{{ ChildName .ObjectMeta.Name `-kserve-self-signed-certs` }}"
131+
secretName: "{{ ChildName .ObjectMeta.Name `-kserve-self-signed-certs` }}"

0 commit comments

Comments
 (0)