nvidia-k8s-device-plugin: adjust device-list-strategy for new type

The 'default' handlebars helper doesn't work with arrays. Adjust how the
device-list-strategy property is set depending on the type used in the
API settings. Default to 'volume-mounts' when the setting is missing.

Signed-off-by: Jingwei Wang <[email protected]>
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>

Author: sky1122

packages/nvidia-k8s-device-plugin/nvidia-k8s-device-plugin-conf

@@ -1,6 +1,6 @@
 [required-extensions]
 kubelet-device-plugins = "v1"
-std = { version = "v1", helpers = ["default"] }
+std = { version = "v1", helpers = ["default", "join_array", "is_array"] }
 
 +++
 version: v1
@@ -18,7 +18,15 @@ flags:
   nvidiaDriverRoot: "/"
   plugin:
     passDeviceSpecs: {{default true settings.kubelet-device-plugins.nvidia.pass-device-specs}}
-    deviceListStrategy: {{default "volume-mounts" settings.kubelet-device-plugins.nvidia.device-list-strategy}}
+    {{#if settings.kubelet-device-plugins.nvidia.device-list-strategy}}
+    {{#if (is_array settings.kubelet-device-plugins.nvidia.device-list-strategy)}}
+    deviceListStrategy: [{{join_array "," settings.kubelet-device-plugins.nvidia.device-list-strategy }}]
+    {{else}}
+    deviceListStrategy: {{settings.kubelet-device-plugins.nvidia.device-list-strategy}}
+    {{/if}}
+    {{else}}
+    deviceListStrategy: "volume-mounts"
+    {{/if}}
     deviceIDStrategy: {{default "index" settings.kubelet-device-plugins.nvidia.device-id-strategy}}
     containerDriverRoot: "/"
 {{#if settings.kubelet-device-plugins.nvidia.device-sharing-strategy}}