From 3ef318345cc3d5a1cde181ce74b3a14119d18efa Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Sun, 4 Feb 2024 06:46:20 +0000 Subject: [PATCH] Commit new Chart releases for TrueCharts Signed-off-by: TrueCharts-Bot --- incubator/palworld/0.1.3/app-changelog.md | 3 - .../palworld/0.1.3/templates/common.yaml | 1 - .../palworld/{0.1.3 => 0.1.4}/CHANGELOG.md | 3 + .../palworld/{0.1.3 => 0.1.4}/Chart.yaml | 3 +- incubator/palworld/{0.1.3 => 0.1.4}/README.md | 0 incubator/palworld/0.1.4/app-changelog.md | 3 + .../palworld/{0.1.3 => 0.1.4}/app-readme.md | 0 .../charts/common-17.2.26.tgz | Bin .../palworld/{0.1.3 => 0.1.4}/ix_values.yaml | 80 ++++++--- .../palworld/{0.1.3 => 0.1.4}/questions.yaml | 168 +++++------------- .../{0.1.3 => 0.1.4}/templates/NOTES.txt | 0 .../palworld/0.1.4/templates/_configmap.tpl | 17 ++ .../palworld/0.1.4/templates/common.yaml | 11 ++ .../palworld/{0.1.3 => 0.1.4}/values.yaml | 0 14 files changed, 133 insertions(+), 156 deletions(-) delete mode 100644 incubator/palworld/0.1.3/app-changelog.md delete mode 100644 incubator/palworld/0.1.3/templates/common.yaml rename incubator/palworld/{0.1.3 => 0.1.4}/CHANGELOG.md (86%) rename incubator/palworld/{0.1.3 => 0.1.4}/Chart.yaml (94%) rename incubator/palworld/{0.1.3 => 0.1.4}/README.md (100%) create mode 100644 incubator/palworld/0.1.4/app-changelog.md rename incubator/palworld/{0.1.3 => 0.1.4}/app-readme.md (100%) rename incubator/palworld/{0.1.3 => 0.1.4}/charts/common-17.2.26.tgz (100%) rename incubator/palworld/{0.1.3 => 0.1.4}/ix_values.yaml (84%) rename incubator/palworld/{0.1.3 => 0.1.4}/questions.yaml (96%) rename incubator/palworld/{0.1.3 => 0.1.4}/templates/NOTES.txt (100%) create mode 100644 incubator/palworld/0.1.4/templates/_configmap.tpl create mode 100644 incubator/palworld/0.1.4/templates/common.yaml rename incubator/palworld/{0.1.3 => 0.1.4}/values.yaml (100%) diff --git a/incubator/palworld/0.1.3/app-changelog.md b/incubator/palworld/0.1.3/app-changelog.md deleted file mode 100644 index 2ffe3d343e..0000000000 --- a/incubator/palworld/0.1.3/app-changelog.md +++ /dev/null @@ -1,3 +0,0 @@ - - -## [palworld-0.1.3](https://github.com/truecharts/charts/compare/palworld-0.1.2...palworld-0.1.3) (2024-02-01) \ No newline at end of file diff --git a/incubator/palworld/0.1.3/templates/common.yaml b/incubator/palworld/0.1.3/templates/common.yaml deleted file mode 100644 index b51394e00a..0000000000 --- a/incubator/palworld/0.1.3/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "tc.v1.common.loader.all" . }} diff --git a/incubator/palworld/0.1.3/CHANGELOG.md b/incubator/palworld/0.1.4/CHANGELOG.md similarity index 86% rename from incubator/palworld/0.1.3/CHANGELOG.md rename to incubator/palworld/0.1.4/CHANGELOG.md index 75b053aecb..15fee8bc8b 100644 --- a/incubator/palworld/0.1.3/CHANGELOG.md +++ b/incubator/palworld/0.1.4/CHANGELOG.md @@ -7,6 +7,9 @@ title: Changelog +## [palworld-0.1.4](https://github.com/truecharts/charts/compare/palworld-0.1.3...palworld-0.1.4) (2024-02-04) + + ## [palworld-0.1.3](https://github.com/truecharts/charts/compare/palworld-0.1.2...palworld-0.1.3) (2024-02-01) diff --git a/incubator/palworld/0.1.3/Chart.yaml b/incubator/palworld/0.1.4/Chart.yaml similarity index 94% rename from incubator/palworld/0.1.3/Chart.yaml rename to incubator/palworld/0.1.4/Chart.yaml index 2947d7f4e6..80ef8be9a6 100644 --- a/incubator/palworld/0.1.3/Chart.yaml +++ b/incubator/palworld/0.1.4/Chart.yaml @@ -33,5 +33,6 @@ sources: - https://github.com/ich777/docker-steamcmd-server/tree/palworld - https://github.com/truecharts/charts/tree/master/charts/incubator/palworld - https://ghcr.io/ich777/steamcmd + - https://hub.docker.com/r/outdead/rcon type: application -version: 0.1.3 +version: 0.1.4 diff --git a/incubator/palworld/0.1.3/README.md b/incubator/palworld/0.1.4/README.md similarity index 100% rename from incubator/palworld/0.1.3/README.md rename to incubator/palworld/0.1.4/README.md diff --git a/incubator/palworld/0.1.4/app-changelog.md b/incubator/palworld/0.1.4/app-changelog.md new file mode 100644 index 0000000000..0fc508920a --- /dev/null +++ b/incubator/palworld/0.1.4/app-changelog.md @@ -0,0 +1,3 @@ + + +## [palworld-0.1.4](https://github.com/truecharts/charts/compare/palworld-0.1.3...palworld-0.1.4) (2024-02-04) \ No newline at end of file diff --git a/incubator/palworld/0.1.3/app-readme.md b/incubator/palworld/0.1.4/app-readme.md similarity index 100% rename from incubator/palworld/0.1.3/app-readme.md rename to incubator/palworld/0.1.4/app-readme.md diff --git a/incubator/palworld/0.1.3/charts/common-17.2.26.tgz b/incubator/palworld/0.1.4/charts/common-17.2.26.tgz similarity index 100% rename from incubator/palworld/0.1.3/charts/common-17.2.26.tgz rename to incubator/palworld/0.1.4/charts/common-17.2.26.tgz diff --git a/incubator/palworld/0.1.3/ix_values.yaml b/incubator/palworld/0.1.4/ix_values.yaml similarity index 84% rename from incubator/palworld/0.1.3/ix_values.yaml rename to incubator/palworld/0.1.4/ix_values.yaml index c627d94774..2a3740fe26 100644 --- a/incubator/palworld/0.1.3/ix_values.yaml +++ b/incubator/palworld/0.1.4/ix_values.yaml @@ -93,6 +93,7 @@ palworld: region: "" work_speed_rate: "1.000000" update_public_ip: false + public_ip: "" params: - EpicApp=PalServer params_extra: @@ -120,6 +121,7 @@ workload: config={{ .Values.persistence.serverfiles.targetSelector.main.main.mountPath }}/Pal/Saved/Config/LinuxServer cfgFile=${config}/PalWorldSettings.ini dfCfgFile={{ .Values.persistence.serverfiles.targetSelector.main.main.mountPath }}/DefaultPalWorldSettings.ini + update_public_ip="{{ .Values.palworld.game.update_public_ip }}" mkdir -p ${config} if [ ! -f "${cfgFile}" ]; then @@ -134,24 +136,43 @@ workload: fi set_ini_value() { - local key="${1}" - local value="${2}" - local quote_flag="${3:-}" + local key="${1}" + local value="${2}" + local quote_flag="${3:-}" - # Check if the key exists - if ! grep -q "${key}=" "${cfgFile}"; then - echo "Key '${key}' does not exist in '${cfgFile}'. Skipping..." - return - fi + # Check if the key exists in the OptionSettings section + if ! grep -q 'OptionSettings=(' "$cfgFile"; then + echo "OptionSettings section not found in '${cfgFile}'. Skipping..." + return + fi - if [ "$quote_flag" = "-q" ]; then - # Add quotes around the value - value="\"$value\"" - fi + # Check if the key exists within the OptionSettings section + if ! grep -q "${key}=" "$cfgFile"; then + echo "Key '${key}' does not exist in the OptionSettings section of '${cfgFile}'. Skipping..." + return + fi - echo "Setting ${key}..." - sed -i "s|\(${key}=\)[^,]*|\1${value}|g" "${cfgFile}" - echo "Set to $(grep -Po "(?<=${key}=)[^,]*" "${cfgFile}")" + # Add quotes around the value if quote_flag is set + if [ "$quote_flag" = "-q" ]; then + value="\"$value\"" + fi + + # Update the value within the OptionSettings section + sed -i "/OptionSettings=(/ { + :loop + /)$/! { + N + b loop + } + s|\(${key}=\)[^,]*|\1${value}| + }" "${cfgFile}" + + # Check if the closing parenthesis is missing, and if so, add it + if ! grep -q ')$' "${cfgFile}"; then + sed -i "\|OptionSettings=(| s|$|)|" "${cfgFile}" + fi + + echo "Set ${key} to ${value}" } echo "the following options are updating...." @@ -160,11 +181,11 @@ workload: set_ini_value "RCONPort" "{{ .Values.service.rcon.ports.rcon.port }}" -q set_ini_value "PublicPort" "{{ .Values.service.main.ports.main.port }}" -q - set_ini_value "ServerPassword" "{{ .Values.palworld.game.password }}" -q - set_ini_value "AdminPassword" "{{ .Values.palworld.game.admin_password }}" -q + set_ini_value "ServerPassword" '{{ .Values.palworld.game.password }}' -q + set_ini_value "AdminPassword" '{{ .Values.palworld.game.admin_password }}' -q - set_ini_value "ServerName" "{{ .Values.palworld.game.name }}" -q - set_ini_value "ServerDescription" "{{ .Values.palworld.game.description }}" -q + set_ini_value "ServerName" '{{ .Values.palworld.game.name }}' -q + set_ini_value "ServerDescription" '{{ .Values.palworld.game.description }}' -q set_ini_value "Difficulty" "{{ .Values.palworld.game.difficulty }}" -q set_ini_value "DeathPenalty" "{{ .Values.palworld.game.death_penalty }}" -q set_ini_value "Region" "{{ .Values.palworld.game.region }}" -q @@ -221,6 +242,10 @@ workload: set_ini_value "WorkSpeedRate" "{{ .Values.palworld.game.work_speed_rate }}" set_ini_value "ExpRate" "{{ .Values.palworld.game.exp_rate }}" + # Check if update_public_ip is not true + if [ "${update_public_ip}" != "true" ]; then + set_ini_value "PublicIP" "{{ .Values.palworld.game.public_ip }}" -q + fi echo "Done!" containers: main: @@ -272,12 +297,6 @@ workload: enabled: false startup: enabled: false - args: - - ./rcon - - -a - - '{{ printf "%v-rcon:%v" (include "tc.v1.common.lib.chart.names.fullname" $) .Values.service.rcon.ports.rcon.port }}' - - -p - - "{{ .Values.palworld.game.admin_password }}" persistence: steamcmd: @@ -291,7 +310,16 @@ persistence: mountPath: /serverdata/serverfiles update-config-ini: mountPath: /serverdata/serverfiles - + palworld-rcon: + enabled: true + type: configmap + objectName: palworld-rcon + targetSelector: + rcon: + rcon: + mountPath: /rcon.yaml + subPath: rcon.yaml + readOnly: true portal: open: enabled: false diff --git a/incubator/palworld/0.1.3/questions.yaml b/incubator/palworld/0.1.4/questions.yaml similarity index 96% rename from incubator/palworld/0.1.3/questions.yaml rename to incubator/palworld/0.1.4/questions.yaml index 1cf53d7bd9..52b9efdc76 100644 --- a/incubator/palworld/0.1.3/questions.yaml +++ b/incubator/palworld/0.1.4/questions.yaml @@ -523,6 +523,42 @@ questions: schema: type: boolean default: false + - variable: public_ip + label: Public IP + schema: + type: string + default: "" + show_if: [[update_public_ip, "!=", "true"]] + - variable: params + label: Game Params + schema: + type: list + default: + - EpicApp=PalServer + required: true + items: + - variable: param + label: Param + schema: + type: string + required: true + default: "" + - variable: params_extra + label: Game Params Extra + schema: + type: list + default: + - -useperfthreads + - -NoAsyncLoadingThread + - -UseMultithreadForDS + required: true + items: + - variable: extra_param + label: Extra Param + schema: + type: string + required: true + default: "" - variable: backup label: Backup Configuration schema: @@ -558,124 +594,6 @@ questions: default: "Etc/UTC" $ref: - "definitions/timezone" - - variable: podOptions - group: "General Settings" - label: "Global Pod Options (Advanced)" - schema: - additional_attrs: true - type: dict - attrs: - - variable: expertPodOpts - label: "Expert - Pod Options" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: hostNetwork - label: "Host Networking" - schema: - type: boolean - default: false - - variable: dnsConfig - label: "DNS Configuration" - schema: - type: dict - additional_attrs: true - attrs: - - variable: options - label: "Options" - schema: - type: list - default: [{"name": "ndots", "value": "1"}] - items: - - variable: optionsEntry - label: "Option Entry" - schema: - type: dict - additional_attrs: true - attrs: - - variable: name - label: "Name" - schema: - type: string - required: true - - variable: value - label: "Value" - schema: - type: string - - variable: nameservers - label: "Nameservers" - schema: - type: list - default: [] - items: - - variable: nsEntry - label: "Nameserver Entry" - schema: - type: string - required: true - - variable: searches - label: "Searches" - schema: - type: list - default: [] - items: - - variable: searchEntry - label: "Search Entry" - schema: - type: string - required: true - - - variable: imagePullSecretList - group: "General Settings" - label: "Image Pull Secrets" - schema: - type: list - default: [] - items: - - variable: pullsecretentry - label: "Pull Secret" - schema: - type: dict - additional_attrs: true - attrs: - - variable: enabled - label: Enabled - schema: - type: boolean - default: true - - variable: data - label: Data - schema: - type: dict - additional_attrs: true - attrs: - - variable: registry - label: "Registry" - schema: - type: string - required: true - default: "https://index.docker.io/v1/" - - variable: username - label: "Username" - schema: - type: string - required: true - default: "" - - variable: password - label: "Password" - schema: - type: string - required: true - private: true - default: "" - - variable: email - label: "Email" - schema: - type: string - required: true - default: "" - variable: service group: Networking and Services label: Configure Service(s) @@ -684,8 +602,8 @@ questions: type: dict attrs: - 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 healthcheck runs, often the webUI schema: additional_attrs: true type: dict @@ -721,21 +639,21 @@ questions: type: dict attrs: - 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: 8211 required: true - variable: rcon - label: RCON Service - description: The RCON service. + label: RCON service + description: RCON Service Port Configuration schema: additional_attrs: true type: dict diff --git a/incubator/palworld/0.1.3/templates/NOTES.txt b/incubator/palworld/0.1.4/templates/NOTES.txt similarity index 100% rename from incubator/palworld/0.1.3/templates/NOTES.txt rename to incubator/palworld/0.1.4/templates/NOTES.txt diff --git a/incubator/palworld/0.1.4/templates/_configmap.tpl b/incubator/palworld/0.1.4/templates/_configmap.tpl new file mode 100644 index 0000000000..915455e713 --- /dev/null +++ b/incubator/palworld/0.1.4/templates/_configmap.tpl @@ -0,0 +1,17 @@ +{{/* Define the configmap */}} +{{- define "palworld.configmaps" -}} +{{- $fullname := (include "tc.v1.common.lib.chart.names.fullname" $) -}} + +{{- $adminPassword := .Values.palworld.game.admin_password -}} +{{- $rconPort := .Values.service.rcon.ports.rcon.port }} + +palworld-rcon: + enabled: true + data: + rcon.yaml: | + default: + address: "{{ printf "%v-rcon:%v" $fullname $rconPort }}" + password: {{ $adminPassword }} + log: "rcon-palworld.log" + timeout: "10s" +{{- end -}} diff --git a/incubator/palworld/0.1.4/templates/common.yaml b/incubator/palworld/0.1.4/templates/common.yaml new file mode 100644 index 0000000000..aa8a6f4869 --- /dev/null +++ b/incubator/palworld/0.1.4/templates/common.yaml @@ -0,0 +1,11 @@ +{{/* Make sure all variables are set properly */}} +{{- include "tc.v1.common.loader.init" . -}} + +{{/* Render configmaps for all pods */}} +{{- $configmaps := include "palworld.configmaps" . | fromYaml -}} +{{- if $configmaps -}} + {{- $_ := mustMergeOverwrite .Values.configmap $configmaps -}} +{{- end -}} + +{{/* Render the templates */}} +{{- include "tc.v1.common.loader.apply" . -}} diff --git a/incubator/palworld/0.1.3/values.yaml b/incubator/palworld/0.1.4/values.yaml similarity index 100% rename from incubator/palworld/0.1.3/values.yaml rename to incubator/palworld/0.1.4/values.yaml