added conditional extraPythonPackages to all the relevant deployments

charts/clearml-serving/README.md

@@ -23,23 +23,24 @@ 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 | `[]` |  |
+| 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 | `{}` |  |

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

@@ -50,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/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,6 +60,10 @@ 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
@@ -69,4 +72,7 @@ clearml_serving_triton:
   tolerations: []
   affinity: {}
   resources: {}
+  # -- Extra Python Packages to be installed in running pods
   extraPythonPackages: []
+  #  - numpy==1.22.4
+  #  - pandas==1.4.2