From d00d546063da8bc7fed40745cbeb0a8288c2949f Mon Sep 17 00:00:00 2001 From: xstar97 <9399967+xstar97@users.noreply.github.com> Date: Fri, 3 Feb 2023 18:39:18 -0500 Subject: [PATCH] fix(minecraft-java) add USE_AIKAR_FLAGS and more tags to gui. (#6701) * fix(minecraft-java) add USE_AIKAR_FLAGS * remove text and added additional flags * update ci * add additional tags * add proebs * lint --------- 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-java/Chart.yaml | 1 + .../stable/minecraft-java/ci/base-values.yaml | 1 + .../stable/minecraft-java/ci/j11-values.yaml | 5 +- .../minecraft-java/ci/j11j9-values.yaml | 5 +- .../minecraft-java/ci/j11jdk-values.yaml | 4 + .../minecraft-java/ci/j17alpine-values.yaml | 1 + .../minecraft-java/ci/j17gce-values.yaml | 1 + .../minecraft-java/ci/j17j9-values.yaml | 1 + .../minecraft-java/ci/j17jdk-values.yaml | 1 + .../stable/minecraft-java/ci/j19-values.yaml | 1 + .../stable/minecraft-java/ci/j8-values.yaml | 5 +- .../minecraft-java/ci/j8gce-values.yaml | 4 + .../stable/minecraft-java/ci/j8j9-values.yaml | 5 +- .../minecraft-java/ci/j8jdk-values.yaml | 4 + charts/stable/minecraft-java/questions.yaml | 76 +++++++++++++------ charts/stable/minecraft-java/values.yaml | 70 +++++++++++++++-- 16 files changed, 141 insertions(+), 44 deletions(-) create mode 100644 charts/stable/minecraft-java/ci/j11jdk-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17alpine-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17gce-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17j9-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j17jdk-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j19-values.yaml create mode 100644 charts/stable/minecraft-java/ci/j8gce-values.yaml create 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 90b07c3a7ff..1f98abf51c9 100644 --- a/charts/stable/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -9,6 +9,7 @@ description: Minecraft Java Dedicated Server home: https://truecharts.org/charts/stable/minecraft-java icon: https://truecharts.org/img/hotlink-ok/chart-icons/minecraft-java.png keywords: + - minecraft-java - minecraft kubeVersion: ">=1.16.0-0" maintainers: diff --git a/charts/stable/minecraft-java/ci/base-values.yaml b/charts/stable/minecraft-java/ci/base-values.yaml index e69de29bb2d..7e36603e844 100644 --- a/charts/stable/minecraft-java/ci/base-values.yaml +++ b/charts/stable/minecraft-java/ci/base-values.yaml @@ -0,0 +1 @@ +imageSelector: image diff --git a/charts/stable/minecraft-java/ci/j11-values.yaml b/charts/stable/minecraft-java/ci/j11-values.yaml index 5b3be4b4e80..cf828e29004 100644 --- a/charts/stable/minecraft-java/ci/j11-values.yaml +++ b/charts/stable/minecraft-java/ci/j11-values.yaml @@ -1,7 +1,4 @@ -image: - repository: tccr.io/truecharts/minecraft-java11 - tag: latest@sha256:a805a7f326987c4f32bf1a9d16e2e2a6c0bd43c86bce325bd81a36c582fad02b - pullPolicy: Always +imageSelector: j11Image env: VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j11j9-values.yaml b/charts/stable/minecraft-java/ci/j11j9-values.yaml index e7ba3873311..765eb5347f4 100644 --- a/charts/stable/minecraft-java/ci/j11j9-values.yaml +++ b/charts/stable/minecraft-java/ci/j11j9-values.yaml @@ -1,7 +1,4 @@ -image: - repository: tccr.io/truecharts/minecraft-java11-openj9 - tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4 - pullPolicy: Always +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 new file mode 100644 index 00000000000..591c51cb26f --- /dev/null +++ b/charts/stable/minecraft-java/ci/j11jdk-values.yaml @@ -0,0 +1,4 @@ +imageSelector: j11jdkImage + +env: + VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j17alpine-values.yaml b/charts/stable/minecraft-java/ci/j17alpine-values.yaml new file mode 100644 index 00000000000..d9322e395ba --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17alpine-values.yaml @@ -0,0 +1 @@ +imageSelector: j17alpineImage diff --git a/charts/stable/minecraft-java/ci/j17gce-values.yaml b/charts/stable/minecraft-java/ci/j17gce-values.yaml new file mode 100644 index 00000000000..8e877003c8f --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17gce-values.yaml @@ -0,0 +1 @@ +imageSelector: j17gceImage diff --git a/charts/stable/minecraft-java/ci/j17j9-values.yaml b/charts/stable/minecraft-java/ci/j17j9-values.yaml new file mode 100644 index 00000000000..47136ca5609 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17j9-values.yaml @@ -0,0 +1 @@ +imageSelector: j17j9Image diff --git a/charts/stable/minecraft-java/ci/j17jdk-values.yaml b/charts/stable/minecraft-java/ci/j17jdk-values.yaml new file mode 100644 index 00000000000..6e2b2dec9a8 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j17jdk-values.yaml @@ -0,0 +1 @@ +imageSelector: j17jdkImage diff --git a/charts/stable/minecraft-java/ci/j19-values.yaml b/charts/stable/minecraft-java/ci/j19-values.yaml new file mode 100644 index 00000000000..d0d16a07bab --- /dev/null +++ b/charts/stable/minecraft-java/ci/j19-values.yaml @@ -0,0 +1 @@ +imageSelector: j19Image diff --git a/charts/stable/minecraft-java/ci/j8-values.yaml b/charts/stable/minecraft-java/ci/j8-values.yaml index dd75bd4f564..ac0a59552aa 100644 --- a/charts/stable/minecraft-java/ci/j8-values.yaml +++ b/charts/stable/minecraft-java/ci/j8-values.yaml @@ -1,7 +1,4 @@ -image: - repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206 - pullPolicy: Always +imageSelector: j8Image env: VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/ci/j8gce-values.yaml b/charts/stable/minecraft-java/ci/j8gce-values.yaml new file mode 100644 index 00000000000..12c9a724a24 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j8gce-values.yaml @@ -0,0 +1,4 @@ +imageSelector: j8gceImage + +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 index e7ba3873311..638cf0b934f 100644 --- a/charts/stable/minecraft-java/ci/j8j9-values.yaml +++ b/charts/stable/minecraft-java/ci/j8j9-values.yaml @@ -1,7 +1,4 @@ -image: - repository: tccr.io/truecharts/minecraft-java11-openj9 - tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4 - pullPolicy: Always +imageSelector: j8j9Image 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 new file mode 100644 index 00000000000..ec1eb121141 --- /dev/null +++ b/charts/stable/minecraft-java/ci/j8jdk-values.yaml @@ -0,0 +1,4 @@ +imageSelector: j8jdkImage + +env: + VERSION: "1.16.1" diff --git a/charts/stable/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml index 301d608e5ac..6fe5c015945 100644 --- a/charts/stable/minecraft-java/questions.yaml +++ b/charts/stable/minecraft-java/questions.yaml @@ -11,12 +11,28 @@ questions: enum: - value: image description: Java 17 HotSpot + - value: j19Image + description: Java 19 HotSpot + - value: j17j9Image + description: Java 17 OpenJ9 + - value: j17jdkImage + description: Java 17 JDK + - value: j17gceImage + description: Java 17 GraalVM CE + - value: j17alpineImage + description: Java 17 Hotspot(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: j8gceImage + description: Java 8 GraalVM CE + - value: j8jdkImage + description: Java 8 JDK - value: j8j9Image description: Java 8 OpenJ9 # Include{controller} @@ -45,19 +61,20 @@ questions: type: dict attrs: - variable: EULA - label: Minecraft Eula - Link in readme sources + label: Minecraft Eula schema: type: boolean required: true default: false - variable: OVERRIDE_SERVER_PROPERTIES label: Override Server Properties - description: Enable this so RCON_PASSWORD will always have effect. + description: Enable this to automatically manage the server.properties in the GUI. schema: type: boolean default: false - variable: VERSION - label: Minecraft Version - LATEST, SNAPSHOT, or verison + label: Minecraft Version + description: Set the Minecraft Version - LATEST, SNAPSHOT, or specific version. schema: type: string required: true @@ -354,32 +371,33 @@ questions: required: true default: 10000 - variable: ALLOW_NETHER - label: Enable/Disable Nether + label: Enable Nether schema: type: boolean default: true - variable: ANNOUNCE_PLAYER_ACHIEVEMENTS - label: Enable/Disable Announceing Player Achievements + label: Enable Announcing Player Achievements schema: type: boolean default: true - variable: ENABLE_COMMAND_BLOCK - label: Enable/Disable Command Blocks + label: Enable Command Blocks schema: type: boolean default: false - variable: FORCE_GAMEMODE - label: Enable/Disable Force Gamemode + label: Enable Force Game Mode schema: type: boolean default: false - variable: GENERATE_STRUCTURES - label: Enable/Disable Generate Structures + label: Enable Generate Structures schema: type: boolean default: true - variable: HARDCORE - label: Enable/Disable Hardcore Mode + label: Enable Hardcore Mode + description: If set to true, players will be set to spectator mode if they die. schema: type: boolean default: false @@ -396,17 +414,17 @@ questions: required: true default: 60000 - variable: SPAWN_ANIMALS - label: Enable/Disable Spawning Animals + label: Enable Spawning Animals schema: type: boolean default: true - variable: SPAWN_MONSTERS - label: Enable/Disable Spawning Monsters + label: Enable Spawning Monsters schema: type: boolean default: true - variable: SPAWN_NPCS - label: Enable/Disable Spawning NPCs + label: Enable Spawning NPCs schema: type: boolean default: true @@ -442,7 +460,7 @@ questions: type: string default: Welcome to Minecraft on TrueNAS Scale! - variable: PVP - label: Enable/Disable PVP + label: Enable PVP schema: type: boolean default: false @@ -480,10 +498,28 @@ questions: - value: "true" description: "True" - variable: ONLINE_MODE - label: Enable/Disable Online Mode + label: Enable Online Mode schema: type: boolean default: true + - variable: USE_FLARE_FLAGS + label: Use Flare Flags + description: Enable to add appropriate flags for the Flare profiler on selected server types - https://github.com/itzg/docker-minecraft-server#enable-flare-flags + schema: + type: boolean + default: false + - variable: USE_AIKAR_FLAGS + label: Use Aikar Flags + description: Optimal JVM flags for GC tuning. + schema: + type: boolean + default: true + - variable: USE_SIMD_FLAGS + label: Use SIMD Flags + description: Enable support for optimized SIMD operations. + schema: + type: boolean + default: false - variable: advanced label: Show Advanced Server Settings schema: @@ -502,12 +538,6 @@ questions: schema: type: string default: "" - - variable: USE_FLARE_FLAGS - label: Enable to add appropriate flags for the Flare profiler - description: "Only select server types can use these flags. please checkout the upstream project for more info -> https://github.com/itzg/docker-minecraft-server#enable-flare-flags" - schema: - type: boolean - default: false - variable: JVM_XX_OPTS label: JVM -X Options schema: @@ -517,7 +547,7 @@ questions: # Include{serviceRoot} - variable: main label: Main Service - description: The Primary service on which the healthcheck runs, often the webUI + description: The Primary service on which the Minecraft Server runs on schema: additional_attrs: true type: dict @@ -539,7 +569,7 @@ questions: required: true - variable: rcon label: RCON Service - description: The Primary service on which the healthcheck runs, often the webUI + description: The RCON service. schema: additional_attrs: true type: dict @@ -566,7 +596,7 @@ questions: # Include{persistenceRoot} - variable: data label: App Data Storage - description: Stores the Application Configuration. + description: Stores the Application Data. schema: additional_attrs: true type: dict diff --git a/charts/stable/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml index 988d842db7f..15c3407ac3b 100644 --- a/charts/stable/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -2,23 +2,57 @@ image: repository: tccr.io/truecharts/minecraft-java tag: 2022.16.0@sha256:4383ccf13cc03c19b5dad37d2fbadff9e37dac0b62275f555e55c8a071db6a32 pullPolicy: Always +j19Image: + repository: tccr.io/truecharts/minecraft-java19 + tag: latest@sha256:27458a02fe03d0189f22273d630b36625a0b3f065305e8bac377d6439a36fee1 + pullPolicy: Always +j17j9Image: + repository: tccr.io/truecharts/minecraft-java17-openj9 + tag: 2022.16.0@sha256:3fa728d5a9eb49c5042dbf00ec7379c03cc17ad7321a09e61184cfc22e195909 + pullPolicy: Always +j17jdkImage: + repository: tccr.io/truecharts/minecraft-java17-jdk + tag: 2022.16.0@sha256:7ee567e31b724b2717549865afd81cb49e0f283f1926e3f4451e3ba02ca4319e + pullPolicy: Always +j17gceImage: + repository: tccr.io/truecharts/minecraft-java17-graalvm-ce + tag: latest@sha256:33a60248da06c40c6181afa3dd1a588bd07e4550ce2288577fa035fae6b4335e + pullPolicy: Always +j17alpineImage: + repository: tccr.io/truecharts/minecraft-java17-alpine + tag: 2022.16.0@sha256:927920b484d67d66720e9b49de6346543c84b7dc80ae95102847e2c4d07f5250 + pullPolicy: Always j11Image: repository: tccr.io/truecharts/minecraft-java11 - tag: latest@sha256:a805a7f326987c4f32bf1a9d16e2e2a6c0bd43c86bce325bd81a36c582fad02b + tag: latest@sha256:6019e0f8346d3931fcd05b92260a73807bfdfefa512529695c3513941a212106 + pullPolicy: Always +j11jdkImage: + repository: tccr.io/truecharts/minecraft-java11-jdk + tag: 2022.16.0@sha256:b6c30dd4bb9351f0350688929c9a4703cfd7d6dd8a86f5b0b63bdc51f1a8d0f6 pullPolicy: Always j11j9Image: repository: tccr.io/truecharts/minecraft-java11-openj9 - tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4 + tag: 2022.16.0@sha256:3e47a0633f405d428798ea7f9dc97538c04597cc22ff920e5286307f608e468c pullPolicy: Always j8Image: - repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206 + repository: tccr.io/truecharts/minecraft-java8 + tag: latest@sha256:8a27e22566ed0698a4692314c32588fcd0216da8cd7c7a7924b7cead14f2ace7 + pullPolicy: Always +j8gceImage: + repository: tccr.io/truecharts/minecraft-java8-graalvm-ce + tag: latest@sha256:f6bbaa144fe201a733c01dc37f2cd1073839b32337503940f910dec26fc39858 + pullPolicy: Always +j8jdkImage: + repository: tccr.io/truecharts/minecraft-java8-jdk + tag: 2022.16.0@sha256:a3b6513a693f241bd20c0f2b0cd0a55d76d86dbc735338019c0fac32f7e11163 pullPolicy: Always j8j9Image: repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206 + tag: 2022.16.0@sha256:cf576f7b1dd5c46f0efc3018ae98fb512ba2efe186f5a7aa5d1fc09906f2d1cd pullPolicy: Always +imageSelector: image + securityContext: readOnlyRootFilesystem: false runAsNonRoot: false @@ -40,12 +74,36 @@ service: port: 25575 targetPort: 25575 +probes: + liveness: + enabled: true + custom: true + spec: + exec: + command: + - mc-health + readiness: + enabled: true + custom: true + spec: + exec: + command: + - mc-health + startup: + enabled: true + custom: true + spec: + exec: + command: + - mc-health + secretEnv: RCON_PASSWORD: "secretrconpass" env: SERVER_PORT: "{{ .Values.service.main.ports.main.port }}" EULA: "TRUE" + GUI: "FALSE" OVERRIDE_SERVER_PROPERTIES: true VERSION: "LATEST" TYPE: "VANILLA" @@ -111,6 +169,8 @@ env: # WORLD: "" # FORCE_REDOWNLOAD: false # USE_FLARE_FLAGS: false + # USE_AIKAR_FLAGS: true + # USE_SIMD_FLAGS: false # JVM_OPTS: "" # JVM_XX_OPTS: ""