From 87acd313857f2749029718ff65dd4e505ef5bc10 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Wed, 25 Feb 2026 23:51:22 -0500 Subject: [PATCH] chore(minecraft-java) remove deprecated images, add ssh support, etc (#45446) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** As titled and removed the redundant sidecar ⚒️ Fixes # **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code - [ ] 📜 Documentation Changes **🧪 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 changes to the documentation - [ ] 🧪 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 - [X] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or `fix(docs):` **➕ 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: Alfred Göppel <43101280+alfi0812@users.noreply.github.com> Co-authored-by: Alfred Göppel <43101280+alfi0812@users.noreply.github.com> --- charts/stable/minecraft-java/Chart.yaml | 3 +- .../stable/minecraft-java/ci/j16-values.yaml | 1 + .../minecraft-java/ci/j17alpine-values.yaml | 1 - .../minecraft-java/ci/j17graalvm-values.yaml | 1 - .../minecraft-java/ci/j21graalvm-values.yaml | 1 - .../minecraft-java/ci/j21jdk-values.yaml | 1 + .../minecraft-java/ci/j25jdk-values.yaml | 1 + .../minecraft-java/ci/j8alpine-values.yaml | 4 - .../minecraft-java/ci/j8graalvm-values.yaml | 4 - .../minecraft-java/ci/j8jdk-values.yaml | 4 - charts/stable/minecraft-java/values.yaml | 118 ++++++------------ 11 files changed, 41 insertions(+), 98 deletions(-) create mode 100644 charts/stable/minecraft-java/ci/j16-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j17alpine-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j17graalvm-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j21graalvm-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j21jdk-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j25jdk-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j8alpine-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j8graalvm-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j8jdk-values.yaml diff --git a/charts/stable/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml index 15215385f8a..e54fb204004 100644 --- a/charts/stable/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -42,5 +42,4 @@ sources: - https://github.com/trueforge-org/truecharts/tree/master/charts/stable/minecraft-java - https://hub.docker.com/r/itzg/mc-backup type: application -version: 33.10.2 - +version: 34.0.0 diff --git a/charts/stable/minecraft-java/ci/j16-values.yaml b/charts/stable/minecraft-java/ci/j16-values.yaml new file mode 100644 index 00000000000..1111a94faeb --- /dev/null +++ b/charts/stable/minecraft-java/ci/j16-values.yaml @@ -0,0 +1 @@ +imageSelector: j16Image diff --git a/charts/stable/minecraft-java/ci/j17alpine-values.yaml b/charts/stable/minecraft-java/ci/j17alpine-values.yaml deleted file mode 100644 index d9322e395ba..00000000000 --- a/charts/stable/minecraft-java/ci/j17alpine-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j17alpineImage diff --git a/charts/stable/minecraft-java/ci/j17graalvm-values.yaml b/charts/stable/minecraft-java/ci/j17graalvm-values.yaml deleted file mode 100644 index 492626d5bac..00000000000 --- a/charts/stable/minecraft-java/ci/j17graalvm-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j17graalvmImage diff --git a/charts/stable/minecraft-java/ci/j21graalvm-values.yaml b/charts/stable/minecraft-java/ci/j21graalvm-values.yaml deleted file mode 100644 index ff8755fe59b..00000000000 --- a/charts/stable/minecraft-java/ci/j21graalvm-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j21graalvmImage diff --git a/charts/stable/minecraft-java/ci/j21jdk-values.yaml b/charts/stable/minecraft-java/ci/j21jdk-values.yaml new file mode 100644 index 00000000000..4b5c3a5d0a0 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j21jdk-values.yaml @@ -0,0 +1 @@ +imageSelector: j21jdkImage diff --git a/charts/stable/minecraft-java/ci/j25jdk-values.yaml b/charts/stable/minecraft-java/ci/j25jdk-values.yaml new file mode 100644 index 00000000000..bdf4804047a --- /dev/null +++ b/charts/stable/minecraft-java/ci/j25jdk-values.yaml @@ -0,0 +1 @@ +imageSelector: j25jdkImage diff --git a/charts/stable/minecraft-java/ci/j8alpine-values.yaml b/charts/stable/minecraft-java/ci/j8alpine-values.yaml deleted file mode 100644 index 996a2c2c4c0..00000000000 --- a/charts/stable/minecraft-java/ci/j8alpine-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j8alpineImage - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j8graalvm-values.yaml b/charts/stable/minecraft-java/ci/j8graalvm-values.yaml deleted file mode 100644 index e281f94407b..00000000000 --- a/charts/stable/minecraft-java/ci/j8graalvm-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j8graalvmImage - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j8jdk-values.yaml b/charts/stable/minecraft-java/ci/j8jdk-values.yaml deleted file mode 100644 index ec1eb121141..00000000000 --- a/charts/stable/minecraft-java/ci/j8jdk-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j8jdkImage - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml index c1ee5211d99..a5d373a46bc 100644 --- a/charts/stable/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -1,60 +1,60 @@ # yaml-language-server: $schema=./values.schema.json + image: repository: ghcr.io/itzg/minecraft-server - tag: 2026.2.1@sha256:44aacf3902c1c2e18dddfe8585dd44badbf56a0a768c773a5e0bcfe4bc1d0443 + tag: 2026.2.1-java25@sha256:44aacf3902c1c2e18dddfe8585dd44badbf56a0a768c773a5e0bcfe4bc1d0443 pullPolicy: Always + +# ---- Java 25 ---- +j25jdkImage: + repository: ghcr.io/itzg/minecraft-server + tag: 2026.2.1-java25-jdk@sha256:c51e1cb6d7679fd6a224e920f359434b3b6513cef7f3030386e49a8d197558dd + pullPolicy: Always + +# ---- Java 21 (Recommended for modern MC versions) ---- j21Image: repository: ghcr.io/itzg/minecraft-server tag: 2026.2.1-java21@sha256:115f666dac309116d0921549a935f02c2f8e9114282590ad77423ac357319992 pullPolicy: Always -j21graalvmImage: - repository: ghcr.io/itzg/minecraft-server - tag: 2026.1.0-java21-graalvm@sha256:edd7b66781574ebb67c66f96635d7d1aa733f2886f6589fa4c4c1d8fdca96aac - pullPolicy: Always + j21alpineImage: repository: ghcr.io/itzg/minecraft-server tag: 2026.2.1-java21-alpine@sha256:82adaddfe0156f07c34228f1c1065cdbd298abc174de0a9961abb068b11beebb pullPolicy: Always + +j21jdkImage: + repository: ghcr.io/itzg/minecraft-server + tag: 2026.2.1-java21-jdk@sha256:a37b010459985b1e6374228bbc02fef7bf6815b48f4911d659ac6ccf09f6a4cb + pullPolicy: Always + +# ---- Java 17 (Safe & Supported) ---- j17Image: repository: ghcr.io/itzg/minecraft-server tag: 2026.2.1-java17@sha256:4bdd8acc8c8bf30592560f4d97fd7c71b06d1fb514d28dd7c3b4a6d2807a715f pullPolicy: Always + j17jdkImage: repository: ghcr.io/itzg/minecraft-server tag: 2024.6.1-java17-jdk@sha256:2c43fcede436aff9f50b1adf4448d55d221651be471ef41412232c141bfa89f6 pullPolicy: Always -j17graalvmImage: + +# ---- Java 16 ---- +j16Image: repository: ghcr.io/itzg/minecraft-server - tag: 2026.1.0-java17-graalvm@sha256:81c049a55a0fb89162d8c0378f530278922786d253cf4259697c6ef9277f2a00 - pullPolicy: Always -j17alpineImage: - repository: ghcr.io/itzg/minecraft-server - tag: 2025.10.5-java17-alpine@sha256:ecc762c91690d3f5fbfd1051aa07f173025dcaccfbf201984ddf395c21a5264f + tag: 2026.2.1-java16@sha256:a930403ac91b4501b99e821cc3abac959a3b3a64c315a89380a13c10ae5859dc pullPolicy: Always + +# ---- Java 11 ---- j11Image: repository: ghcr.io/itzg/minecraft-server tag: 2026.2.1-java11@sha256:8a8402fad8d67fd1c098544b92b5c290dd986e2d0e4b72acd56cad5e12f61880 pullPolicy: Always + +# ---- Java 8 (Use plain java8 only) ---- j8Image: repository: ghcr.io/itzg/minecraft-server tag: 2026.2.1-java8@sha256:b98942c4ae0b14fc02b2129ae4da36ebf67b29fdc4230569fd6f80d6b1302baa pullPolicy: Always -j8graalvmImage: - repository: ghcr.io/itzg/minecraft-server - tag: 2026.1.3-java8-graalvm-ce@sha256:d758662bcc18a34c3e0c9c24370b95b87fa2a94c0540ca3bb0fd82114c9dfe61 - pullPolicy: Always -j8jdkImage: - repository: ghcr.io/itzg/minecraft-server - tag: 2026.2.1-java8-jdk@sha256:65b4096786d3bb862827d80e9bdbf8134a68d4c9c0a55d14da8573196c22e1d7 - pullPolicy: Always -j8alpineImage: - repository: ghcr.io/itzg/minecraft-server - tag: 2024.9.0-java8-alpine@sha256:ee8505b9670a82b7703ec35b2a87fe9b7f7823b50ae50fad18bf1fe511e577f9 - pullPolicy: Always -mcBackupImage: - repository: docker.io/itzg/mc-backup - tag: latest@sha256:11d38fb3f08e677f98d1d95c032a50c37a1737c2893564fc12492abae082555e - pullPolicy: Always service: main: @@ -74,17 +74,14 @@ service: rcon: enabled: true port: 25575 - -mcbackup: - zstd_params: - - --long=25 - - --single-thread - # comma separated list - excludes: - - "*.jar" - - "cache" - - "logs" - - "*.tmp" + ssh: + enabled: true + ports: + ssh: + enabled: true + protocol: tcp + targetPort: 2222 + port: 2222 workload: main: @@ -113,6 +110,7 @@ workload: QUERY_PORT: "{{ .Values.service.main.ports.query.port }}" RCON_PORT: "{{ .Values.service.rcon.ports.rcon.port }}" ENABLE_QUERY: "true" + ENABLE_SSH: "false" EULA: "TRUE" GUI: "FALSE" OVERRIDE_SERVER_PROPERTIES: true @@ -195,50 +193,8 @@ workload: # CF_OVERRIDES_SKIP_EXISTING # CF_PARALLEL_DOWNLOADS # CF_SET_LEVEL_FROM - mcbackup: - enabled: true - imageSelector: mcBackupImage - probes: - liveness: - enabled: false - readiness: - enabled: false - startup: - enabled: false - env: - BACKUP_METHOD: "tar" - DEST_DIR: "{{.Values.persistence.backups.mountPath }}" - SRC_DIR: "{{.Values.persistence.data.mountPath }}" - SERVER_PORT: "{{ .Values.service.main.ports.main.port }}" - RCON_HOST: '{{ printf "%s-rcon" (include "tc.v1.common.lib.chart.names.fullname" $) }}' - RCON_PORT: "{{ .Values.service.rcon.ports.rcon.port }}" - RCON_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.RCON_PASSWORD }}" - SERVER_HOST: '{{ include "tc.v1.common.lib.chart.names.fullname" $ }}' - - ZSTD_PARAMETERS: '{{ join " " .Values.mcbackup.zstd_params }}' - EXCLUDES: '{{ join "," .Values.mcbackup.excludes }}' - - INITIAL_DELAY: "2m" - BACKUP_INTERVAL: "24h" - PRUNE_BACKUPS_DAYS: "7" - PAUSE_IF_NO_PLAYERS: "false" - PLAYERS_ONLINE_CHECK_INTERVAL: "5m" - LINK_LATEST: "false" - TAR_COMPRESS_METHOD: "zstd" persistence: data: enabled: true - targetSelector: - main: - main: - mountPath: /data - mcbackup: - mountPath: /data - readOnly: true - backups: - enabled: true - targetSelector: - main: - mcbackup: - mountPath: /backups + mountPath: /data