From f908a9f312b6949eeca106cff697fb63e2b63c7c Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sat, 19 Mar 2022 12:08:57 +0200
Subject: [PATCH] fix(templates): make security questions overridable in values
 (#2211)

* fix(templates): make security questions overridable in values

* fix(uptime-kuma): set PUID: 0

* change naming
---
 charts/stable/uptime-kuma/Chart.yaml  |  2 +-
 charts/stable/uptime-kuma/values.yaml |  3 +++
 templates/questions/security.yaml     | 30 +++++++++++++++++----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/charts/stable/uptime-kuma/Chart.yaml b/charts/stable/uptime-kuma/Chart.yaml
index b76ebb4cd77..1321e71c6ca 100644
--- a/charts/stable/uptime-kuma/Chart.yaml
+++ b/charts/stable/uptime-kuma/Chart.yaml
@@ -20,7 +20,7 @@ name: uptime-kuma
 sources:
 - https://github.com/louislam/uptime-kuma
 type: application
-version: 2.0.4
+version: 2.0.5
 annotations:
   truecharts.org/catagories: |
     - monitoring
diff --git a/charts/stable/uptime-kuma/values.yaml b/charts/stable/uptime-kuma/values.yaml
index 087f8348670..b66311f45c3 100644
--- a/charts/stable/uptime-kuma/values.yaml
+++ b/charts/stable/uptime-kuma/values.yaml
@@ -10,6 +10,9 @@ podSecurityContext:
   runAsUser: 0
   runAsGroup: 0
 
+security:
+  PUID: 0
+
 service:
   main:
     ports:
diff --git a/templates/questions/security.yaml b/templates/questions/security.yaml
index 143eca3ddba..cff30a8cf00 100644
--- a/templates/questions/security.yaml
+++ b/templates/questions/security.yaml
@@ -5,15 +5,23 @@
       type: dict
       additional_attrs: true
       attrs:
-        - variable: PUID
-          label: "Process User ID - PUID"
-          description: "When supported by the container, this sets the User ID running the Application Process. Not supported by all Apps"
+        - variable: editsecurity
+          label: "Change PUID / UMASK values"
+          description: "By enabling this you override default set values."
           schema:
-            type: int
-            default: 568
-        - variable: UMASK
-          label: "UMASK"
-          description: "When supported by the container, this sets the UMASK for tha App. Not supported by all Apps"
-          schema:
-            type: string
-            default: "002"
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: PUID
+                label: "Process User ID - PUID"
+                description: "When supported by the container, this sets the User ID running the Application Process. Not supported by all Apps"
+                schema:
+                  type: int
+                  default: 568
+              - variable: UMASK
+                label: "UMASK"
+                description: "When supported by the container, this sets the UMASK for tha App. Not supported by all Apps"
+                schema:
+                  type: string
+                  default: "002"