migrate(unturned) migrate unturned to new commons (#9960)

**Description**
- Add steam port
- housekeeping
- migrate to new commons

⚒️ Fixes  # <!--(issue)-->

**⚙️ 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?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ 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>
This commit is contained in:
Xstar97TheNoob
2023-06-27 17:01:50 +00:00
committed by GitHub
co-authored by Stavros Kois
parent 6f83e0e6d7
commit 29ef0fc2c5
5 changed files with 155 additions and 139 deletions
+8 -8
View File
@@ -1,15 +1,11 @@
annotations:
truecharts.org/SCALE-support: "true"
truecharts.org/catagories: |
- GameServers
apiVersion: v2 apiVersion: v2
appVersion: "latest" appVersion: "latest"
dependencies: dependencies:
- name: common - name: common
repository: https://library-charts.truecharts.org repository: https://library-charts.truecharts.org
version: 11.1.2 version: 12.14.2
deprecated: false 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 home: https://truecharts.org/charts/incubator/unturned
icon: https://truecharts.org/img/hotlink-ok/chart-icons/unturned.png icon: https://truecharts.org/img/hotlink-ok/chart-icons/unturned.png
keywords: keywords:
@@ -23,6 +19,10 @@ maintainers:
name: unturned name: unturned
sources: sources:
- https://github.com/truecharts/charts/tree/master/charts/incubator/unturned - 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 type: application
version: 2.0.9 version: 3.0.0
annotations:
truecharts.org/catagories: |
- GameServers
truecharts.org/SCALE-support: "true"
+77 -72
View File
@@ -1,7 +1,5 @@
# Include{groups} # Include{groups}
portals: portals: {}
open:
# Include{portalLink}
questions: questions:
# Include{global} # Include{global}
# Include{workload} # Include{workload}
@@ -10,83 +8,80 @@ questions:
# Include{replicas1} # Include{replicas1}
# Include{podSpec} # Include{podSpec}
# Include{containerMain} # Include{containerMain}
# 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 - variable: env
group: "App Configuration" label: Image Environment
label: "Image Environment"
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: GAME_ID - variable: GAME_ID
label: "GAME_ID" label: "Game ID"
description: "The GAME_ID that the container download at startup.(https://developer.valvesoftware.com/wiki/Dedicated_Servers_List)" description: "The Game ID that the container downloads at startup."
schema: schema:
type: string type: string
default: "1110390" 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 - variable: GAME_PARAMS
label: "GAME_PARAMS" label: "Game Params"
description: "Enter your start up commands for the server." description: "Enter your start up commands for the server."
schema: schema:
type: string type: string
default: "-pei -normal -nosync -pve" 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 - variable: ROCKET_MOD
label: "ROCKET_MOD" label: "Rocket Mod"
description: "Set to true (without quotes) to install Rocket Mod otherwise leave blank" description: "install Rocket Mod"
schema: schema:
type: string type: string
default: "" default: "false"
enum:
- value: "true"
description: "True"
- value: "false"
description: "False"
- variable: ROCKET_FORCE_UPDATE - variable: ROCKET_FORCE_UPDATE
label: "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 &amp; Scripts folder will be overwritten backup the files bevor doing that!" description: "force a update of Rocket Mod."
schema: schema:
type: string type: string
default: "" default: "false"
enum:
- value: "true"
description: "True"
- value: "false"
description: "False"
- variable: ROCKET_URL - variable: ROCKET_URL
label: "ROCKET_URL" label: "Rocket URL"
description: "Only change if you are know what you are doing" description: "Only change if you are know what you are doing"
schema: schema:
type: string type: string
default: "https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip" default: "https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip"
- variable: GAME_PORT
label: "GAME_PORT" # Include{containerBasic}
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 &amp; GAMEPORT UDP 2)" # Include{containerAdvanced}
schema:
type: string
default: "27015"
# Include{containerConfig} # Include{containerConfig}
# Include{podOptions}
# Include{serviceRoot} # Include{serviceRoot}
- variable: main - variable: main
label: "Main Service" label: Main Service
description: "The Primary service on which the healthcheck runs, often the webUI" description: The Primary service on which the Minecraft Server runs on
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -94,53 +89,63 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: main - variable: main
label: "Main Service Port Configuration" label: Main Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - variable: port
label: "Port" label: Port
description: "This port exposes the container port on the service" description: This port exposes the container port on the service
schema: schema:
type: int 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 required: true
# Include{serviceExpertRoot} # Include{serviceExpertRoot}
# Include{serviceExpert} # Include{serviceExpert}
# Include{serviceList} # Include{serviceList}
# Include{persistenceRoot} # Include{persistenceRoot}
- variable: steamcmd - variable: steamcmd
label: "steamcmd Storage" label: App SteamCMD Storage
description: "Container Path serverdatasteamcmd" description: Stores the Application SteamCMD.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
# Include{persistenceBasic} # Include{persistenceBasic}
- variable: serverfiles - variable: serverfiles
label: "serverfiles Storage" label: App ServerFiles Storage
description: "Container Path serverdataserverfiles" description: Stores the Application ServerFiles.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
# Include{persistenceBasic} # Include{persistenceBasic}
# Include{persistenceList} # 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 - variable: runAsUser
label: "runAsUser" label: "runAsUser"
description: "The UserID of the user running the application" description: "The UserID of the user running the application"
@@ -0,0 +1 @@
{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,2 +1 @@
{{/* Render the templates */}} {{ include "tc.v1.common.loader.all" . }}
{{ include "tc.common.loader.all" . }}
+36 -25
View File
@@ -3,23 +3,49 @@ image:
repository: tccr.io/truecharts/unturned repository: tccr.io/truecharts/unturned
tag: latest@sha256:7688a521164ade3b0731bc381b9ffd53733ebb87566acb4a2b47f36d9534f70d tag: latest@sha256:7688a521164ade3b0731bc381b9ffd53733ebb87566acb4a2b47f36d9534f70d
podSecurityContext:
runAsGroup: 0
runAsUser: 0
securityContext: securityContext:
readOnlyRootFilesystem: false container:
runAsNonRoot: false runAsNonRoot: false
readOnlyRootFilesystem: false
runAsUser: 0
runAsGroup: 0
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: env:
GAME_PORT: "{{ .Values.service.main.ports.main.port }}"
GAME_ID: "1110390" GAME_ID: "1110390"
GAME_PARAMS: -pei -normal -nosync -pve USERNAME: ""
GAME_PORT: "27015"
PASSWRD: "" PASSWRD: ""
ROCKET_FORCE_UPDATE: "" ROCKET_FORCE_UPDATE: ""
ROCKET_MOD: "" ROCKET_MOD: ""
ROCKET_URL: https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip ROCKET_URL: https://ci.rocketmod.net/job/Rocket.Unturned/lastSuccessfulBuild/artifact/Rocket.Unturned/bin/Release/Rocket.zip
USERNAME: ""
VALIDATE: false VALIDATE: false
persistence: persistence:
@@ -30,21 +56,6 @@ persistence:
enabled: true enabled: true
mountPath: /serverdata/steamcmd mountPath: /serverdata/steamcmd
probes:
liveness:
enabled: false
readiness:
enabled: false
startup:
enabled: false
service:
main:
ports:
main:
port: 27017
protocol: UDP
targetPort: 27017
portal: portal:
enabled: true open:
enabled: false