From fdbbe5b90d68a460c654ef8fd9134a58192491e8 Mon Sep 17 00:00:00 2001
From: stephanbertl <stephan@bweb.at>
Date: Mon, 20 Nov 2023 14:37:01 +0100
Subject: [PATCH] fixed #256. added runtimeClassName and fixed incorrect
 placement of nodeSelector (#259)

* fixed #256.
nodeSelector was incorrectly placed under the container.
moved it to pod spec
added runtimeClassName to the pod spec to select specific GPU nodes.

* increment version number

* added artifacthub.io/changes

* update readme.md

* try to fix helm docs generation issue

* update readme.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

---------

Co-authored-by: IAEA_SG\BERTLS <s.bertl@iaea.org>
Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>
---
 charts/clearml-serving/Chart.yaml                    |  4 +++-
 charts/clearml-serving/README.md                     |  2 +-
 .../templates/clearml-serving-triton-deployment.yaml | 12 ++++++++----
 charts/clearml-serving/values.yaml                   |  3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/charts/clearml-serving/Chart.yaml b/charts/clearml-serving/Chart.yaml
index 12e6f2f..eb578e1 100644
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: "1.5.1"
+version: "1.5.2"
 appVersion: "1.3.0"
 kubeVersion: ">= 1.21.0-0 < 1.29.0-0"
 home: https://clear.ml
@@ -35,3 +35,5 @@ annotations:
   artifacthub.io/changes: |
     - kind: fixed
       description: missing extraEnvs
+    - kind: fixed
+      description: added runtimeClassName for triton pods and fixed nodeSelector not working
diff --git a/charts/clearml-serving/README.md b/charts/clearml-serving/README.md
index d0eb2cc..a0e0dbe 100644
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving
 
-![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
+![Version: 1.5.2](https://img.shields.io/badge/Version-1.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0](https://img.shields.io/badge/AppVersion-1.3.0-informational?style=flat-square)
 
 ClearML Serving Helm Chart
 
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
index c994e97..f91fdee 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -27,6 +27,9 @@ spec:
       - name: clearml-registry-key
       {{- end }}
       {{- end }}
+      {{ if .Values.clearml_serving_triton.runtimeClassName}}
+      runtimeClassName: {{ .Values.clearml_serving_triton.runtimeClassName }}
+      {{- end}}
       {{- if or .Values.clearml_serving_triton.additionalConfigs .Values.clearml_serving_triton.existingAdditionalConfigsConfigMap  .Values.clearml_serving_triton.existingAdditionalConfigsSecret }}
       volumes:
         - name: additional-config
@@ -75,10 +78,7 @@ spec:
             - name: additional-config
               mountPath: /opt/clearml/config
           {{- end }}
-          {{- with .Values.clearml_serving_triton.nodeSelector }}
-          nodeSelector:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
+          
           {{- with .Values.clearml_serving_triton.affinity }}
           affinity:
             {{- toYaml . | nindent 12 }}
@@ -90,5 +90,9 @@ spec:
           resources:
             {{- toYaml .Values.clearml_serving_triton.resources | nindent 12 }}
       restartPolicy: Always
+      {{- with .Values.clearml_serving_triton.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{ end }}
 
diff --git a/charts/clearml-serving/values.yaml b/charts/clearml-serving/values.yaml
index af68184..e8c81a8 100644
--- a/charts/clearml-serving/values.yaml
+++ b/charts/clearml-serving/values.yaml
@@ -112,6 +112,9 @@ clearml_serving_triton:
   image:
     repository: "allegroai/clearml-serving-triton"
     tag: "1.3.0"
+  # -- Runtime Class configuration
+  # uncomment to use custom runtime class, eg. nvidia when using GPU operator
+  # runtimeClassName: "nvidia"
   # -- Node Selector configuration
   nodeSelector: {}
   # -- Tolerations configuration