From 29ef0fc2c585811b2b3f7fa7b305fe8fa8948366 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Tue, 27 Jun 2023 13:01:50 -0400 Subject: [PATCH] migrate(unturned) migrate unturned to new commons (#9960) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** - Add steam port - housekeeping - migrate to new commons ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [X] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- 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/unturned/Chart.yaml | 16 +- charts/incubator/unturned/questions.yaml | 197 +++++++++--------- charts/incubator/unturned/templates/NOTES.txt | 1 + .../incubator/unturned/templates/common.yaml | 3 +- charts/incubator/unturned/values.yaml | 77 ++++--- 5 files changed, 155 insertions(+), 139 deletions(-) create mode 100644 charts/incubator/unturned/templates/NOTES.txt diff --git a/charts/incubator/unturned/Chart.yaml b/charts/incubator/unturned/Chart.yaml index 448f0197802..718d7ca7b9d 100644 --- a/charts/incubator/unturned/Chart.yaml +++ b/charts/incubator/unturned/Chart.yaml @@ -1,15 +1,11 @@ -annotations: - truecharts.org/SCALE-support: "true" - truecharts.org/catagories: | - - GameServers apiVersion: v2 appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 11.1.2 + version: 12.14.2 deprecated: false -description: "This Chart will download and install SteamCMD. It will also install Unturned and run it (if you want to install Rocket Mod set the Variable 'Install Rocket Mod' to 'true' without quotes)." +description: Unturned SteamCMD home: https://truecharts.org/charts/incubator/unturned icon: https://truecharts.org/img/hotlink-ok/chart-icons/unturned.png keywords: @@ -23,6 +19,10 @@ maintainers: name: unturned sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/unturned - - https://www.steampowered.com/ + - https://github.com/ich777/docker-steamcmd-server/tree/unturned type: application -version: 2.0.9 +version: 3.0.0 +annotations: + truecharts.org/catagories: | + - GameServers + truecharts.org/SCALE-support: "true" diff --git a/charts/incubator/unturned/questions.yaml b/charts/incubator/unturned/questions.yaml index d267a3e6d05..451a3a34f47 100644 --- a/charts/incubator/unturned/questions.yaml +++ b/charts/incubator/unturned/questions.yaml @@ -1,7 +1,5 @@ # Include{groups} -portals: - open: -# Include{portalLink} +portals: {} questions: # Include{global} # Include{workload} @@ -10,83 +8,80 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + + - variable: env + label: Image Environment + schema: + additional_attrs: true + type: dict + attrs: + - variable: GAME_ID + label: "Game ID" + description: "The Game ID that the container downloads at startup." + schema: + type: string + default: "1110390" + - variable: USERNAME + label: "Usename" + 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: "Password" + 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" + description: "Validates the game data." + schema: + type: boolean + default: true + - variable: GAME_PARAMS + label: "Game Params" + description: "Enter your start up commands for the server." + schema: + type: string + default: "-pei -normal -nosync -pve" + - variable: ROCKET_MOD + label: "Rocket Mod" + description: "install Rocket Mod" + schema: + type: string + default: "false" + enum: + - value: "true" + description: "True" + - value: "false" + description: "False" + - variable: ROCKET_FORCE_UPDATE + label: "Rocket Force Update" + description: "force a update of Rocket Mod." + schema: + type: string + default: "false" + enum: + - value: "true" + description: "True" + - value: "false" + description: "False" + - variable: ROCKET_URL + label: "Rocket URL" + description: "Only change if you are know what you are doing" + schema: + type: string + default: "https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip" + # Include{containerBasic} # Include{containerAdvanced} - - - variable: secretEnv - group: "App 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: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: GAME_ID - 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: "1110390" - - variable: GAME_PARAMS - label: "GAME_PARAMS" - description: "Enter your start up commands for the server." - schema: - type: string - default: "-pei -normal -nosync -pve" - - variable: VALIDATE - label: "VALIDATE" - description: "Set the Variable to true if you want to validate the installation otherwise leave it blank." - schema: - type: boolean - default: true - - variable: ROCKET_MOD - label: "ROCKET_MOD" - description: "Set to true (without quotes) to install Rocket Mod otherwise leave blank" - schema: - type: string - default: "" - - variable: ROCKET_FORCE_UPDATE - label: "ROCKET_FORCE_UPDATE" - description: "If you want to force a update of Rocket Mod set to true (without quotes)ATTENTION All files in the Modules & Scripts folder will be overwritten backup the files bevor doing that!" - schema: - type: string - default: "" - - variable: ROCKET_URL - label: "ROCKET_URL" - description: "Only change if you are know what you are doing" - schema: - type: string - default: "https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip" - - variable: GAME_PORT - label: "GAME_PORT" - description: "If you change this setting dont forget to delete the gameport above and create 3 entries for TCP and 3 entries for UDP (GAMEPORT 2 TCP & GAMEPORT UDP 2)" - schema: - type: string - default: "27015" # Include{containerConfig} +# Include{podOptions} # 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 Minecraft Server runs on schema: additional_attrs: true type: dict @@ -94,53 +89,63 @@ 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: 27017 + default: 27015 + required: true + - variable: steam + label: Steam Service + description: The Steam service. + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} + - variable: steam + label: Steam Service Port Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: port + label: Port + description: This port exposes the container port on the service + schema: + type: int + default: 27016 required: true # Include{serviceExpertRoot} # Include{serviceExpert} # Include{serviceList} # Include{persistenceRoot} - variable: steamcmd - label: "steamcmd Storage" - description: "Container Path serverdatasteamcmd" + label: App SteamCMD Storage + description: Stores the Application SteamCMD. schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} - variable: serverfiles - label: "serverfiles Storage" - description: "Container Path serverdataserverfiles" + label: App ServerFiles Storage + description: Stores the Application ServerFiles. schema: additional_attrs: true type: dict attrs: # Include{persistenceBasic} # Include{persistenceList} -# Include{ingressRoot} - - variable: main - label: "Main Ingress" - schema: - additional_attrs: true - type: dict - attrs: -# Include{ingressDefault} -# Include{ingressTLS} -# Include{ingressTraefik} -# Include{ingressAdvanced} -# Include{ingressList} -# Include{securityContextRoot} +# Include{securityContextRoot} - variable: runAsUser label: "runAsUser" description: "The UserID of the user running the application" diff --git a/charts/incubator/unturned/templates/NOTES.txt b/charts/incubator/unturned/templates/NOTES.txt new file mode 100644 index 00000000000..efcb74cb772 --- /dev/null +++ b/charts/incubator/unturned/templates/NOTES.txt @@ -0,0 +1 @@ +{{- include "tc.v1.common.lib.chart.notes" $ -}} diff --git a/charts/incubator/unturned/templates/common.yaml b/charts/incubator/unturned/templates/common.yaml index cbf66c20818..b51394e00a4 100644 --- a/charts/incubator/unturned/templates/common.yaml +++ b/charts/incubator/unturned/templates/common.yaml @@ -1,2 +1 @@ -{{/* Render the templates */}} -{{ include "tc.common.loader.all" . }} +{{ include "tc.v1.common.loader.all" . }} diff --git a/charts/incubator/unturned/values.yaml b/charts/incubator/unturned/values.yaml index c8dfebc821d..6c886e0dff6 100644 --- a/charts/incubator/unturned/values.yaml +++ b/charts/incubator/unturned/values.yaml @@ -3,24 +3,50 @@ image: repository: tccr.io/truecharts/unturned tag: latest@sha256:7688a521164ade3b0731bc381b9ffd53733ebb87566acb4a2b47f36d9534f70d -podSecurityContext: - runAsGroup: 0 - runAsUser: 0 - securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 -env: - GAME_ID: "1110390" - GAME_PARAMS: -pei -normal -nosync -pve - GAME_PORT: "27015" - PASSWRD: "" - ROCKET_FORCE_UPDATE: "" - ROCKET_MOD: "" - ROCKET_URL: https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip - USERNAME: "" - VALIDATE: false +service: + main: + enabled: true + ports: + main: + enabled: true + protocol: udp + port: 27015 + steam: + enabled: true + ports: + steam: + enabled: true + protocol: tcp + port: 27016 + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + enabled: false + readiness: + enabled: false + startup: + enabled: false + env: + GAME_PORT: "{{ .Values.service.main.ports.main.port }}" + GAME_ID: "1110390" + USERNAME: "" + PASSWRD: "" + ROCKET_FORCE_UPDATE: "" + ROCKET_MOD: "" + ROCKET_URL: https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip + VALIDATE: false persistence: serverfiles: @@ -30,21 +56,6 @@ persistence: enabled: true mountPath: /serverdata/steamcmd -probes: - liveness: - enabled: false - readiness: - enabled: false - startup: - enabled: false - -service: - main: - ports: - main: - port: 27017 - protocol: UDP - targetPort: 27017 - portal: - enabled: true + open: + enabled: false