Reverts of unneeded commits; and upstream code sync

.pre-commit-config.yaml

@@ -0,0 +1,8 @@
+repos:
+  - repo: https://github.com/norwoodj/helm-docs
+    rev: v1.12.0
+    hooks:
+      - id: helm-docs
+        args:
+          - --chart-search-root=charts
+          - --output-file=README.md

charts/kserve-crd/README.md

@@ -1,7 +1,16 @@
 # kserve-crd
 
-## Using this chart
+Helm chart for deploying kserve crds
+
+![Version: v0.12.0-rc1](https://img.shields.io/badge/Version-v0.12.0--rc1-informational?style=flat-square)
+
+## Installing the Chart
+
+To install the chart, run the following:
 
 ```console
-helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version v0.12.0-rc0
+$ helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version v0.12.0-rc1
 ```
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)

charts/kserve-crd/README.md.gotmpl

@@ -0,0 +1,14 @@
+{{ template "chart.header" . }}
+{{ template "chart.description" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+## Installing the Chart
+
+To install the chart, run the following:
+
+```console
+$ helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version {{ template "chart.version" . }}
+```
+
+{{ template "helm-docs.versionFooter" . }}

charts/kserve-resources/README.md

@@ -1,15 +1,111 @@
 # kserve
 
-## Using this chart
+Helm chart for deploying kserve resources
 
-First install the `kserve-crd` chart
+![Version: v0.12.0-rc1](https://img.shields.io/badge/Version-v0.12.0--rc1-informational?style=flat-square)
 
-```console
-helm install kserve-crd oci://ghcr.io/kserve/charts/kserve-crd --version v0.12.0-rc0
-```
+## Installing the Chart
 
-Then install this chart
+To install the chart, run the following:
 
 ```console
-helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc0
+$ helm install kserve oci://ghcr.io/kserve/charts/kserve --version v0.12.0-rc1
 ```
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| kserve.agent.image | string | `"kserve/agent"` |  |
+| kserve.agent.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.controller.affinity | object | `{}` |  |
+| kserve.controller.deploymentMode | string | `"Serverless"` |  |
+| kserve.controller.gateway.disableIstioVirtualHost | bool | `false` |  |
+| kserve.controller.gateway.domain | string | `"example.com"` |  |
+| kserve.controller.gateway.domainTemplate | string | `"{{ .Name }}-{{ .Namespace }}.{{ .IngressDomain }}"` |  |
+| kserve.controller.gateway.ingressGateway.className | string | `"istio"` |  |
+| kserve.controller.gateway.ingressGateway.gateway | string | `"knative-serving/knative-ingress-gateway"` |  |
+| kserve.controller.gateway.ingressGateway.gatewayService | string | `"istio-ingressgateway.istio-system.svc.cluster.local"` |  |
+| kserve.controller.gateway.localGateway.gateway | string | `"knative-serving/knative-local-gateway"` |  |
+| kserve.controller.gateway.localGateway.gatewayService | string | `"knative-local-gateway.istio-system.svc.cluster.local"` |  |
+| kserve.controller.gateway.urlScheme | string | `"http"` |  |
+| kserve.controller.image | string | `"kserve/kserve-controller"` |  |
+| kserve.controller.nodeSelector | object | `{}` |  |
+| kserve.controller.rbacProxyImage | string | `"gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1"` |  |
+| kserve.controller.resources.limits.cpu | string | `"100m"` |  |
+| kserve.controller.resources.limits.memory | string | `"300Mi"` |  |
+| kserve.controller.resources.requests.cpu | string | `"100m"` |  |
+| kserve.controller.resources.requests.memory | string | `"300Mi"` |  |
+| kserve.controller.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.controller.tolerations | list | `[]` |  |
+| kserve.controller.topologySpreadConstraints | list | `[]` |  |
+| kserve.metricsaggregator.enableMetricAggregation | string | `"false"` |  |
+| kserve.metricsaggregator.enablePrometheusScraping | string | `"false"` |  |
+| kserve.modelmesh.config.modelmeshImage | string | `"kserve/modelmesh"` |  |
+| kserve.modelmesh.config.modelmeshImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.config.modelmeshRuntimeAdapterImage | string | `"kserve/modelmesh-runtime-adapter"` |  |
+| kserve.modelmesh.config.modelmeshRuntimeAdapterImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.config.podsPerRuntime | int | `2` |  |
+| kserve.modelmesh.config.restProxyImage | string | `"kserve/rest-proxy"` |  |
+| kserve.modelmesh.config.restProxyImageTag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].key | string | `"control-plane"` |  |
+| kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].operator | string | `"In"` |  |
+| kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchExpressions[0].values[0] | string | `"modelmesh-controller"` |  |
+| kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.topologyKey | string | `"topology.kubernetes.io/zone"` |  |
+| kserve.modelmesh.controller.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight | int | `100` |  |
+| kserve.modelmesh.controller.image | string | `"kserve/modelmesh-controller"` |  |
+| kserve.modelmesh.controller.nodeSelector | object | `{}` |  |
+| kserve.modelmesh.controller.tag | string | `"v0.11.1"` |  |
+| kserve.modelmesh.controller.tolerations | list | `[]` |  |
+| kserve.modelmesh.controller.topologySpreadConstraints | list | `[]` |  |
+| kserve.modelmesh.enabled | bool | `true` |  |
+| kserve.modelmeshVersion | string | `"v0.11.1"` |  |
+| kserve.router.image | string | `"kserve/router"` |  |
+| kserve.router.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.alibi.defaultVersion | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.alibi.image | string | `"kserve/alibi-explainer"` |  |
+| kserve.servingruntime.art.defaultVersion | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.art.image | string | `"kserve/art-explainer"` |  |
+| kserve.servingruntime.lgbserver.image | string | `"kserve/lgbserver"` |  |
+| kserve.servingruntime.lgbserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.mlserver.image | string | `"docker.io/seldonio/mlserver"` |  |
+| kserve.servingruntime.mlserver.modelClassPlaceholder | string | `"{{.Labels.modelClass}}"` |  |
+| kserve.servingruntime.mlserver.tag | string | `"1.3.2"` |  |
+| kserve.servingruntime.modelNamePlaceholder | string | `"{{.Name}}"` |  |
+| kserve.servingruntime.paddleserver.image | string | `"kserve/paddleserver"` |  |
+| kserve.servingruntime.paddleserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.pmmlserver.image | string | `"kserve/pmmlserver"` |  |
+| kserve.servingruntime.pmmlserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.sklearnserver.image | string | `"kserve/sklearnserver"` |  |
+| kserve.servingruntime.sklearnserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.servingruntime.tensorflow.image | string | `"tensorflow/serving"` |  |
+| kserve.servingruntime.tensorflow.tag | string | `"2.6.2"` |  |
+| kserve.servingruntime.torchserve.image | string | `"pytorch/torchserve-kfs"` |  |
+| kserve.servingruntime.torchserve.serviceEnvelopePlaceholder | string | `"{{.Labels.serviceEnvelope}}"` |  |
+| kserve.servingruntime.torchserve.tag | string | `"0.9.0"` |  |
+| kserve.servingruntime.tritonserver.image | string | `"nvcr.io/nvidia/tritonserver"` |  |
+| kserve.servingruntime.tritonserver.tag | string | `"23.05-py3"` |  |
+| kserve.servingruntime.xgbserver.image | string | `"kserve/xgbserver"` |  |
+| kserve.servingruntime.xgbserver.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.storage.caBundleConfigMapName | string | `""` |  |
+| kserve.storage.caBundleVolumeMountPath | string | `"/etc/ssl/custom-certs"` |  |
+| kserve.storage.cpuModelcar | string | `"10m"` |  |
+| kserve.storage.enableModelcar | bool | `false` |  |
+| kserve.storage.image | string | `"kserve/storage-initializer"` |  |
+| kserve.storage.memoryModelcar | string | `"15Mi"` |  |
+| kserve.storage.s3.CABundle | string | `""` |  |
+| kserve.storage.s3.accessKeyIdName | string | `"AWS_ACCESS_KEY_ID"` |  |
+| kserve.storage.s3.endpoint | string | `""` |  |
+| kserve.storage.s3.region | string | `""` |  |
+| kserve.storage.s3.secretAccessKeyName | string | `"AWS_SECRET_ACCESS_KEY"` |  |
+| kserve.storage.s3.useAnonymousCredential | string | `""` |  |
+| kserve.storage.s3.useHttps | string | `""` |  |
+| kserve.storage.s3.useVirtualBucket | string | `""` |  |
+| kserve.storage.s3.verifySSL | string | `""` |  |
+| kserve.storage.storageSecretNameAnnotation | string | `"serving.kserve.io/secretName"` |  |
+| kserve.storage.storageSpecSecretName | string | `"storage-config"` |  |
+| kserve.storage.tag | string | `"v0.12.0-rc1"` |  |
+| kserve.version | string | `"v0.12.0-rc1"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.12.0](https://github.com/norwoodj/helm-docs/releases/v1.12.0)

charts/kserve-resources/README.md.gotmpl

@@ -0,0 +1,18 @@
+{{ template "chart.header" . }}
+{{ template "chart.description" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+## Installing the Chart
+
+To install the chart, run the following:
+
+```console
+$ helm install kserve oci://ghcr.io/kserve/charts/kserve --version {{ template "chart.version" . }}
+```
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "helm-docs.versionFooter" . }}

charts/kserve-resources/templates/configmap.yaml

@@ -64,7 +64,7 @@ data:
            "memoryLimit": "1Gi",
            "cpuRequest": "100m",
            "cpuLimit": "1",
-           "enableDirectPvcVolumeMount": false,
+           "enableDirectPvcVolumeMount": true,
            "enableModelcar": false,
            "cpuModelcar": "10m",
            "memoryModelcar": "15Mi"
@@ -89,7 +89,7 @@ data:
            # enableDirectPvcVolumeMount controls whether users can mount pvc volumes directly.
            # if pvc volume is provided in storageuri then the pvc volume is directly mounted to /mnt/models in the user container.
            # rather than symlink it to a shared volume. For more info see https://github.com/kserve/kserve/issues/2737
-           "enableDirectPvcVolumeMount": false,
+           "enableDirectPvcVolumeMount": true,
 
            # enableModelcar enabled allows you to directly access an OCI container image by
            # using a source URL with an "oci://" schema.
@@ -528,7 +528,7 @@ data:
         "memoryLimit": "1Gi",
         "cpuRequest": "100m",
         "cpuLimit": "1",
-        "enableDirectPvcVolumeMount": false,
+        "enableDirectPvcVolumeMount": true,
         "caBundleConfigMapName": "{{ .Values.kserve.storage.caBundleConfigMapName }}",
         "caBundleVolumeMountPath": "{{ .Values.kserve.storage.caBundleVolumeMountPath }}",
         "enableModelcar": {{ .Values.kserve.storage.enableModelcar }},

charts/kserve-resources/templates/webhookconfiguration.yaml

@@ -35,6 +35,7 @@ webhooks:
     failurePolicy: Fail
     name: inferenceservice.kserve-webhook-server.pod-mutator
     sideEffects: None
+    reinvocationPolicy: IfNeeded
     admissionReviewVersions: ["v1beta1"]
     objectSelector:
       matchExpressions:

config/configmap/inferenceservice.yaml

@@ -96,7 +96,7 @@ data:
            # enableDirectPvcVolumeMount controls whether users can mount pvc volumes directly.
            # if pvc volume is provided in storageuri then the pvc volume is directly mounted to /mnt/models in the user container.
            # rather than symlink it to a shared volume. For more info see https://github.com/kserve/kserve/issues/2737
-           "enableDirectPvcVolumeMount": false,
+           "enableDirectPvcVolumeMount": true,
 
            # enableModelcar enabled allows you to directly access an OCI container image by
            # using a source URL with an "oci://" schema.
@@ -468,7 +468,7 @@ data:
         "cpuLimit": "1",
         "caBundleConfigMapName": "",
         "caBundleVolumeMountPath": "/etc/ssl/custom-certs",
-        "enableDirectPvcVolumeMount": false,
+        "enableDirectPvcVolumeMount": true,
         "enableModelcar": false,
         "cpuModelcar": "10m",
         "memoryModelcar": "15Mi"

config/crd/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

config/webhook/manifests.yaml

@@ -34,6 +34,7 @@ webhooks:
     failurePolicy: Fail
     name: inferenceservice.kserve-webhook-server.pod-mutator
     sideEffects: None
+    reinvocationPolicy: IfNeeded
     admissionReviewVersions: ["v1beta1"]
     namespaceSelector:
       matchExpressions: