fix(incubator): some cleanup (#3586)

* fix(arksurvival): cleanup

* cleanup

* update questions

* chore(incubator): some cleanup

* remove enabled true from main services

* bump all incubator

* lint

* empty lines

* emtpy line

charts/incubator/americasarmy-pg/Chart.yaml

@@ -26,4 +26,4 @@ sources:
   - https://www.americasarmy.com/
   - https://hub.docker.com/r/ich777/steamcmd/
 type: application
-version: 0.0.17
+version: 0.0.19

charts/incubator/americasarmy-pg/questions.yaml

@@ -12,6 +12,26 @@ questions:
 # Include{recreate}
 # Include{controllerExpert}
 # Include{controllerExpertExtraArgs}
+  - variable: secretEnv
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: USERNAME
+          label: "USERNAME"
+          description: "Your Steam username goes here if you want to install a game that needs a valid account, otherwise leave it blank (ATTENTION You have to disable Steam Guard)."
+          schema:
+            type: string
+            default: ""
+        - variable: PASSWRD
+          label: "PASSWRD"
+          description: "Your Steam password goes here if you want to install a game that needs a valid account, otherwise leave it blank (ATTENTION You have to disable Steam Guard)."
+          schema:
+            type: string
+            private: true
+            default: ""
   - variable: env
     group: "Container Configuration"
     label: "Image Environment"
@@ -20,41 +40,29 @@ questions:
       type: dict
       attrs:
         - variable: GAME_ID
-          label: 'GAME_ID'
-          description: "The GAMEID that the container download at startup.If you want to install a static or beta version of the game change the value to 203300 -beta YOURBRANCH (without quotes, replace YOURBRANCH with the branch or version you want to install)."
+          label: "GAME_ID"
+          description: "The GAME_ID that the container download at startup.(https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)"
           schema:
             type: string
             default: "203300"
         - variable: SRV_NAME
-          label: 'SRV_NAME'
+          label: "SRV_NAME"
           description: "Container Variable SRVNAME"
           schema:
             type: string
             default: "Army Docker"
         - variable: GAME_PARAMS
-          label: 'GAME_PARAMS'
+          label: "GAME_PARAMS"
           description: "Enter your start up commands for the server."
           schema:
             type: string
             default: "-port=7778 -SAP=8778 -SQP=27015 -aauregion=1 -log=Server.log"
-        - variable: USERNAME
-          label: 'USERNAME'
-          description: "Your Steam username goes here if you want to install a game that needs a valid account, otherwise leave it blank (ATTENTION You have to disable Steam Guard)."
-          schema:
-            type: string
-            default: ""
         - variable: VALIDATE
-          label: 'VALIDATE'
+          label: "VALIDATE"
           description: "Set the Variable to true if you want to validate the installation otherwise leave it blank."
           schema:
-            type: string
-            default: ""
-        - variable: PASSWRD
-          label: 'PASSWRD'
-          description: "Your Steam password goes here if you want to install a game that needs a valid account, otherwise leave it blank (ATTENTION You have to disable Steam Guard)."
-          schema:
-            type: string
-            default: ""
+            type: boolean
+            default: true
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main

charts/incubator/americasarmy-pg/values.yaml

@@ -1,24 +1,26 @@
-env:
-  GAME_ID: "203300"
-  GAME_PARAMS: -port=7778 -SAP=8778 -SQP=27015 -aauregion=1 -log=Server.log
-  PASSWRD: ""
-  SRV_NAME: Army Docker
-  USERNAME: ""
-  VALIDATE: ""
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/americasarmy-pg
   tag: latest@sha256:c8b0a973e2303406ae3daeb2ff63f9ef65d7f5ef7af92da4e1bc6bed4ecac920
-persistence:
-  serverfiles:
-    enabled: true
-    mountPath: /serverdata/serverfiles
-  steamcmd:
-    enabled: true
-    mountPath: /serverdata/steamcmd
+
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+secretEnv:
+  USERNAME: ""
+  PASSWRD: ""
+
+env:
+  GAME_ID: "203300"
+  GAME_PARAMS: -port=7778 -SAP=8778 -SQP=27015 -aauregion=1 -log=Server.log
+  SRV_NAME: Army Docker
+  VALIDATE: false
+
 probes:
   liveness:
     enabled: false
@@ -26,15 +28,11 @@ probes:
     enabled: false
   startup:
     enabled: false
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+
 service:
   main:
-    enabled: true
     ports:
       main:
-        enabled: true
         port: 8778
         protocol: UDP
         targetPort: 8778
@@ -47,5 +45,13 @@ service:
         protocol: UDP
         targetPort: 27015
 
+persistence:
+  serverfiles:
+    enabled: true
+    mountPath: /serverdata/serverfiles
+  steamcmd:
+    enabled: true
+    mountPath: /serverdata/steamcmd
+
 portal:
   enabled: true