Merge branch 'community-master' into odh

Please enter a commit message to explain why this merge is necessary,
opendatahub-io · Feb 22, 2024 · 380eb42 · 380eb42
2 parents c6bf7da + 99ac7b2
commit 380eb42
Show file tree

Hide file tree

Showing 79 changed files with 50,133 additions and 4,052 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -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 }}

diff --git a/.github/workflows/huggingface-docker-publish.yml b/.github/workflows/huggingface-docker-publish.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - master
 
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
   # Run tests for any PRs.
   pull_request:
 

diff --git a/charts/kserve-crd/Chart.yaml b/charts/kserve-crd/Chart.yaml
@@ -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

diff --git a/charts/kserve-crd/templates/serving.kserve.io_inferencegraphs.yaml b/charts/kserve-crd/templates/serving.kserve.io_inferencegraphs.yaml
@@ -403,6 +403,10 @@ spec:
                         type: array
                     type: object
                 type: object
+              maxReplicas:
+                type: integer
+              minReplicas:
+                type: integer
               nodes:
                 additionalProperties:
                   properties:
@@ -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

diff --git a/charts/kserve-crd/templates/serving.kserve.io_inferenceservices.yaml b/charts/kserve-crd/templates/serving.kserve.io_inferenceservices.yaml
diff --git a/charts/kserve-resources/Chart.yaml b/charts/kserve-resources/Chart.yaml
@@ -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

diff --git a/charts/kserve-resources/README.md b/charts/kserve-resources/README.md
@@ -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 }}"` |  |

diff --git a/charts/kserve-resources/templates/configmap.yaml b/charts/kserve-resources/templates/configmap.yaml
@@ -200,7 +200,8 @@ data:
            "ingressClassName" : "istio",
            "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
            "urlScheme": "http",
-           "disableIstioVirtualHost": false
+           "disableIstioVirtualHost": false,
+           "disableIngressCreation": false
        }
      ingress: |-
        {
@@ -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.
@@ -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: |-
     {

diff --git a/charts/kserve-resources/values.yaml b/charts/kserve-resources/values.yaml
@@ -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
@@ -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

diff --git a/config/configmap/inferenceservice.yaml b/config/configmap/inferenceservice.yaml
@@ -211,7 +211,8 @@ data:
            "ingressClassName" : "istio",
            "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
            "urlScheme": "http",
-           "disableIstioVirtualHost": false
+           "disableIstioVirtualHost": false,
+           "disableIngressCreation": false
        }
      ingress: |-
        {
@@ -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.
@@ -509,7 +513,8 @@ data:
         "ingressClassName" : "istio",
         "domainTemplate": "{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}",
         "urlScheme": "http",
-        "disableIstioVirtualHost": false
+        "disableIstioVirtualHost": false,
+        "disableIngressCreation": false
     }
 
   logger: |-

diff --git a/config/runtimes/kserve-huggingfaceserver.yaml b/config/runtimes/kserve-huggingfaceserver.yaml
@@ -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"

diff --git a/go.mod b/go.mod
@@ -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