From f1174d6be984e264c8e0e81e1fa64320e2425cd0 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Fri, 24 Nov 2023 14:05:53 -0500 Subject: [PATCH] chore(minecraft-java) update images to latest and fix image references. (#15289) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Update images, fix references, and add java21. ⚒️ Fixes #14687 **⚙️ Type of change** - [X] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** This is a non breaking update for most users; java20 is removed and replaced with java21. **✔️ 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 - [ ] ⚠️ 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 opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ 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._ --- charts/stable/minecraft-java/Chart.yaml | 4 +- .../minecraft-java/ci/j17gce-values.yaml | 1 - .../minecraft-java/ci/j17graalvm-values.yaml | 1 + .../minecraft-java/ci/j20alpine-values.yaml | 1 - .../ci/{j20-values.yaml => j21-values.yaml} | 0 .../minecraft-java/ci/j21alpine-values.yaml | 1 + .../minecraft-java/ci/j21graalvm-values.yaml | 1 + .../minecraft-java/ci/j8gce-values.yaml | 4 -- .../minecraft-java/ci/j8graalvm-values.yaml | 4 ++ charts/stable/minecraft-java/questions.yaml | 20 +++++---- charts/stable/minecraft-java/values.yaml | 43 +++++++++++-------- 11 files changed, 44 insertions(+), 36 deletions(-) delete mode 100644 charts/stable/minecraft-java/ci/j17gce-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17graalvm-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j20alpine-values.yaml rename charts/stable/minecraft-java/ci/{j20-values.yaml => j21-values.yaml} (100%) create mode 100644 charts/stable/minecraft-java/ci/j21alpine-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j21graalvm-values.yaml delete mode 100644 charts/stable/minecraft-java/ci/j8gce-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j8graalvm-values.yaml diff --git a/charts/stable/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml index b2a6405ef01..0f3f490af26 100644 --- a/charts/stable/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "2023.8.3" +appVersion: "2023.11.1" dependencies: - name: common repository: https://library-charts.truecharts.org @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/minecraft-java - https://github.com/itzg/docker-minecraft-server type: application -version: 5.0.11 +version: 5.1.0 annotations: truecharts.org/category: games truecharts.org/SCALE-support: "true" diff --git a/charts/stable/minecraft-java/ci/j17gce-values.yaml b/charts/stable/minecraft-java/ci/j17gce-values.yaml deleted file mode 100644 index 8e877003c8f..00000000000 --- a/charts/stable/minecraft-java/ci/j17gce-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j17gceImage diff --git a/charts/stable/minecraft-java/ci/j17graalvm-values.yaml b/charts/stable/minecraft-java/ci/j17graalvm-values.yaml new file mode 100644 index 00000000000..492626d5bac --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17graalvm-values.yaml @@ -0,0 +1 @@ +imageSelector: j17graalvmImage diff --git a/charts/stable/minecraft-java/ci/j20alpine-values.yaml b/charts/stable/minecraft-java/ci/j20alpine-values.yaml deleted file mode 100644 index d0e64bdfab1..00000000000 --- a/charts/stable/minecraft-java/ci/j20alpine-values.yaml +++ /dev/null @@ -1 +0,0 @@ -imageSelector: j20AlpineImage diff --git a/charts/stable/minecraft-java/ci/j20-values.yaml b/charts/stable/minecraft-java/ci/j21-values.yaml similarity index 100% rename from charts/stable/minecraft-java/ci/j20-values.yaml rename to charts/stable/minecraft-java/ci/j21-values.yaml diff --git a/charts/stable/minecraft-java/ci/j21alpine-values.yaml b/charts/stable/minecraft-java/ci/j21alpine-values.yaml new file mode 100644 index 00000000000..8a0696bc72f --- /dev/null +++ b/charts/stable/minecraft-java/ci/j21alpine-values.yaml @@ -0,0 +1 @@ +imageSelector: j21AlpineImage diff --git a/charts/stable/minecraft-java/ci/j21graalvm-values.yaml b/charts/stable/minecraft-java/ci/j21graalvm-values.yaml new file mode 100644 index 00000000000..a3cdf0cef18 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j21graalvm-values.yaml @@ -0,0 +1 @@ +imageSelector: j21GraalvmImage diff --git a/charts/stable/minecraft-java/ci/j8gce-values.yaml b/charts/stable/minecraft-java/ci/j8gce-values.yaml deleted file mode 100644 index 12c9a724a24..00000000000 --- a/charts/stable/minecraft-java/ci/j8gce-values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -imageSelector: j8gceImage - -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 new file mode 100644 index 00000000000..e281f94407b --- /dev/null +++ b/charts/stable/minecraft-java/ci/j8graalvm-values.yaml @@ -0,0 +1,4 @@ +imageSelector: j8graalvmImage + +env: + VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml index 2139c549c41..a7176cf1358 100644 --- a/charts/stable/minecraft-java/questions.yaml +++ b/charts/stable/minecraft-java/questions.yaml @@ -16,28 +16,30 @@ questions: default: image enum: - value: image - description: Java 17 HotSpot - - value: j20Image - description: Java 20 HotSpot - - value: j20AlpineImage - description: Java 20 Alpine + description: Java 17 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: j17jdkImage description: Java 17 JDK - - value: j17gceImage - description: Java 17 GraalVM CE + - value: j17graalvmImage + description: Java 17 Graalvm - value: j17alpineImage description: Java 17 Alpine - value: j11jdkImage description: Java 11 JDK - value: j11Image - description: Java 11 HotSpot + description: Java 11 Hotspot - value: j11j9Image description: Java 11 OpenJ9 - value: j8Image description: Java 8 HotSpot - - value: j8gceImage + - value: j8graalvmImage description: Java 8 GraalVM CE - value: j8jdkImage description: Java 8 JDK diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml index 3edaa4e3973..7a6baa5f044 100644 --- a/charts/stable/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -1,59 +1,64 @@ image: repository: itzg/minecraft-server - tag: 2023.8.3@sha256:2af12eac3a7106882e23d1b2435358db841c4302d213532e415255fbbd36c826 + tag: 2023.8.3@sha256:cb98ad8c143ab0cf83351ec6a9fd76256152f7b310988f9aa1acfaaf4aacbc77 pullPolicy: Always -j20Image: +j21Image: repository: itzg/minecraft-server - tag: 2023.8.3-java20@sha256:29023fbcfd3a36ae403f9879c780090ba63109525af901dddf249e544cafecef + tag: 2023.11.1-java21@sha256:312de713187f40206d2433f6c76c4f1f5efe993dcf7c0f842b8a7e0274bd5edd pullPolicy: Always -j20AlpineImage: +j21graalvmImage: repository: itzg/minecraft-server - tag: 2023.8.3-java20-alpine@sha256:2f005c2417abd30b66c640fae0953a687550256bc1e18e59d90800311338e8a9 + tag: 2023.11.1-java21-graalvm@sha256:49d25c5aa26dd67326f4626ae015dcf5033ed6e9178587dce915a04b16de6ac0 + pullPolicy: Always +j21alpineImage: + repository: itzg/minecraft-server + tag: 2023.11.1-java21-alpine@sha256:18c2c81eff7ce4a630b676f99223fcb8aa20c525f3b8ae1cd6fbf612d5d39cf0 pullPolicy: Always j17j9Image: repository: itzg/minecraft-server - tag: 2023.8.3-java17-openj9@sha256:1598bacb87b18984257501acbc8fb3d6babbd4a1c4dd188f0877fc3e600f3fdd + tag: 2023.11.1-java17-openj9@sha256:6e3078b58bb3728c0ccdf18402712faab39624cfcc24a72ef237d31579fd2bdc pullPolicy: Always j17jdkImage: repository: itzg/minecraft-server - tag: 2023.8.2-java17-jdk@sha256:e2d7c26bad68318d0f3f08c405455cbb6372f5df352bc7d11c62a14119b7d76a + tag: 2023.11.1-java17-jdk@sha256:e8ddd3a22c01937554332dae55bce53a0149740ccf22a6105138126382dfee38 pullPolicy: Always -j17gceImage: +j17graalvmImage: repository: itzg/minecraft-server - tag: 2023.8.3-java17-graalvm-ce@sha256:9e7a9b67db056ae94eb3dd98b6d02b86112638dd306747090a77766ca0e01447 + tag: 2023.11.1-java17-graalvm@sha256:1ede29fa5a96bd278d64400f548dde321c7c0762922c1097f17ba5c6a6f047f6 pullPolicy: Always j17alpineImage: repository: itzg/minecraft-server - tag: 2023.8.2-java17-alpine@sha256:7035083e6b0e7c77c0bff1601ad061eb35547621933fc070af831ee8d10b665f + tag: 2023.11.1-java17-alpine@sha256:c330401db62f07fbf447eef1c269394e8690d6b659f679821315f5c4c6463849 pullPolicy: Always j11Image: repository: itzg/minecraft-server - tag: 2023.8.3-java11@sha256:536223fac6f3c576907ea22640124942094b87bf94edabb1f106218d90274374 + tag: 2023.11.1-java11@sha256:749a17891fb0a2b211062fc2d7a3dd97e0fc76e71e9a908906ec8310cc8aaf95 pullPolicy: Always j11jdkImage: repository: itzg/minecraft-server - tag: 2023.8.3-java11-jdk@sha256:13c6f5ccce16d7d599bd3bce355209c39714eab9b7f93701b4ce11627e38031b + tag: 2023.11.1-java11-jdk@sha256:d8167b33d2da2d8f5ca1e41b9a170c07561b59497b4206140796ba2e98569a2a pullPolicy: Always j11j9Image: repository: itzg/minecraft-server - tag: 2023.8.2-java11-openj9@sha256:02df151227425a530102e88caea1a0f12f52fea94682a451d7a150279d8dafe0 + tag: 2023.11.1-java11-openj9@sha256:f327ea42b512896544fc7b44f1029d311ebf79312863a2ceb909ea6570ccf410 pullPolicy: Always j8Image: repository: itzg/minecraft-server - tag: 2023.8.3-java8@sha256:caba3fd4044ea240a859d7c63a50a278dbd6f4163bf50b922aa36e4109b8023f + tag: 2023.11.1-java8@sha256:cf744e3945c3a3c3dd4c4f98e639f9b959c73d6766217dda42fdf91fc9f80b27 pullPolicy: Always -j8gceImage: +j8graalvmImage: repository: itzg/minecraft-server - tag: 2023.8.3-java8-graalvm-ce@sha256:bc4b660b13f99398c21b83915034e640a8c6ee5021f6fb34e1a8b091cada8d97 + tag: 2023.11.1-java8-graalvm-ce@sha256:8a878a24266f5d6c8d448b28f8c8bcc6d167cc5f5c10e629913c9a58db0d7cad pullPolicy: Always j8jdkImage: repository: itzg/minecraft-server - tag: 2023.8.3-java8-jdk@sha256:eaec7a499b74c084a1a390a79fa2d88fef08ca39f9bb0e5c31a2943a3025f91c + tag: 2023.11.1-java8-jdk@sha256:3810bf10ff4f637851a950c47b2c4eb6de377b3afdde25ebcb16d263f536c6dd pullPolicy: Always j8j9Image: repository: itzg/minecraft-server - tag: 2023.8.3-java8-openj9@sha256:fc05cd0ae9b37a638e2549001d951c662b359a355e3c6ba28d7e0454e71b14cd + tag: 2023.11.1-java8-openj9@sha256:076c6a872b241df47580064171e67ff6d9b1826134169fe4201c5cedd3456f58 pullPolicy: Always + service: main: enabled: true @@ -72,6 +77,7 @@ service: rcon: enabled: true port: 25575 + workload: main: podSpec: @@ -188,4 +194,3 @@ persistence: portal: open: enabled: false -updated: true