From ef438e30e11e1736909d8f78df0834fad5628777 Mon Sep 17 00:00:00 2001
From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Date: Thu, 17 Nov 2022 17:59:39 -0500
Subject: [PATCH] feat(Webtop): Fix Port/Minor Cleanup (#4525)

---
 charts/incubator/webtop/Chart.yaml     |  2 +-
 charts/incubator/webtop/questions.yaml | 56 ++++++++++++--------------
 charts/incubator/webtop/values.yaml    | 39 +++++++++---------
 3 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/charts/incubator/webtop/Chart.yaml b/charts/incubator/webtop/Chart.yaml
index 8d24c7bea71..04459e6caea 100644
--- a/charts/incubator/webtop/Chart.yaml
+++ b/charts/incubator/webtop/Chart.yaml
@@ -27,4 +27,4 @@ sources:
   - https://github.com/orgs/linuxserver/packages/container/package/webtop
   - https://github.com/linuxserver/docker-webtop#readme
 type: application
-version: 2.0.1
+version: 3.0.0
diff --git a/charts/incubator/webtop/questions.yaml b/charts/incubator/webtop/questions.yaml
index 89ab1f970f2..13ef3154c75 100644
--- a/charts/incubator/webtop/questions.yaml
+++ b/charts/incubator/webtop/questions.yaml
@@ -9,35 +9,29 @@ questions:
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
   - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
+    group: App Configuration
+    label: Image Environment
     schema:
       additional_attrs: true
       type: dict
       attrs:
         - variable: SUBFOLDER
-          label: "SUBFOLDER"
-          description: "Specify a subfolder to use with reverse proxies, IE `subfolder`"
+          label: SUBFOLDER
+          description: Specify a subfolder to use with reverse proxies, IE `subfolder`
           schema:
             type: string
             default: ""
         - variable: KEYBOARD
-          label: "KEYBOARD"
-          description: "See the keyboard layouts section for more information and options."
-          schema:
-            type: string
-            default: ""
-        - variable: UMASK
-          label: "UMASK"
-          description: "Container Variable UMASK"
+          label: KEYBOARD
+          description: See the keyboard layouts section for more information and options.
           schema:
             type: string
             default: ""
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -45,17 +39,17 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
-                              default: 3000
+                              default: 33000
                               required: true
 # Include{serviceExpertRoot}
             default: false
@@ -63,8 +57,8 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: config
-          label: "config Storage"
-          description: "abc users home directory"
+          label: config Storage
+          description: abc users home directory
           schema:
             additional_attrs: true
             type: dict
@@ -73,7 +67,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -85,41 +79,41 @@ questions:
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568
diff --git a/charts/incubator/webtop/values.yaml b/charts/incubator/webtop/values.yaml
index 76e21b570cd..10fc6e60553 100644
--- a/charts/incubator/webtop/values.yaml
+++ b/charts/incubator/webtop/values.yaml
@@ -1,29 +1,32 @@
-env:
-  KEYBOARD: ""
-  SUBFOLDER: ""
-  UMASK: ""
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/webtop
   tag: latest@sha256:cafa6b241a660b291df8e901d37e9b1a0ff0d9db2224a16ee886365d54b5fd73
+
+env:
+  KEYBOARD: ""
+  SUBFOLDER: ""
+  CUSTOM_PORT: "{{ .Values.service.main.ports.main.port }}"
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+service:
+  main:
+    ports:
+      main:
+        port: 33000
+        protocol: HTTP
+
 persistence:
   config:
     enabled: true
     mountPath: /config
 
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    ports:
-      main:
-        port: 3000
-        protocol: TCP
-        targetPort: 3000
-
 portal:
   enabled: true