Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from kserve:master #219

Merged
merged 16 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
IMAGE_TRANSFORMER_IMG: "kserve/image-transformer:${{ github.sha }}"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/huggingface-docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
branches:
- master

# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
pull_request:

Expand Down
2 changes: 1 addition & 1 deletion charts/kserve-crd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: kserve-crd
version: v0.12.0-rc1
version: v0.12.0
description: Helm chart for deploying kserve crds
keywords:
- kserve
Expand Down
13 changes: 13 additions & 0 deletions charts/kserve-crd/templates/serving.kserve.io_inferencegraphs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,10 @@ spec:
type: array
type: object
type: object
maxReplicas:
type: integer
minReplicas:
type: integer
nodes:
additionalProperties:
properties:
Expand Down Expand Up @@ -473,6 +477,15 @@ spec:
x-kubernetes-int-or-string: true
type: object
type: object
scaleMetric:
enum:
- cpu
- memory
- concurrency
- rps
type: string
scaleTarget:
type: integer
timeout:
format: int64
type: integer
Expand Down
627 changes: 627 additions & 0 deletions charts/kserve-crd/templates/serving.kserve.io_inferenceservices.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion charts/kserve-resources/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: kserve
version: v0.12.0-rc1
version: v0.12.0
description: Helm chart for deploying kserve resources
keywords:
- kserve
Expand Down
1 change: 1 addition & 0 deletions charts/kserve-resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ $ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
| kserve.agent.tag | string | `"v0.12.0-rc1"` | |
| kserve.controller.affinity | object | `{}` | |
| kserve.controller.deploymentMode | string | `"Serverless"` | |
| kserve.controller.gateway.disableIngressCreation | bool | `false` | |
| kserve.controller.gateway.disableIstioVirtualHost | bool | `false` | |
| kserve.controller.gateway.domain | string | `"example.com"` | |
| kserve.controller.gateway.domainTemplate | string | `"{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}"` | |
Expand Down
11 changes: 8 additions & 3 deletions charts/kserve-resources/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ data:
"ingressClassName" : "istio",
"domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
"urlScheme": "http",
"disableIstioVirtualHost": false
"disableIstioVirtualHost": false,
"disableIngressCreation": false
}
ingress: |-
{
Expand Down Expand Up @@ -252,7 +253,10 @@ data:
# By setting this field to true, user can use other networking layers supported by knative.
# For more info https://github.com/kserve/kserve/pull/2380, https://kserve.github.io/website/master/admin/serverless/kourier_networking/.
# NOTE: This configuration is only applicable to serverless deployment.
"disableIstioVirtualHost": false
"disableIstioVirtualHost": false,

# disableIngressCreation controls whether to disable ingress creation for raw deployment mode.
"disableIngressCreation": false,

# pathTemplate specifies the template for generating path based url for each inference service.
# The following variables can be used in the template for generating url.
Expand Down Expand Up @@ -510,7 +514,8 @@ data:
"ingressDomain" : "{{ .Values.kserve.controller.gateway.domain }}",
"domainTemplate": "{{ .Values.kserve.controller.gateway.domainTemplate }}",
"urlScheme": "{{ .Values.kserve.controller.gateway.urlScheme }}",
"disableIstioVirtualHost": {{ .Values.kserve.controller.gateway.disableIstioVirtualHost }}
"disableIstioVirtualHost": {{ .Values.kserve.controller.gateway.disableIstioVirtualHost }},
"disableIngressCreation": {{ .Values.kserve.controller.gateway.disableIngressCreation }}
}
logger: |-
{
Expand Down
5 changes: 3 additions & 2 deletions charts/kserve-resources/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kserve:
version: &defaultVersion v0.12.0-rc1
modelmeshVersion: &defaultModelMeshVersion v0.11.1
version: &defaultVersion v0.12.0
modelmeshVersion: &defaultModelMeshVersion v0.11.2
agent:
image: kserve/agent
tag: *defaultVersion
Expand Down Expand Up @@ -38,6 +38,7 @@ kserve:
domainTemplate: "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}"
urlScheme: http
disableIstioVirtualHost: false
disableIngressCreation: false
localGateway:
gateway: knative-serving/knative-local-gateway
gatewayService: knative-local-gateway.istio-system.svc.cluster.local
Expand Down
11 changes: 8 additions & 3 deletions config/configmap/inferenceservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ data:
"ingressClassName" : "istio",
"domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
"urlScheme": "http",
"disableIstioVirtualHost": false
"disableIstioVirtualHost": false,
"disableIngressCreation": false
}
ingress: |-
{
Expand Down Expand Up @@ -263,7 +264,10 @@ data:
# By setting this field to true, user can use other networking layers supported by knative.
# For more info https://github.com/kserve/kserve/pull/2380, https://kserve.github.io/website/master/admin/serverless/kourier_networking/.
# NOTE: This configuration is only applicable to serverless deployment.
"disableIstioVirtualHost": false
"disableIstioVirtualHost": false,

# disableIngressCreation controls whether to disable ingress creation for raw deployment mode.
"disableIngressCreation": false,

# pathTemplate specifies the template for generating path based url for each inference service.
# The following variables can be used in the template for generating url.
Expand Down Expand Up @@ -509,7 +513,8 @@ data:
"ingressClassName" : "istio",
"domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
"urlScheme": "http",
"disableIstioVirtualHost": false
"disableIstioVirtualHost": false,
"disableIngressCreation": false
}

logger: |-
Expand Down
4 changes: 2 additions & 2 deletions config/runtimes/kserve-huggingfaceserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ spec:
priority: 1
protocolVersions:
- v2
- v1
containers:
- name: kserve-container
image: huggingfaceserver:replace
args:
- --model_id={{.Name}}
- --model_dir=/mnt/models
- --model_name={{.Name}}
resources:
requests:
cpu: "1"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ require (
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/crypto v0.19.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
Expand Down
Loading
Loading