From 8aa7535422f2fc3ee0dcc07a269c0af16b9f24d3 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 12 May 2023 15:13:17 +0300
Subject: [PATCH] Fix gpu assignment on multi gpu systems. (#1198)

---
 library/ix-dev/community/jellyfin/Chart.yaml              | 2 +-
 library/ix-dev/community/jellyfin/ci/basic-values.yaml    | 8 +++++---
 library/ix-dev/community/jellyfin/templates/_jellyfin.tpl | 7 +++----
 library/ix-dev/community/tdarr/Chart.yaml                 | 2 +-
 library/ix-dev/community/tdarr/ci/basic-values.yaml       | 4 ++++
 library/ix-dev/community/tdarr/templates/_tdarr.tpl       | 7 +++----
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/library/ix-dev/community/jellyfin/Chart.yaml b/library/ix-dev/community/jellyfin/Chart.yaml
index b6f8df6de6..ae3e063404 100644
--- a/library/ix-dev/community/jellyfin/Chart.yaml
+++ b/library/ix-dev/community/jellyfin/Chart.yaml
@@ -3,7 +3,7 @@ description: Jellyfin is a Free Software Media System that puts you in control o
 annotations:
   title: Jellyfin
 type: application
-version: 1.0.1
+version: 1.0.2
 apiVersion: v2
 appVersion: '10.8.10'
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/jellyfin/ci/basic-values.yaml b/library/ix-dev/community/jellyfin/ci/basic-values.yaml
index 9a85f98574..460f2bfda1 100644
--- a/library/ix-dev/community/jellyfin/ci/basic-values.yaml
+++ b/library/ix-dev/community/jellyfin/ci/basic-values.yaml
@@ -17,6 +17,8 @@ jellyfinStorage:
     medium: Memory
     size: 1Gi
 
-# TODO: Test on a GPU-enabled system
-# jellyfinGPU:
-#   nvidia.com/gpu: 1
+# Make sure installation don't fail when 0 GPU are assigned
+jellyfinGPU:
+  nvidia.com/gpu: 0
+  intel.com/gpu: 0
+# TODO: Test assigning GPUs on a GPU-enabled system
diff --git a/library/ix-dev/community/jellyfin/templates/_jellyfin.tpl b/library/ix-dev/community/jellyfin/templates/_jellyfin.tpl
index 8f5be7516f..2778846b64 100644
--- a/library/ix-dev/community/jellyfin/templates/_jellyfin.tpl
+++ b/library/ix-dev/community/jellyfin/templates/_jellyfin.tpl
@@ -125,14 +125,13 @@ persistence:
           mountPath: /mnt/directories{{ $storage.mountPath }}
   {{- end }}
 {{ with .Values.jellyfinGPU }}
-  {{ if gt (. | len) 1 }}
-    {{- fail "Jellyfin - Max [1] GPUs allowed" -}}
-  {{ end }}
 scaleGPU:
+  {{ range $key, $value := . }}
   - gpu:
-      {{ . | keys | first }}: {{ . | values | first }}
+      {{ $key }}: {{ $value }}
     targetSelector:
       jellyfin:
         - jellyfin
+  {{ end }}
 {{ end }}
 {{- end -}}
diff --git a/library/ix-dev/community/tdarr/Chart.yaml b/library/ix-dev/community/tdarr/Chart.yaml
index 18e91ed32b..3f6f8fd180 100644
--- a/library/ix-dev/community/tdarr/Chart.yaml
+++ b/library/ix-dev/community/tdarr/Chart.yaml
@@ -3,7 +3,7 @@ description: Tdarr is a Distributed Transcoding System
 annotations:
   title: Tdarr
 type: application
-version: 1.0.3
+version: 1.0.4
 apiVersion: v2
 appVersion: '2.00.20.1'
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/tdarr/ci/basic-values.yaml b/library/ix-dev/community/tdarr/ci/basic-values.yaml
index 568fb90809..c3756cd60b 100644
--- a/library/ix-dev/community/tdarr/ci/basic-values.yaml
+++ b/library/ix-dev/community/tdarr/ci/basic-values.yaml
@@ -17,3 +17,7 @@ tdarrStorage:
     type: emptyDir
     medium: Memory
     size: 1Gi
+# Make sure installation don't fail when 0 GPU are assigned
+tdarrGPU:
+  nvidia.com/gpu: 0
+  intel.com/gpu: 0
diff --git a/library/ix-dev/community/tdarr/templates/_tdarr.tpl b/library/ix-dev/community/tdarr/templates/_tdarr.tpl
index 1e8b5dfe0c..3bee71ccb0 100644
--- a/library/ix-dev/community/tdarr/templates/_tdarr.tpl
+++ b/library/ix-dev/community/tdarr/templates/_tdarr.tpl
@@ -131,14 +131,13 @@ persistence:
   {{- end }}
 
 {{ with .Values.tdarrGPU }}
-  {{ if gt (. | len) 1 }}
-    {{- fail "Tdarr - Max [1] GPUs allowed" -}}
-  {{ end }}
 scaleGPU:
+  {{ range $key, $value := . }}
   - gpu:
-      {{ . | keys | first }}: {{ . | values | first }}
+      {{ $key }}: {{ $value }}
     targetSelector:
       tdarr:
         - tdarr
+  {{ end }}
 {{ end }}
 {{- end -}}