From 808baa494b3b675193cdba8134f5fe4c8201c15b Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:43:02 -0500 Subject: [PATCH] feat(minecraft-bedrock) add whitelist users, update docs, and probes (#18721) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Add whitelist users option if whitelist is enabled. update docs probes ⚒️ Fixes #18720 **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 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 - [X] 📄 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 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/stable/minecraft-bedrock/Chart.yaml | 2 +- .../stable/minecraft-bedrock/docs/How-To.md | 10 +++++ .../stable/minecraft-bedrock/questions.yaml | 7 +++ charts/stable/minecraft-bedrock/values.yaml | 43 +++++++++++++++---- 4 files changed, 52 insertions(+), 10 deletions(-) diff --git a/charts/stable/minecraft-bedrock/Chart.yaml b/charts/stable/minecraft-bedrock/Chart.yaml index a6fe57900f3..fbadddb5116 100644 --- a/charts/stable/minecraft-bedrock/Chart.yaml +++ b/charts/stable/minecraft-bedrock/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/minecraft-bedrock - https://hub.docker.com/r/itzg/minecraft-bedrock-server type: application -version: 8.2.0 +version: 8.2.1 diff --git a/charts/stable/minecraft-bedrock/docs/How-To.md b/charts/stable/minecraft-bedrock/docs/How-To.md index 04b204a09e2..24fd877fc60 100644 --- a/charts/stable/minecraft-bedrock/docs/How-To.md +++ b/charts/stable/minecraft-bedrock/docs/How-To.md @@ -43,3 +43,13 @@ The `/data/permissions.json` should look something like this: - If you found a bug in our chart, open a Github [issue](https://github.com/truecharts/apps/issues/new/choose) but generally it's advised to contact us on Discord first in most cases. ::: + +## Executing server commands + +This image comes bundled with a script called send-command that will send a Bedrock command and argument to the Bedrock server console. The output of the command only be visible in the container logs. + +shell into the container and run whatever command you want for example: + +```shell +send-command gamerule dofiretick false +``` diff --git a/charts/stable/minecraft-bedrock/questions.yaml b/charts/stable/minecraft-bedrock/questions.yaml index 61b9555fc87..e0931ebf878 100644 --- a/charts/stable/minecraft-bedrock/questions.yaml +++ b/charts/stable/minecraft-bedrock/questions.yaml @@ -103,6 +103,13 @@ questions: schema: type: boolean default: false + - variable: WHITE_LIST_USERS + label: "White List Users" + description: "A user:xuid comma separated list." + schema: + type: string + default: "" + show_if: [[WHITE_LIST, "=", true]] - variable: OPS label: "OPS" description: "To OP a player, use the XUID value, not the player's username. Multiple values accepted in this format `XUID,XUID` separated by a comma." diff --git a/charts/stable/minecraft-bedrock/values.yaml b/charts/stable/minecraft-bedrock/values.yaml index 72b946158dc..bca60b08903 100644 --- a/charts/stable/minecraft-bedrock/values.yaml +++ b/charts/stable/minecraft-bedrock/values.yaml @@ -16,18 +16,42 @@ workload: tty: true stdin: true probes: - # -- Liveness probe configuration - # @default -- See below liveness: - enabled: false - # -- Redainess probe configuration - # @default -- See below + enabled: true + type: exec + command: + - /usr/local/bin/mc-monitor + - status-bedrock + - --host + - 127.0.0.1 + - --port + - "{{ .Values.service.main.ports.main.port }}" + spec: + periodSeconds: 60 readiness: - enabled: false - # -- Startup probe configuration - # @default -- See below + enabled: true + type: exec + command: + - /usr/local/bin/mc-monitor + - status-bedrock + - --host + - 127.0.0.1 + - --port + - "{{ .Values.service.main.ports.main.port }}" + spec: + periodSeconds: 60 startup: - enabled: false + enabled: true + type: exec + command: + - /usr/local/bin/mc-monitor + - status-bedrock + - --host + - 127.0.0.1 + - --port + - "{{ .Values.service.main.ports.main.port }}" + spec: + periodSeconds: 60 env: EULA: true ENABLE_LAN_VISIBILITY: false @@ -42,6 +66,7 @@ workload: MAX_PLAYERS: 10 ONLINE_MODE: true WHITE_LIST: false + # WHITE_LIST_USERS: "USER:XUID,USER:XUID" VIEW_DISTANCE: 32 TICK_DISTANCE: 4 PLAYER_IDLE_TIMEOUT: 30