Introduce Priority field in ServingRuntime (kubeflow#3031)

* Introduce priority field Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Implement validator webhook Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Add v2 support and priority to servingruntime yaml Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Fix protocol version in serving runtime sorting and reverse sort the serving runtime Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Add v2 protocol support in servingruntime charts Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Add webhooks to helm chart Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Add tests Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * make generate Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * fix supported modelformat sort Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * fix helm chart Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * rebase master Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Make model name comparision case insensitive Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> * Resolve comments Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com> --------- Signed-off-by: Sivanantham Chinnaiyan <sivanantham.chinnaiyan@ideas2it.com>
magdalenakuhn17 · Sep 2, 2023 · f7de5e6 · f7de5e6
1 parent a994544
commit f7de5e6
Show file tree

Hide file tree

Showing 101 changed files with 3,574 additions and 1,063 deletions.
diff --git a/Makefile b/Makefile
@@ -76,6 +76,9 @@ deploy: manifests
 	${KUSTOMIZE} edit remove resource certmanager/certificate.yaml; \
 	else ${KUSTOMIZE} edit add resource certmanager/certificate.yaml; fi;
 	${KUSTOMIZE} build config/default | kubectl apply -f -
+	kubectl wait --for=condition=ready pod -l control-plane=kserve-controller-manager -n kserve --timeout=300s
+	sleep 2
+	${KUSTOMIZE} build config/runtimes | kubectl apply -f -
 	if [ ${KSERVE_ENABLE_SELF_SIGNED_CA} != false ]; then ./hack/self-signed-ca.sh; fi;
 
 deploy-dev: manifests
@@ -87,6 +90,7 @@ deploy-dev: manifests
 	${KUSTOMIZE} build config/overlays/development | kubectl apply -f -
 	# TODO: Add runtimes as part of default deployment
 	kubectl wait --for=condition=ready pod -l control-plane=kserve-controller-manager -n kserve --timeout=300s
+	sleep 2
 	${KUSTOMIZE} build config/runtimes | kubectl apply -f -
 	if [ ${KSERVE_ENABLE_SELF_SIGNED_CA} != false ]; then ./hack/self-signed-ca.sh; fi;
 
@@ -125,17 +129,9 @@ deploy-helm: manifests
 
 undeploy: kustomize
 	${KUSTOMIZE} build config/default | kubectl delete -f -
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io inferenceservice.serving.kserve.io
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io trainedmodel.serving.kserve.io
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io inferencegraph.serving.kserve.io
-	kubectl delete mutatingwebhookconfigurations.admissionregistration.k8s.io inferenceservice.serving.kserve.io
 
 undeploy-dev: kustomize
 	${KUSTOMIZE} build config/overlays/development | kubectl delete -f -
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io inferenceservice.serving.kserve.io
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io trainedmodel.serving.kserve.io
-	kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io inferencegraph.serving.kserve.io
-	kubectl delete mutatingwebhookconfigurations.admissionregistration.k8s.io inferenceservice.serving.kserve.io
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen kustomize

diff --git a/charts/kserve-crd/templates/serving.kserve.io_clusterservingruntimes.yaml b/charts/kserve-crd/templates/serving.kserve.io_clusterservingruntimes.yaml
@@ -1132,6 +1132,10 @@ spec:
                         type: boolean
                       name:
                         type: string
+                      priority:
+                        format: int32
+                        minimum: 1
+                        type: integer
                       version:
                         type: string
                     required:

diff --git a/charts/kserve-crd/templates/serving.kserve.io_servingruntimes.yaml b/charts/kserve-crd/templates/serving.kserve.io_servingruntimes.yaml
@@ -1132,6 +1132,10 @@ spec:
                         type: boolean
                       name:
                         type: string
+                      priority:
+                        format: int32
+                        minimum: 1
+                        type: integer
                       version:
                         type: string
                     required:

diff --git a/charts/kserve-resources/templates/clusterservingruntimes.yaml b/charts/kserve-resources/templates/clusterservingruntimes.yaml
@@ -8,10 +8,12 @@ spec:
     prometheus.kserve.io/path: "/metrics"
   supportedModelFormats:
     - name: lightgbm
-      version: "2"
+      version: "3"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v1
+    - v2
   containers:
     - name: kserve-container
       image: "{{ .Values.kserve.servingruntime.lgbserver.image }}:{{ .Values.kserve.servingruntime.lgbserver.tag }}"
@@ -42,15 +44,23 @@ spec:
     - name: sklearn
       version: "0"
       autoSelect: true
+      priority: 1
+    - name: sklearn
+      version: "1"
+      autoSelect: true
+      priority: 2
     - name: xgboost
       version: "1"
       autoSelect: true
+      priority: 2
     - name: lightgbm
       version: "3"
       autoSelect: true
+      priority: 2
     - name: mlflow
       version: "1"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v2
   containers:
@@ -86,8 +96,10 @@ spec:
     - name: paddle
       version: "2"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v1
+    - v2
   containers:
     - name: kserve-container
       image: "{{ .Values.kserve.servingruntime.paddleserver.image }}:{{ .Values.kserve.servingruntime.paddleserver.tag }}"
@@ -116,11 +128,14 @@ spec:
     - name: pmml
       version: "3"
       autoSelect: true
+      priority: 1
     - name: pmml
       version: "4"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v1
+    - v2
   containers:
     - name: kserve-container
       image: "{{ .Values.kserve.servingruntime.pmmlserver.image }}:{{ .Values.kserve.servingruntime.pmmlserver.tag }}"
@@ -149,8 +164,10 @@ spec:
     - name: sklearn
       version: "1"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v1
+    - v2
   containers:
     - name: kserve-container
       image: "{{ .Values.kserve.servingruntime.sklearnserver.image }}:{{ .Values.kserve.servingruntime.sklearnserver.tag }}"
@@ -179,9 +196,11 @@ spec:
     - name: tensorflow
       version: "1"
       autoSelect: true
+      priority: 2
     - name: tensorflow
       version: "2"
       autoSelect: true
+      priority: 2
   protocolVersions:
     - v1
     - grpc-v1
@@ -216,6 +235,7 @@ spec:
     - name: pytorch
       version: "1"
       autoSelect: true
+      priority: 2
   protocolVersions:
     - v1
     - v2
@@ -252,20 +272,25 @@ spec:
     - name: tensorrt
       version: "8"
       autoSelect: true
+      priority: 1
     - name: tensorflow
       version: "1"
       autoSelect: true
+      priority: 1
     - name: tensorflow
       version: "2"
       autoSelect: true
+      priority: 1
     - name: onnx
       version: "1"
       autoSelect: true
+      priority: 1
     - name: pytorch
       version: "1"
     - name: triton
       version: "2"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v2
     - grpc-v2
@@ -300,8 +325,10 @@ spec:
     - name: xgboost
       version: "1"
       autoSelect: true
+      priority: 1
   protocolVersions:
     - v1
+    - v2
   containers:
     - name: kserve-container
       image: "{{ .Values.kserve.servingruntime.xgbserver.image }}:{{ .Values.kserve.servingruntime.xgbserver.tag }}"

diff --git a/charts/kserve-resources/templates/webhookconfiguration.yaml b/charts/kserve-resources/templates/webhookconfiguration.yaml
@@ -138,3 +138,61 @@ webhooks:
           - UPDATE
         resources:
           - inferencegraphs
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  creationTimestamp: null
+  name: clusterservingruntime.serving.kserve.io
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/serving-cert
+webhooks:
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: kserve-webhook-server-service
+        namespace: {{ .Release.Namespace }}
+        path: /validate-serving-kserve-io-v1alpha1-clusterservingruntime
+    failurePolicy: Fail
+    name: clusterservingruntime.kserve-webhook-server.validator
+    sideEffects: None
+    admissionReviewVersions: ["v1beta1"]
+    rules:
+      - apiGroups:
+          - serving.kserve.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - clusterservingruntimes
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  creationTimestamp: null
+  name: servingruntime.serving.kserve.io
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/serving-cert
+webhooks:
+  - clientConfig:
+      caBundle: Cg==
+      service:
+        name: kserve-webhook-server-service
+        namespace: {{ .Release.Namespace }}
+        path: /validate-serving-kserve-io-v1alpha1-servingruntime
+    failurePolicy: Fail
+    name: servingruntime.kserve-webhook-server.validator
+    sideEffects: None
+    admissionReviewVersions: ["v1beta1"]
+    rules:
+      - apiGroups:
+          - serving.kserve.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - servingruntimes
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The KServe Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -1,4 +1,5 @@
 /*
+Copyright 2023 The KServe Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -27,6 +28,7 @@ import (
 	"github.com/kserve/kserve/pkg/controller/v1alpha1/trainedmodel/reconcilers/modelconfig"
 	v1beta1controller "github.com/kserve/kserve/pkg/controller/v1beta1/inferenceservice"
 	"github.com/kserve/kserve/pkg/webhook/admission/pod"
+	"github.com/kserve/kserve/pkg/webhook/admission/servingruntime"
 	istio_networking "istio.io/api/networking/v1alpha3"
 	"istio.io/client-go/pkg/apis/networking/v1alpha3"
 	v1 "k8s.io/api/core/v1"
@@ -220,6 +222,12 @@ func main() {
 	log.Info("registering webhooks to the webhook server")
 	hookServer.Register("/mutate-pods", &webhook.Admission{Handler: &pod.Mutator{}})
 
+	log.Info("registering cluster serving runtime validator webhook to the webhook server")
+	hookServer.Register("/validate-serving-kserve-io-v1alpha1-clusterservingruntime", &webhook.Admission{Handler: &servingruntime.ClusterServingRuntimeValidator{}})
+
+	log.Info("registering serving runtime validator webhook to the webhook server")
+	hookServer.Register("/validate-serving-kserve-io-v1alpha1-servingruntime", &webhook.Admission{Handler: &servingruntime.ServingRuntimeValidator{}})
+
 	if err = ctrl.NewWebhookManagedBy(mgr).
 		For(&v1alpha1.TrainedModel{}).
 		Complete(); err != nil {

diff --git a/cmd/manager/main_test.go b/cmd/manager/main_test.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The KServe Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

diff --git a/cmd/router/main_test.go b/cmd/router/main_test.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2023 The KServe Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package main
 
 import (

diff --git a/cmd/spec-gen/main.go b/cmd/spec-gen/main.go
@@ -1,4 +1,5 @@
 /*
+Copyright 2023 The KServe Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/config/crd/serving.kserve.io_clusterservingruntimes.yaml b/config/crd/serving.kserve.io_clusterservingruntimes.yaml
@@ -1132,6 +1132,10 @@ spec:
                         type: boolean
                       name:
                         type: string
+                      priority:
+                        format: int32
+                        minimum: 1
+                        type: integer
                       version:
                         type: string
                     required:

diff --git a/config/crd/serving.kserve.io_servingruntimes.yaml b/config/crd/serving.kserve.io_servingruntimes.yaml
@@ -1132,6 +1132,10 @@ spec:
                         type: boolean
                       name:
                         type: string
+                      priority:
+                        format: int32
+                        minimum: 1
+                        type: integer
                       version:
                         type: string
                     required:

diff --git a/config/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml b/config/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml
@@ -0,0 +1,8 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: clusterservingruntime.serving.kserve.io
+  annotations:
+    cert-manager.io/inject-ca-from: $(kserveNamespace)/serving-cert
+webhooks:
+  - name: clusterservingruntime.kserve-webhook-server.validator
diff --git a/...el_mutatingwebhook_cainjection_patch.yaml → ..._validatingwebhook_cainjection_patch.yaml b/...el_mutatingwebhook_cainjection_patch.yaml → ..._validatingwebhook_cainjection_patch.yaml