Merge pull request #40 from hansaya/main

Ability to add extra env variables

charts/kube-plex/templates/_env_vars.tpl

@@ -0,0 +1,43 @@
+{{/*
+Environment variables used by containers.
+*/}}
+{{- define "env_vars" -}}
+  {{- $values := .Values.extraEnv -}}
+  {{- if hasKey . "ObjectValues" -}}
+    {{- with .ObjectValues.env -}}
+      {{- $values = . -}}
+    {{- end -}}
+  {{- end -}}
+
+  {{- with $values -}}
+    {{- $result := list -}}
+    {{- range $k, $v := . -}}
+      {{- $name := $k -}}
+      {{- $value := $v -}}
+      {{- if kindIs "int" $name -}}
+        {{- $name = required "environment variables as a list of maps require a name field" $value.name -}}
+      {{- end -}}
+
+      {{- if kindIs "map" $value -}}
+        {{- if hasKey $value "value" -}}
+          {{- $envValue := $value.value | toString -}}
+          {{- $result = append $result (dict "name" $name "value" (tpl $envValue $)) -}}
+        {{- else if hasKey $value "valueFrom" -}}
+          {{- $result = append $result (dict "name" $name "valueFrom" $value.valueFrom) -}}
+        {{- else -}}
+          {{- $result = append $result (dict "name" $name "valueFrom" $value) -}}
+        {{- end -}}
+      {{- end -}}
+      {{- if not (kindIs "map" $value) -}}
+        {{- if kindIs "string" $value -}}
+          {{- $result = append $result (dict "name" $name "value" (tpl $value $)) -}}
+        {{- else if or (kindIs "float64" $value) (kindIs "bool" $value) -}}
+          {{- $result = append $result (dict "name" $name "value" ($value | toString)) -}}
+        {{- else -}}
+          {{- $result = append $result (dict "name" $name "value" $value) -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+    {{- toYaml (dict "env" $result) | nindent 0 -}}
+  {{- end -}}
+{{- end -}}

charts/kube-plex/templates/deployment.yaml

@@ -134,6 +134,10 @@ spec:
         - name: "NO_PROXY"
           value: "{{.Values.proxy.noproxy}}"
   {{- end }}
+{{- end }}
+        # Extra ENV variables
+{{- with .Values.extraEnv }}
+    {{- get (fromYaml (include "env_vars" $)) "env" | toYaml | nindent 8  -}}
 {{- end }}
         volumeMounts:
         - name: data

charts/kube-plex/values.yaml

@@ -44,6 +44,13 @@ claimToken: ""
 # Set the timezone of the plex server
 timezone: Europe/London
 
+# Set extra environment variables
+extraEnv: {}
+  # puid: 1002
+  # pgid: 1002
+  # NVIDIA_VISIBLE_DEVICES: all
+  # NVIDIA_DRIVER_CAPABILITIES: video,compute,utility
+
 service:
   type: ClusterIP
   port: 32400