From af1c0f11488f9294e4344b6097ea3900ecf4a54e Mon Sep 17 00:00:00 2001
From: fbrintazzoli <filippo.brintazzoli@clear.ml>
Date: Fri, 27 Sep 2024 16:17:11 +0200
Subject: [PATCH] Fixed: Triton deployment tolerations placement fix

---
 charts/clearml-serving/Chart.yaml                         | 8 ++++----
 charts/clearml-serving/README.md                          | 4 ++--
 .../templates/clearml-serving-triton-deployment.yaml      | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/clearml-serving/Chart.yaml b/charts/clearml-serving/Chart.yaml
index b75885f8..7d5802d0 100644
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: "1.5.7"
+version: "1.5.8"
 appVersion: "1.3.0"
-kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -33,5 +33,5 @@ dependencies:
     condition: grafana.enabled
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Updated README
+    - kind: fixed
+      description: Triton deployment tolerations placement fix
diff --git a/charts/clearml-serving/README.md b/charts/clearml-serving/README.md
index 56384fb9..5317f06a 100644
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving
 
-![Version: 1.5.7](https://img.shields.io/badge/Version-1.5.7-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.8](https://img.shields.io/badge/Version-1.5.8-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
 
@@ -49,7 +49,7 @@ helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART
 
 ## Requirements
 
-Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.32.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
diff --git a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
index f738eee5..5d1f2a91 100644
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -48,6 +48,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.clearml_serving_triton.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - env:
             - name: CLEARML_API_ACCESS_KEY
@@ -82,10 +86,6 @@ spec:
             - name: additional-config
               mountPath: /opt/clearml/config
           {{- end }}
-          {{- with .Values.clearml_serving_triton.tolerations }}
-          tolerations:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
           resources:
             {{- toYaml .Values.clearml_serving_triton.resources | nindent 12 }}
       restartPolicy: Always