From d8c665b33076de4bfdd96295445e97398a06c4e2 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Feb 2023 12:01:40 +0100
Subject: [PATCH] move resources section

---
 .../templates/lib/container/_resources.tpl     |  2 +-
 library/common/values.yaml                     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/library/common/templates/lib/container/_resources.tpl b/library/common/templates/lib/container/_resources.tpl
index aa507af0..aa0fdc1d 100644
--- a/library/common/templates/lib/container/_resources.tpl
+++ b/library/common/templates/lib/container/_resources.tpl
@@ -8,7 +8,7 @@ objectData: The object data to be used to render the container.
   {{- $rootCtx := .rootCtx -}}
   {{- $objectData := .objectData -}}
 
-  {{- $resources := $rootCtx.Values.containerOptions.resources -}}
+  {{- $resources := $rootCtx.Values.resources -}}
 
   {{- if $objectData.resources -}}
     {{- $resources = mustMergeOverwrite $resources $objectData.resources -}}
diff --git a/library/common/values.yaml b/library/common/values.yaml
index b3cba453..089cb163 100644
--- a/library/common/values.yaml
+++ b/library/common/values.yaml
@@ -87,17 +87,17 @@ securityContext:
     supplementalGroups: []
     sysctls: []
 
+# -- Resources
+# Can be overruled per container
+resources:
+  limits:
+    cpu: 4000m
+    memory: 8Gi
+  requests:
+    cpu: 10m
+    memory: 50Mi
 
 containerOptions:
-  # -- Resources
-  # Can be overruled per container
-  resources:
-    limits:
-      cpu: 4000m
-      memory: 8Gi
-    requests:
-      cpu: 10m
-      memory: 50Mi
   # -- PUID for all containers
   # Can be overruled per container
   PUID: 568