Clearml serving add support for triton (#74)

* added triton deployment and service, added triton block to values file, added value for CLEARML_DEFAULT_TRITON_GRPC_ADDR env variable in the serving-inference deployment

* re-generated README

* fixed yaml

* added condition to enable triton support

* changed chart version

* changed chart version

* bumped version to 0.3.0

* added conditional extraPythonPackages variable to clearml_serving_triton deploymnent

* added conditional extraPythonPackages to all the relevant deployments

* bumped version to 0.3.0

charts/clearml-serving/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: 0.2.0
+version: 0.3.0
 appVersion: "0.9.0"
 maintainers:
   - name: valeriano-manassero

charts/clearml-serving/README.md

@@ -1,6 +1,6 @@
 # clearml-serving
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
 
 ClearML Serving Helm Chart
 
@@ -23,20 +23,28 @@ ClearML Serving Helm Chart
 | clearml.apiAccessKey | string | `"ClearML API Access Key"` |  |
 | clearml.apiHost | string | `"http://clearml-server-apiserver:8008"` |  |
 | clearml.apiSecretKey | string | `"ClearML API Secret Key"` |  |
-| clearml.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
 | clearml.filesHost | string | `"http://clearml-server-fileserver:8081"` |  |
 | clearml.servingTaskId | string | `"ClearML Serving Task ID"` |  |
 | clearml.webHost | string | `"http://clearml-server-webserver:80"` |  |
 | clearml_serving_inference.affinity | object | `{}` |  |
+| clearml_serving_inference.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
 | clearml_serving_inference.image | string | `"allegroai/clearml-serving-inference"` |  |
 | clearml_serving_inference.nodeSelector | object | `{}` |  |
 | clearml_serving_inference.resources | object | `{}` |  |
 | clearml_serving_inference.tolerations | list | `[]` |  |
 | clearml_serving_statistics.affinity | object | `{}` |  |
+| clearml_serving_statistics.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
 | clearml_serving_statistics.image | string | `"allegroai/clearml-serving-statistics"` |  |
 | clearml_serving_statistics.nodeSelector | object | `{}` |  |
 | clearml_serving_statistics.resources | object | `{}` |  |
 | clearml_serving_statistics.tolerations | list | `[]` |  |
+| clearml_serving_triton.affinity | object | `{}` |  |
+| clearml_serving_triton.enabled | bool | `true` |  |
+| clearml_serving_triton.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
+| clearml_serving_triton.image | string | `"allegroai/clearml-serving-triton"` |  |
+| clearml_serving_triton.nodeSelector | object | `{}` |  |
+| clearml_serving_triton.resources | object | `{}` |  |
+| clearml_serving_triton.tolerations | list | `[]` |  |
 | grafana.affinity | object | `{}` |  |
 | grafana.image | string | `"grafana/grafana:8.4.4-ubuntu"` |  |
 | grafana.nodeSelector | object | `{}` |  |

charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml

@@ -37,7 +37,11 @@ spec:
             - name: CLEARML_DEFAULT_BASE_SERVE_URL
               value: http://127.0.0.1:8080/serve
             - name: CLEARML_DEFAULT_TRITON_GRPC_ADDR
+            {{- if .Values.clearml_serving_triton.enabled }}
+              value: "clearml-serving-triton:8001"
+            {{- else }}
               value: ""
+            {{- end }}
             - name: CLEARML_SERVING_NUM_PROCESS
               value: "2"
             - name: CLEARML_SERVING_PORT
@@ -46,9 +50,9 @@ spec:
               value: "{{ .Values.clearml.servingTaskId }}"
             - name: CLEARML_USE_GUNICORN
               value: "true"
-            {{- if .Values.clearml.extraPythonPackages }}
+            {{- if .Values.clearml_serving_inference.extraPythonPackages }}
             - name: EXTRA_PYTHON_PACKAGES
-              value: '{{ join " " .Values.clearml.extraPythonPackages }}'
+              value: '{{ join " " .Values.clearml_serving_inference.extraPythonPackages }}'
             {{- end }}
           image: "{{ .Values.clearml_serving_inference.image }}:{{ .Chart.AppVersion }}"
           name: clearml-serving-inference

charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml

@@ -36,9 +36,9 @@ spec:
               value: "1.0"
             - name: CLEARML_SERVING_TASK_ID
               value: "{{ .Values.clearml.servingTaskId }}"
-            {{- if .Values.clearml.extraPythonPackages }}
+            {{- if .Values.clearml_serving_statistics.extraPythonPackages }}
             - name: EXTRA_PYTHON_PACKAGES
-              value: '{{ join " " .Values.clearml.extraPythonPackages }}'
+              value: '{{ join " " .Values.clearml_serving_statistics.extraPythonPackages }}'
             {{- end }}
           image: "{{ .Values.clearml_serving_statistics.image }}:{{ .Chart.AppVersion }}"
           name: clearml-serving-statistics

charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml

@@ -0,0 +1,52 @@
+{{ if .Values.clearml_serving_triton.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations: {}
+  labels:
+    clearml.serving.service: clearml-serving-triton
+  name: clearml-serving-triton
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      clearml.serving.service: clearml-serving-triton
+  strategy: {}
+  template:
+    metadata:
+      annotations: {}
+      labels:
+        clearml.serving.network/clearml-serving-backend: "true"
+        clearml.serving.service: clearml-serving-triton
+    spec:
+      containers:
+        - env:
+            - name: CLEARML_API_ACCESS_KEY
+              value: "{{ .Values.clearml.apiAccessKey }}"
+            - name: CLEARML_API_SECRET_KEY
+              value: "{{ .Values.clearml.apiSecretKey }}"
+            - name: CLEARML_API_HOST
+              value: "{{ .Values.clearml.apiHost }}"
+            - name: CLEARML_FILES_HOST
+              value: "{{ .Values.clearml.filesHost }}"
+            - name: CLEARML_WEB_HOST
+              value: "{{ .Values.clearml.webHost }}"
+            - name: CLEARML_SERVING_TASK_ID
+              value: "{{ .Values.clearml.servingTaskId }}"
+            - name: CLEARML_TRITON_POLL_FREQ
+              value: "1.0"
+            - name: CLEARML_TRITON_METRIC_FREQ
+              value: "1.0"
+            {{- if .Values.clearml_serving_triton.extraPythonPackages }}
+            - name: EXTRA_PYTHON_PACKAGES
+              value: '{{ join " " .Values.clearml_serving_triton.extraPythonPackages }}'
+            {{- end }}
+          image: "{{ .Values.clearml_serving_triton.image }}:{{ .Chart.AppVersion }}"
+          name: clearml-serving-triton
+          ports:
+            - containerPort: 8001
+          resources: {}
+      restartPolicy: Always
+status: {}
+{{ end }}
+

charts/clearml-serving/templates/clearml-serving-triton-service.yaml

@@ -0,0 +1,18 @@
+{{ if .Values.clearml_serving_triton.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  annotations: {}
+  labels:
+    clearml.serving.service: clearml-serving-triton
+  name: clearml-serving-triton
+spec:
+  ports:
+    - name: "8001"
+      port: 8001
+      targetPort: 8001
+  selector:
+    clearml.serving.service: clearml-serving-triton
+status:
+  loadBalancer: {}
+{{ end }}

charts/clearml-serving/values.yaml

@@ -8,11 +8,6 @@ clearml:
   webHost: http://clearml-server-webserver:80
   servingTaskId: "ClearML Serving Task ID"
 
-  # -- Extra Python Packages to be installed in running pods
-  extraPythonPackages: []
-#    - numpy==1.22.4
-#    - pandas==1.4.2
-
 zookeeper:
   image: bitnami/zookeeper:3.7.0
   nodeSelector: {}
@@ -54,6 +49,10 @@ clearml_serving_statistics:
   tolerations: []
   affinity: {}
   resources: {}
+  # -- Extra Python Packages to be installed in running pods
+  extraPythonPackages: []
+  #  - numpy==1.22.4
+  #  - pandas==1.4.2
 
 clearml_serving_inference:
   image: allegroai/clearml-serving-inference
@@ -61,3 +60,19 @@ clearml_serving_inference:
   tolerations: []
   affinity: {}
   resources: {}
+  # -- Extra Python Packages to be installed in running pods
+  extraPythonPackages: []
+  #  - numpy==1.22.4
+  #  - pandas==1.4.2
+
+clearml_serving_triton:
+  enabled: true
+  image: allegroai/clearml-serving-triton
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  resources: {}
+  # -- Extra Python Packages to be installed in running pods
+  extraPythonPackages: []
+  #  - numpy==1.22.4
+  #  - pandas==1.4.2