Fix error on deallocation and provides configMap on the helm chart

chart/README.md

@@ -36,6 +36,8 @@ The smarter-device-manager starts by reading a YAML configuration file. This con
   nummaxdevices: 10
 ```
 
+If the config value is provided a configMap is generated and smarter-device-manager will use it. The values.yaml file contains two examples, the first is replicated the config that exists on the container and the second enables nitro-enclaves (AWS nitro).
+
 Devices in subdirectories have the slash replaced with underscore in the
 resource name, due to kubernetes naming restrictions: e.g. `/dev/net/tun`
 becomes `smarter-devices/net_tun`.

chart/templates/common.yaml

@@ -40,7 +40,7 @@ spec:
             drop: ["ALL"]
         resources:
           limits:
-            cpu: 100m
+            cpu: 200m
             memory: 15Mi
           requests:
             cpu: 10m
@@ -52,6 +52,10 @@ spec:
             mountPath: /dev
           - name: sys-dir
             mountPath: /sys
+          {{- if .Values.config }}
+          - name: config
+            mountPath: /root/config
+          {{- end }}
       volumes:
         - name: device-plugin
           hostPath:
@@ -62,5 +66,9 @@ spec:
         - name: sys-dir
           hostPath:
             path: /sys
+        {{- if .Values.config }}
+        - name: config
+          configMap:
+            name: {{ .Values.application.appName }}
+        {{- end }}
       terminationGracePeriodSeconds: 30
-

chart/templates/configmap.yaml

@@ -0,0 +1,10 @@
+{{- if .Values.config }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.application.appName }}
+  namespace: {{ .Values.application.namespace }}
+data:
+  conf.yaml: |
+  {{- toYaml .Values.config | nindent 4 }}
+{{- end }}

chart/values.yaml

@@ -6,7 +6,53 @@ application:
 
 image:
   repository: registry.gitlab.com/smarter-project/smarter-device-manager
-  #repository: registry.gitlab.com/smarter-project/smarter-device-manager
   # @default -- chart.appVersion
   tag: ""
   pullPolicy: IfNotPresent
+
+# If a specific configurations is used it can be provided by uncommenting this lines
+# config:
+#   - devicematch: ^snd$
+#     nummaxdevices: 20
+#   - devicematch: ^gpiomem$
+#     nummaxdevices: 40
+#   - devicematch: ^gpiochip[0-9]*$
+#     nummaxdevices: 20
+#   - devicematch: ^hci[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^i2c-[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^rtc0$
+#     nummaxdevices: 20
+#   - devicematch: ^video[0-9]*$
+#     nummaxdevices: 20
+#   - devicematch: ^vchiq$
+#     nummaxdevices: 20
+#   - devicematch: ^vcsm.*$
+#     nummaxdevices: 20
+#   - devicematch: ^ttyUSB[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyACM[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyTHS[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyS[0-9]*$
+#     nummaxdevices: 1
+#
+
+# This example of configmap allows nitro enclaves to be allocated in a pod
+# config:
+#   - devicematch: ^nitro_enclaves$
+#     nummaxdevices: 1
+#   - devicematch: ^vsock$
+#     nummaxdevices: 1
+#   - devicematch: ^rtc0$
+#     nummaxdevices: 20
+#   - devicematch: ^ttyUSB[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyACM[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyTHS[0-9]*$
+#     nummaxdevices: 1
+#   - devicematch: ^ttyS[0-9]*$
+#     nummaxdevices: 1

smarter-device-manager-ds-with-configmap-rpi-k3s.yaml

@@ -69,7 +69,4 @@ spec:
         - name: config
           configMap:
              name: smarter-device-manager-rpi
-        - name: config
-          hostPath:
-            path: /var/lib/rancher/k3s/agent/kubelet/device-plugins
       terminationGracePeriodSeconds: 30