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
2022-08-27 02:12:33 +03:00
parent 2f9afd61b2
commit 9056d3c8f7
921 changed files with 3536 additions and 3420 deletions
@@ -26,4 +26,4 @@ sources:
  - https://www.steampowered.com/
  - https://hub.docker.com/r/ich777/steamcmd/
 type: application
-version: 0.0.17
+version: 0.0.19
@@ -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,53 +40,41 @@ questions:
      type: dict
      attrs:
        - variable: GAME_ID
-          label: 'GAME_ID'
-          description: "The GAMEID that the container download at startup.(httpsdeveloper.valvesoftware.comwikiDedicatedServersList)"
+          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: "220070"
        - variable: MAP
-          label: 'MAP'
+          label: "MAP"
          description: "Map name (eg aocffa-arena3p, aocffa-hillsidep, aocffa-battlegroundsv3p)"
          schema:
            type: string
            default: "aocffa-moor_p"
        - variable: ADMIN_PWD
-          label: 'ADMIN_PWD'
+          label: "ADMIN_PWD"
          description: "Server Admin Password (cant be empty)"
          schema:
            type: string
            default: "adminDocker"
        - variable: GAME_PARAMS
-          label: 'GAME_PARAMS'
+          label: "GAME_PARAMS"
          description: "Enter your game parameters seperated with ? and start with a ? (dont put spaces in between eg ?port=7000?queryport=7010)"
          schema:
            type: string
            default: "?port=7000?queryport=7010"
        - variable: GAME_PARAMS_EXTRA
-          label: 'GAME_PARAMS_EXTRA'
+          label: "GAME_PARAMS_EXTRA"
          description: "Type in your Extra Game Parameters seperated with a space and - (eg -seekfreeloadingserver)"
          schema:
            type: string
            default: "-seekfreeloadingserver"
-        - 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
@@ -1,26 +1,28 @@
+image:
+  pullPolicy: IfNotPresent
+  repository: tccr.io/truecharts/chivalry-medievalwarfare
+  tag: latest@sha256:bc124a96ac58234893ef576a54ee651813cdf2fb64b653c6a3dd962352fdb485
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+secretEnv:
+  USERNAME: ""
+  PASSWRD: ""
+
 env:
  ADMIN_PWD: adminDocker
  GAME_ID: "220070"
  GAME_PARAMS: ?port=7000?queryport=7010
  GAME_PARAMS_EXTRA: -seekfreeloadingserver
  MAP: aocffa-moor_p
-  PASSWRD: ""
-  USERNAME: ""
-  VALIDATE: ""
-image:
-  pullPolicy: IfNotPresent
-  repository: tccr.io/truecharts/chivalry-medievalwarfare
-  tag: latest@sha256:bc124a96ac58234893ef576a54ee651813cdf2fb64b653c6a3dd962352fdb485
-persistence:
-  serverfiles:
-    enabled: true
-    mountPath: /serverdata/serverfiles
-  steamcmd:
-    enabled: true
-    mountPath: /serverdata/steamcmd
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
+  VALIDATE: true
+
 probes:
  liveness:
    enabled: false
@@ -28,10 +30,14 @@ probes:
    enabled: false
  startup:
    enabled: false
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
+
 service:
+  main:
+    ports:
+      main:
+        port: 7000
+        protocol: UDP
+        targetPort: 7000
  gamequeryport:
    enabled: true
    ports:
@@ -40,14 +46,6 @@ service:
        port: 7010
        protocol: UDP
        targetPort: 7010
-  main:
-    enabled: true
-    ports:
-      main:
-        enabled: true
-        port: 7000
-        protocol: UDP
-        targetPort: 7000
  steamqueryport:
    enabled: true
    ports:
@@ -57,5 +55,13 @@ service:
        protocol: UDP
        targetPort: 27015

+persistence:
+  serverfiles:
+    enabled: true
+    mountPath: /serverdata/serverfiles
+  steamcmd:
+    enabled: true
+    mountPath: /serverdata/steamcmd
+
 portal:
  enabled: true