From 3ede345afc5b20f07aed227398dbec05d605ef4e Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Feb 2023 12:03:13 +0100
Subject: [PATCH] move PUID and UMASK to securityContext.container

---
 library/common/templates/lib/container/_fixedEnv.tpl |  4 ++--
 library/common/values.yaml                           | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/common/templates/lib/container/_fixedEnv.tpl b/library/common/templates/lib/container/_fixedEnv.tpl
index 39e95cc9..6ac17241 100644
--- a/library/common/templates/lib/container/_fixedEnv.tpl
+++ b/library/common/templates/lib/container/_fixedEnv.tpl
@@ -34,8 +34,8 @@ objectData: The object data to be used to render the container.
 
   {{- $fixed := list -}}
   {{- $TZ := $objectData.fixedEnv.TZ | default $rootCtx.Values.TZ -}}
-  {{- $UMASK := $objectData.fixedEnv.UMASK | default $rootCtx.Values.containerOptions.UMASK -}}
-  {{- $PUID := $objectData.fixedEnv.PUID | default $rootCtx.Values.containerOptions.PUID -}}
+  {{- $UMASK := $objectData.fixedEnv.UMASK | default $rootCtx.Values.securityContext.container.UMASK -}}
+  {{- $PUID := $objectData.fixedEnv.PUID | default $rootCtx.Values.securityContext.container.PUID -}}
   {{/* calculatedFSGroup is passed from the pod */}}
   {{- $PGID := $objectData.calculatedFSGroup -}}
 
diff --git a/library/common/values.yaml b/library/common/values.yaml
index 089cb163..497c8d3f 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -79,6 +79,12 @@ securityContext:
       add: []
       drop:
         - ALL
+    # -- PUID for all containers
+    # Can be overruled per container
+    PUID: 568
+    # -- UMASK for all containers
+    # Can be overruled per container
+    UMASK: "002"
   # -- Pod security context for all pods
   # Can be overruled per pod
   pod:
@@ -98,12 +104,6 @@ resources:
     memory: 50Mi
 
 containerOptions:
-  # -- PUID for all containers
-  # Can be overruled per container
-  PUID: 568
-  # -- UMASK for all containers
-  # Can be overruled per container
-  UMASK: "002"
   NVIDIA_CAPS:
     - all