From 17721ae247a465199ddbc695e6407193a4068b98 Mon Sep 17 00:00:00 2001 From: Jens Wolvers <13272708+JWolvers@users.noreply.github.com> Date: Wed, 22 May 2024 15:51:34 +0200 Subject: [PATCH] fix(minecraft-java): Add Folia to server types (#22332) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** This change adds Folia as a server type for the Minecraft-java Chart. **โš™๏ธ 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?** Manually created a custom Chart with the TYPE variable set to FOLIA **โœ”๏ธ 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 - [X] โš ๏ธ 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 - [X] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **โž• 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: Jens Wolvers <13272708+JWolvers@users.noreply.github.com> --- charts/stable/minecraft-java/Chart.yaml | 4 +- .../minecraft-java/ci/j11j9-values.yaml | 4 -- .../minecraft-java/ci/j11jdk-values.yaml | 4 -- .../stable/minecraft-java/ci/j17-values.yaml | 1 + .../minecraft-java/ci/j17j9-values.yaml | 1 - .../stable/minecraft-java/ci/j21-values.yaml | 2 +- .../minecraft-java/ci/j21alpine-values.yaml | 2 +- .../minecraft-java/ci/j21graalvm-values.yaml | 2 +- .../minecraft-java/ci/j8alpine-values.yaml | 4 ++ .../stable/minecraft-java/ci/j8j9-values.yaml | 4 -- charts/stable/minecraft-java/questions.yaml | 16 ++++---- charts/stable/minecraft-java/values.yaml | 40 ++++++++----------- 12 files changed, 33 insertions(+), 51 deletions(-) delete mode 100644 charts/stable/minecraft-java/ci/j11j9-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j11jdk-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j17j9-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j8alpine-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j8j9-values.yaml diff --git a/charts/stable/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml index 4c5a952478c..d9ec1905670 100644 --- a/charts/stable/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -7,7 +7,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2023.11.1 +appVersion: 2024.05.0 dependencies: - name: common version: 23.0.8 @@ -35,4 +35,4 @@ sources: - https://hub.docker.com/r/itzg/minecraft-server - https://hub.docker.com/r/itzg/mc-backup type: application -version: 9.0.7 +version: 9.0.8 diff --git a/charts/stable/minecraft-java/ci/j11j9-values.yaml b/charts/stable/minecraft-java/ci/j11j9-values.yaml deleted file mode 100644 index 765eb5347f4..00000000000 --- a/charts/stable/minecraft-java/ci/j11j9-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j11j9Image - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j11jdk-values.yaml b/charts/stable/minecraft-java/ci/j11jdk-values.yaml deleted file mode 100644 index 591c51cb26f..00000000000 --- a/charts/stable/minecraft-java/ci/j11jdk-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j11jdkImage - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j17-values.yaml b/charts/stable/minecraft-java/ci/j17-values.yaml new file mode 100644 index 00000000000..0d8bf2cec9e --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17-values.yaml @@ -0,0 +1 @@ +imageSelector: j17Image diff --git a/charts/stable/minecraft-java/ci/j17j9-values.yaml b/charts/stable/minecraft-java/ci/j17j9-values.yaml deleted file mode 100644 index 47136ca5609..00000000000 --- a/charts/stable/minecraft-java/ci/j17j9-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j17j9Image diff --git a/charts/stable/minecraft-java/ci/j21-values.yaml b/charts/stable/minecraft-java/ci/j21-values.yaml index c8592742355..0eee22ef329 100644 --- a/charts/stable/minecraft-java/ci/j21-values.yaml +++ b/charts/stable/minecraft-java/ci/j21-values.yaml @@ -1 +1 @@ -imageSelector: j20Image +imageSelector: j21Image diff --git a/charts/stable/minecraft-java/ci/j21alpine-values.yaml b/charts/stable/minecraft-java/ci/j21alpine-values.yaml index 8a0696bc72f..f18a714f94f 100644 --- a/charts/stable/minecraft-java/ci/j21alpine-values.yaml +++ b/charts/stable/minecraft-java/ci/j21alpine-values.yaml @@ -1 +1 @@ -imageSelector: j21AlpineImage +imageSelector: j21alpineImage diff --git a/charts/stable/minecraft-java/ci/j21graalvm-values.yaml b/charts/stable/minecraft-java/ci/j21graalvm-values.yaml index a3cdf0cef18..ff8755fe59b 100644 --- a/charts/stable/minecraft-java/ci/j21graalvm-values.yaml +++ b/charts/stable/minecraft-java/ci/j21graalvm-values.yaml @@ -1 +1 @@ -imageSelector: j21GraalvmImage +imageSelector: j21graalvmImage diff --git a/charts/stable/minecraft-java/ci/j8alpine-values.yaml b/charts/stable/minecraft-java/ci/j8alpine-values.yaml new file mode 100644 index 00000000000..996a2c2c4c0 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j8alpine-values.yaml @@ -0,0 +1,4 @@ +imageSelector: j8alpineImage + +env: + VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j8j9-values.yaml b/charts/stable/minecraft-java/ci/j8j9-values.yaml deleted file mode 100644 index 638cf0b934f..00000000000 --- a/charts/stable/minecraft-java/ci/j8j9-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j8j9Image - -env: - VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml index 4ba023bc1f9..8b4aaa85c73 100644 --- a/charts/stable/minecraft-java/questions.yaml +++ b/charts/stable/minecraft-java/questions.yaml @@ -15,35 +15,31 @@ questions: default: image enum: - value: image - description: Java 17 Hotspot + description: Java 21 Hotspot - value: j21Image description: Java 21 Hotspot - value: j21graalvmImage description: Java 21 Graalvm - value: j21alpineImage description: Java 21 Alpine - - value: j17j9Image - description: Java 17 OpenJ9 + - value: j17Image + description: Java 17 Hotspot - value: j17jdkImage description: Java 17 JDK - value: j17graalvmImage description: Java 17 Graalvm - value: j17alpineImage description: Java 17 Alpine - - value: j11jdkImage - description: Java 11 JDK - value: j11Image description: Java 11 Hotspot - - value: j11j9Image - description: Java 11 OpenJ9 - value: j8Image description: Java 8 HotSpot - value: j8graalvmImage description: Java 8 GraalVM CE - value: j8jdkImage description: Java 8 JDK - - value: j8j9Image - description: Java 8 OpenJ9 + - value: j8alpineImage + description: Java 8 Alpine - variable: env label: Image Environment schema: @@ -97,6 +93,8 @@ questions: description: Bukkit - value: PAPER description: Paper + - value: FOLIA + description: Folia - value: AIRPLANE description: Airplane - value: PURPUR diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml index 93e8b7a305f..60fd44d4f01 100644 --- a/charts/stable/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -1,66 +1,58 @@ image: repository: itzg/minecraft-server - tag: 2023.11.1@sha256:cb98ad8c143ab0cf83351ec6a9fd76256152f7b310988f9aa1acfaaf4aacbc77 + tag: 2024.5.0@sha256:1ff47453ce66194927313d628c32a485c34d0acc9c01c9dbd643584c50cf89e6 pullPolicy: Always j21Image: repository: itzg/minecraft-server - tag: 2023.11.1-java21@sha256:312de713187f40206d2433f6c76c4f1f5efe993dcf7c0f842b8a7e0274bd5edd + tag: 2024.5.0-java21@sha256:1ff47453ce66194927313d628c32a485c34d0acc9c01c9dbd643584c50cf89e6 pullPolicy: Always j21graalvmImage: repository: itzg/minecraft-server - tag: 2023.11.1-java21-graalvm@sha256:49d25c5aa26dd67326f4626ae015dcf5033ed6e9178587dce915a04b16de6ac0 + tag: 2024.5.0-java21-graalvm@sha256:497249e19a9d79b06381ae031ab6be707df9bfa570fbb3c243041e3b436c4bab pullPolicy: Always j21alpineImage: repository: itzg/minecraft-server - tag: 2023.11.1-java21-alpine@sha256:18c2c81eff7ce4a630b676f99223fcb8aa20c525f3b8ae1cd6fbf612d5d39cf0 + tag: 2024.5.0-java21-alpine@sha256:aa06626784a8d6932acec4e49ad319a42844527bacab0db0039a8a1093b62e7f pullPolicy: Always -j17j9Image: +j17Image: repository: itzg/minecraft-server - tag: 2023.11.1-java17-openj9@sha256:6e3078b58bb3728c0ccdf18402712faab39624cfcc24a72ef237d31579fd2bdc + tag: 2024.5.0-java17@sha256:10dad62a01e35a0eeba69e99f9c425ea0c190d19cf1aa35b9c8323819d884067 pullPolicy: Always j17jdkImage: repository: itzg/minecraft-server - tag: 2023.11.1-java17-jdk@sha256:e8ddd3a22c01937554332dae55bce53a0149740ccf22a6105138126382dfee38 + tag: 2024.5.0-java17-jdk@sha256:1ce891579630a5a42d0855a7e5b75f67fc56ed4479d68f675ae8ae8a6c1a658d pullPolicy: Always j17graalvmImage: repository: itzg/minecraft-server - tag: 2023.11.1-java17-graalvm@sha256:1ede29fa5a96bd278d64400f548dde321c7c0762922c1097f17ba5c6a6f047f6 + tag: 2024.5.0-java17-graalvm@sha256:201f19e4ec865a773133248412db7b19baac80975e865097eff30fee97df8472 pullPolicy: Always j17alpineImage: repository: itzg/minecraft-server - tag: 2023.11.1-java17-alpine@sha256:c330401db62f07fbf447eef1c269394e8690d6b659f679821315f5c4c6463849 + tag: 2024.5.0-java17-alpine@sha256:f5ff1496dbb72e38c7a9a8d17de09801547a673a5aeb4fcb2e0d2741d430c4a6 pullPolicy: Always j11Image: repository: itzg/minecraft-server - tag: 2023.11.1-java11@sha256:749a17891fb0a2b211062fc2d7a3dd97e0fc76e71e9a908906ec8310cc8aaf95 - pullPolicy: Always -j11jdkImage: - repository: itzg/minecraft-server - tag: 2023.11.1-java11-jdk@sha256:d8167b33d2da2d8f5ca1e41b9a170c07561b59497b4206140796ba2e98569a2a - pullPolicy: Always -j11j9Image: - repository: itzg/minecraft-server - tag: 2023.11.1-java11-openj9@sha256:f327ea42b512896544fc7b44f1029d311ebf79312863a2ceb909ea6570ccf410 + tag: 2024.5.0-java11@sha256:adc511e884945e206b0401a74e394dd4de8ae0f184e9029bd752e2a9c1041ed2 pullPolicy: Always j8Image: repository: itzg/minecraft-server - tag: 2023.11.1-java8@sha256:cf744e3945c3a3c3dd4c4f98e639f9b959c73d6766217dda42fdf91fc9f80b27 + tag: 2024.5.0-java8@sha256:2d0dab4bc81e0e20b35ff18208b27808e362100b6ab75c87b7ad395be01883f4 pullPolicy: Always j8graalvmImage: repository: itzg/minecraft-server - tag: 2023.11.1-java8-graalvm-ce@sha256:8a878a24266f5d6c8d448b28f8c8bcc6d167cc5f5c10e629913c9a58db0d7cad + tag: 2024.5.0-java8-graalvm-ce@sha256:5066dead723873a87344a606c973e825a39fd88993d0fb0ba408aba9cd7688a9 pullPolicy: Always j8jdkImage: repository: itzg/minecraft-server - tag: 2023.11.1-java8-jdk@sha256:3810bf10ff4f637851a950c47b2c4eb6de377b3afdde25ebcb16d263f536c6dd + tag: 2024.5.0-java8-jdk@sha256:36517180605128ffa1aae846ffcd3902e5fd480b599dc3c175a08559334e352a pullPolicy: Always -j8j9Image: +j8alpineImage: repository: itzg/minecraft-server - tag: 2023.11.1-java8-openj9@sha256:076c6a872b241df47580064171e67ff6d9b1826134169fe4201c5cedd3456f58 + tag: 2024.5.0-java8-alpine@sha256:33f47910edf341758f5a18e233f3e185ac3ea6a2765462749ff25a1d8dbeded4 pullPolicy: Always mcBackupImage: repository: itzg/mc-backup - tag: latest@sha256:db4562d32f37fcf934e1bd42c475081e07a6f181b8318d9b706e0ad692f945f1 + tag: latest@sha256:8b6b0534d9231800295e1e246f51edbe0c5d62bace328da2bfd12c702451c38a pullPolicy: Always service: