From 1a5e4e7f2e04a8dde34091c0f2d5e879407a6035 Mon Sep 17 00:00:00 2001
From: Xstar97 <Xstar97@users.noreply.github.com>
Date: Mon, 5 Dec 2022 17:51:20 -0500
Subject: [PATCH] fix(ps3netsrv) code cleanup, perms, persistence. (#4666)

* fix(ps3netsrv) code cleanup, perms, persistence.

* add probes

* ronfs false

* Update charts/incubator/ps3netsrv/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* Apply suggestions from code review

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* Update charts/incubator/ps3netsrv/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* Update charts/incubator/ps3netsrv/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

* Update charts/incubator/ps3netsrv/values.yaml

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/incubator/ps3netsrv/Chart.yaml     | 15 ++++++-----
 charts/incubator/ps3netsrv/questions.yaml | 31 +++++------------------
 charts/incubator/ps3netsrv/values.yaml    | 17 +++++++------
 3 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/charts/incubator/ps3netsrv/Chart.yaml b/charts/incubator/ps3netsrv/Chart.yaml
index 9cb89043195..fd8de9844cf 100644
--- a/charts/incubator/ps3netsrv/Chart.yaml
+++ b/charts/incubator/ps3netsrv/Chart.yaml
@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Network-Other
 apiVersion: v2
-appVersion: "latest"
+appVersion: "v1.6.0"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 11.0.4
 deprecated: false
-description: "PS3netsrv is a program that allows Multiman or Webman to play game backups that are stored on your TrueNAS server. [span style='color: #E80000;']THIS IS IN BETA AND HAS REPORTED ISSUES with TrueNAS 6.8.0 and higher.[/span][br][br]\n"
+description: Allows Multiman or Webman to play game backups.
 home: https://truecharts.org/docs/charts/incubator/ps3netsrv
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/ps3netsrv.png
 keywords:
@@ -26,4 +22,9 @@ sources:
   - https://github.com/aldostools/webMAN-MOD/tree/master/_Projects_/ps3netsrv
   - https://hub.docker.com/r/shawly/ps3netsrv
 type: application
-version: 2.0.4
+version: 2.0.2
+annotations:
+  truecharts.org/catagories: |
+    - Network-Other
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/ps3netsrv/questions.yaml b/charts/incubator/ps3netsrv/questions.yaml
index 76a0c00ef4a..dfb27f45cb1 100644
--- a/charts/incubator/ps3netsrv/questions.yaml
+++ b/charts/incubator/ps3netsrv/questions.yaml
@@ -8,25 +8,6 @@ questions:
 # Include{replicas}
 # Include{replica1}
 # Include{controllerExpertExtraArgs}
-  - variable: env
-    group: "App Configuration"
-    label: "Image Environment"
-    schema:
-      additional_attrs: true
-      type: dict
-      attrs:
-        - variable: USER_ID
-          label: "USER_ID"
-          description: "UID for permissions.  Do not change unless you know what youre doing."
-          schema:
-            type: string
-            default: ""
-        - variable: GROUP_ID
-          label: "GROUP_ID"
-          description: "GID for permissions.  Do not change unless you know what youre doing."
-          schema:
-            type: string
-            default: ""
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
@@ -56,9 +37,9 @@ questions:
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: gamesfolder
-          label: "gamesfolder Storage"
-          description: "Container Path games"
+        - variable: games
+          label: App Games Storage
+          description: Stores the Application Games.
           schema:
             additional_attrs: true
             type: dict
@@ -97,20 +78,20 @@ questions:
                 label: "runAsNonRoot"
                 schema:
                   type: boolean
-                  default: false
+                  default: true
 # Include{podSecurityContextRoot}
         - variable: runAsUser
           label: "runAsUser"
           description: "The UserID of the user running the application"
           schema:
             type: int
-            default: 0
+            default: 568
         - variable: runAsGroup
           label: "runAsGroup"
           description: The groupID this App of the user running the application"
           schema:
             type: int
-            default: 0
+            default: 568
         - variable: fsGroup
           label: "fsGroup"
           description: "The group that should own ALL storage."
diff --git a/charts/incubator/ps3netsrv/values.yaml b/charts/incubator/ps3netsrv/values.yaml
index 7aa3752251c..dccf5cfaf9a 100644
--- a/charts/incubator/ps3netsrv/values.yaml
+++ b/charts/incubator/ps3netsrv/values.yaml
@@ -1,17 +1,12 @@
-env:
-  GROUP_ID: ""
-  USER_ID: ""
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/ps3netsrv
   tag: latest@sha256:200e6662a6e5e581ac0018b6e3dda69889e904585574315016f875bbd4476d45
-persistence:
-  gamesfolder:
-    enabled: true
-    mountPath: /games
+
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
@@ -20,8 +15,14 @@ service:
     ports:
       main:
         port: 38008
-        protocol: TCP
+        protocol: HTTP
         targetPort: 38008
 
+persistence:
+  games:
+    enabled: true
+    mountPath: /games
+  varrun:
+    enabled: true
 portal:
   enabled: true