diff --git a/incubator/arksurvivalevolved/3.0.1/app-changelog.md b/incubator/arksurvivalevolved/3.0.1/app-changelog.md deleted file mode 100644 index 27d2240985d..00000000000 --- a/incubator/arksurvivalevolved/3.0.1/app-changelog.md +++ /dev/null @@ -1,9 +0,0 @@ - - -## [arksurvivalevolved-3.0.1](https://github.com/truecharts/charts/compare/arksurvivalevolved-3.0.0...arksurvivalevolved-3.0.1) (2022-12-24) - -### Fix - -- fix wrong port formatting ([#5651](https://github.com/truecharts/charts/issues/5651)) - - \ No newline at end of file diff --git a/incubator/arksurvivalevolved/3.0.1/CHANGELOG.md b/incubator/arksurvivalevolved/3.0.2/CHANGELOG.md similarity index 94% rename from incubator/arksurvivalevolved/3.0.1/CHANGELOG.md rename to incubator/arksurvivalevolved/3.0.2/CHANGELOG.md index a378332adca..1e1f4fbd0b9 100644 --- a/incubator/arksurvivalevolved/3.0.1/CHANGELOG.md +++ b/incubator/arksurvivalevolved/3.0.2/CHANGELOG.md @@ -4,6 +4,11 @@ +## [arksurvivalevolved-3.0.2](https://github.com/truecharts/charts/compare/arksurvivalevolved-3.0.1...arksurvivalevolved-3.0.2) (2022-12-25) + + + + ## [arksurvivalevolved-3.0.1](https://github.com/truecharts/charts/compare/arksurvivalevolved-3.0.0...arksurvivalevolved-3.0.1) (2022-12-24) ### Fix @@ -92,8 +97,3 @@ ## [arksurvivalevolved-2.0.1](https://github.com/truecharts/charts/compare/arksurvivalevolved-2.0.0...arksurvivalevolved-2.0.1) (2022-11-15) -### Chore - -- update helm general non-major ([#4463](https://github.com/truecharts/charts/issues/4463)) - - diff --git a/incubator/arksurvivalevolved/3.0.1/Chart.yaml b/incubator/arksurvivalevolved/3.0.2/Chart.yaml similarity index 98% rename from incubator/arksurvivalevolved/3.0.1/Chart.yaml rename to incubator/arksurvivalevolved/3.0.2/Chart.yaml index b1a8ed5c2d0..2ed3fd8bd0c 100644 --- a/incubator/arksurvivalevolved/3.0.1/Chart.yaml +++ b/incubator/arksurvivalevolved/3.0.2/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://survivetheark.com/ - https://hub.docker.com/r/ich777/steamcmd/ type: application -version: 3.0.1 +version: 3.0.2 diff --git a/incubator/arksurvivalevolved/3.0.1/README.md b/incubator/arksurvivalevolved/3.0.2/README.md similarity index 100% rename from incubator/arksurvivalevolved/3.0.1/README.md rename to incubator/arksurvivalevolved/3.0.2/README.md diff --git a/incubator/arksurvivalevolved/3.0.2/app-changelog.md b/incubator/arksurvivalevolved/3.0.2/app-changelog.md new file mode 100644 index 00000000000..4f88fc10b44 --- /dev/null +++ b/incubator/arksurvivalevolved/3.0.2/app-changelog.md @@ -0,0 +1,4 @@ + + +## [arksurvivalevolved-3.0.2](https://github.com/truecharts/charts/compare/arksurvivalevolved-3.0.1...arksurvivalevolved-3.0.2) (2022-12-25) + diff --git a/incubator/arksurvivalevolved/3.0.1/app-readme.md b/incubator/arksurvivalevolved/3.0.2/app-readme.md similarity index 51% rename from incubator/arksurvivalevolved/3.0.1/app-readme.md rename to incubator/arksurvivalevolved/3.0.2/app-readme.md index d37d908dcaf..8beb89566ea 100644 --- a/incubator/arksurvivalevolved/3.0.1/app-readme.md +++ b/incubator/arksurvivalevolved/3.0.2/app-readme.md @@ -1,8 +1,8 @@ This Chart will download and install SteamCMD. It will also install ARK:SurvivalEvolved and run it (Normal server startup of ARK can take a long time!). -This App is supplied by TrueCharts, for more information visit the manual: [https://truecharts.org/docs/charts/incubator/arksurvivalevolved](https://truecharts.org/docs/charts/incubator/arksurvivalevolved) +This App is supplied by TrueCharts, for more information visit the manual: [https://truecharts.org/charts/incubator/arksurvivalevolved](https://truecharts.org/charts/incubator/arksurvivalevolved) --- TrueCharts can only exist due to the incredible effort of our staff. -Please consider making a [donation](https://truecharts.org/docs/about/sponsor) or contributing back to the project any way you can! +Please consider making a [donation](https://truecharts.org/about/sponsor) or contributing back to the project any way you can! diff --git a/incubator/arksurvivalevolved/3.0.1/charts/common-11.0.9.tgz b/incubator/arksurvivalevolved/3.0.2/charts/common-11.0.9.tgz similarity index 100% rename from incubator/arksurvivalevolved/3.0.1/charts/common-11.0.9.tgz rename to incubator/arksurvivalevolved/3.0.2/charts/common-11.0.9.tgz diff --git a/incubator/arksurvivalevolved/3.0.1/ix_values.yaml b/incubator/arksurvivalevolved/3.0.2/ix_values.yaml similarity index 90% rename from incubator/arksurvivalevolved/3.0.1/ix_values.yaml rename to incubator/arksurvivalevolved/3.0.2/ix_values.yaml index 0ec69306756..988a03a12d6 100644 --- a/incubator/arksurvivalevolved/3.0.1/ix_values.yaml +++ b/incubator/arksurvivalevolved/3.0.2/ix_values.yaml @@ -19,11 +19,14 @@ ark: game_id: "376030" rcon_enabled: true game_params: [] - game_params_extra: - - -server - - -log - - -crossplay" + game_params_extra: [] + easy_game_extra_params: + server: true + log: true + crossplay: true map: TheIsland + # Used only for SCALE GUI + custom_map: "" server_name: "" validate: false diff --git a/incubator/arksurvivalevolved/3.0.1/questions.yaml b/incubator/arksurvivalevolved/3.0.2/questions.yaml similarity index 96% rename from incubator/arksurvivalevolved/3.0.1/questions.yaml rename to incubator/arksurvivalevolved/3.0.2/questions.yaml index d8273a35557..8b622ee9b3c 100644 --- a/incubator/arksurvivalevolved/3.0.1/questions.yaml +++ b/incubator/arksurvivalevolved/3.0.2/questions.yaml @@ -91,52 +91,91 @@ questions: 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). + description: Optionally set a steam username otherwise (disable Steam Guard). schema: type: string default: "" - variable: password label: Password - 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). + description: Optionally set a steam password (disable Steam Guard). schema: type: string private: true default: "" - variable: srv_password label: Server Password - description: Leave empty if you want to use the settings from GameUserSettings.ini (this field accepts no spaces) + description: Optionally set a password for the server (this field accepts no spaces) schema: type: string private: true default: "" - variable: srv_admin_pass label: Server Admin Password - description: Leave empty if you want to use the settings from GameUserSettings.ini (this field accepts no spaces) + description: Optionally set a password for the admin (this field accepts no spaces) schema: type: string private: true default: "" - variable: 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 SteamCMD Game ID." schema: type: string default: "376030" + enum: + - value: "376030" + description: "ARK Survival Evolved" + - value: "445400" + description: "ARK Survival of the Fittest" + - variable: custom_map + label: Custom Map + description: Custom Map name. + schema: + type: string + default: "" - variable: map label: Map description: Map Name schema: type: string + show_if: [["custom_map", "=", ""]] default: TheIsland + enum: + - value: TheIsland + description: Island + - value: TheCenter + description: Center + - value: ScorchedEarth_P + description: Scorched Earth + - value: Ragnarok + description: Ragnarok + - value: Aberration_P + description: Aberration + - value: Extinction + description: Extinction + - value: Genesis + description: Genesis + - value: Valguero_P + description: Valguero + - value: CrystalIsles + description: Crystal Isles + - value: Gen2 + description: Genesis 2 + - value: Lost Island + description: LostIsland + - value: Fjordur + description: Fjordur + - value: custom + description: Custom - variable: server_name label: Server Name - description: Leave empty if you want to use the settings from GameUserSettings.ini (this field accepts no spaces) + description: Optionally set a name for the server (this field accepts no spaces) schema: type: string default: "" - variable: validate label: Validate - description: "Set the Variable to true if you want to validate the installation otherwise leave it blank." + description: Enable to validate the installation, otherwise uncheck it. schema: type: boolean default: true @@ -147,7 +186,7 @@ questions: default: true - variable: game_params label: Game Parameters - description: "Enter your game parameters starting with ? (don't put spaces in between eg: ?MaxPlayers=40?FastDecayUnsnappedCoreStructures=true). For multiple servers, change the port numbers in Networking and Services section ONLY." + description: Enter your game parameters starting with ?, one per entry schema: type: list default: [] @@ -159,12 +198,37 @@ questions: type: string default: "" required: true + - variable: easy_game_extra_params + label: Game Extra Parmeters (Easy) + description: Appends the game extra params to the Game Extra Parameters list + schema: + additional_attrs: true + type: dict + attrs: + - variable: server + label: Server Flag + description: Adds -server flag to Game Extra Parameters + schema: + type: boolean + default: true + - variable: log + label: Log Flag + description: Adds -log flag to Game Extra Parameters + schema: + type: boolean + default: true + - variable: crossplay + label: Crossplay Flag + description: Adds -crossplay flag to Game Extra Parameters + schema: + type: boolean + default: true - variable: game_params_extra label: Game Extra Parameters - description: "Values to start the server, one per entry" + description: "Enter your game extra parameters, one per entry" schema: type: list - default: ["-server", "-log", "-crossplay"] + default: [] items: - variable: game_params_extra_entry label: Extra Parameter Entry @@ -651,8 +715,8 @@ questions: type: dict attrs: - variable: steamcmd - label: steamcmd Storage - description: Container Path serverdatasteamcmd + label: App SteamCMD Storage + description: Stores the Application SteamCMD. schema: additional_attrs: true type: dict @@ -721,8 +785,8 @@ questions: type: string default: 256Gi - variable: serverfiles - label: serverfiles Storage - description: Container Path serverdataserverfiles + label: App ServerFiles Storage + description: Stores the Application ServerFiles. schema: additional_attrs: true type: dict diff --git a/incubator/arksurvivalevolved/3.0.1/templates/_secret.tpl b/incubator/arksurvivalevolved/3.0.2/templates/_secret.tpl similarity index 74% rename from incubator/arksurvivalevolved/3.0.1/templates/_secret.tpl rename to incubator/arksurvivalevolved/3.0.2/templates/_secret.tpl index 42efbfc9bd5..cdbbe8f7c73 100644 --- a/incubator/arksurvivalevolved/3.0.1/templates/_secret.tpl +++ b/incubator/arksurvivalevolved/3.0.2/templates/_secret.tpl @@ -7,9 +7,18 @@ {{- $params = append $params (printf "?Port=%v" .Values.service.main.ports.main.port) -}} {{- $params = append $params (printf "?QueryPort=%v" .Values.service.udpsteam.ports.udpsteam.port) -}} {{- $params = append $params (printf "?RCONPort=%v" .Values.service.rcontcp.ports.rcontcp.port) -}} + +{{- $gameExtraParams := list -}} +{{- range $key, $value := .Values.easy_game_extra_params -}} + {{- if $value -}} + {{ $gameExtraParams = mustAppend $gameExtraParams (printf "-%s" $key) }} + {{- end -}} +{{- end -}} + {{- if .Values.ark.rcon_enabled -}} {{- $params = append $params (print "?RCONEnabled=True") -}} {{- end }} + --- apiVersion: v1 kind: Secret @@ -20,13 +29,17 @@ metadata: stringData: GAME_ID: {{ .Values.ark.game_id | quote }} GAME_PARAMS: {{ printf "%s%s" (join "" $params) (join "" .Values.ark.game_params) | quote }} - GAME_PARAMS_EXTRA: {{ (join " " .Values.ark.game_params_extra) | quote }} + GAME_PARAMS_EXTRA: {{ (join " " (concat $gameExtraParams .Values.ark.game_params_extra)) | quote }} + {{- with .Values.ark.custom_map }} + MAP: {{ . | quote }} + {{- else }} MAP: {{ .Values.ark.map | quote }} + {{- end }} {{- with .Values.ark.server_name }} SERVER_NAME: {{ . | quote }} {{- end }} VALIDATE: {{ default false .Values.ark.validate | quote }} - {{- with .Values.ark.srv_admin_password }} + {{- with .Values.ark.srv_admin_pass }} SRV_ADMIN_PWD: {{ . | quote }} {{- end }} {{- with .Values.ark.srv_password }} diff --git a/incubator/arksurvivalevolved/3.0.1/templates/common.yaml b/incubator/arksurvivalevolved/3.0.2/templates/common.yaml similarity index 100% rename from incubator/arksurvivalevolved/3.0.1/templates/common.yaml rename to incubator/arksurvivalevolved/3.0.2/templates/common.yaml diff --git a/incubator/arksurvivalevolved/3.0.1/values.yaml b/incubator/arksurvivalevolved/3.0.2/values.yaml similarity index 100% rename from incubator/arksurvivalevolved/3.0.1/values.yaml rename to incubator/arksurvivalevolved/3.0.2/values.yaml