Cloned2Preserve
/
TrueChartsClone
mirror of https://github.com/truecharts/charts.git
1
0
Fork 0
Code

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>
This commit is contained in:
xstar97 2023-02-03 18:39:18 -05:00 committed by GitHub
parent c30fdc33f4
commit d00d546063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 141 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charts/stable/minecraft-java/Chart.yaml
View File

@ -9,6 +9,7 @@ description: Minecraft Java Dedicated Server
home: https://truecharts.org/charts/stable/minecraft-java home: https://truecharts.org/charts/stable/minecraft-java
icon: https://truecharts.org/img/hotlink-ok/chart-icons/minecraft-java.png icon: https://truecharts.org/img/hotlink-ok/chart-icons/minecraft-java.png
keywords: keywords:
- minecraft-java
- minecraft - minecraft
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
maintainers: maintainers:

1
charts/stable/minecraft-java/ci/base-values.yaml
View File

@ -0,0 +1 @@
imageSelector: image

5
charts/stable/minecraft-java/ci/j11-values.yaml
View File

@ -1,7 +1,4 @@
image: imageSelector: j11Image
repository: tccr.io/truecharts/minecraft-java11
tag: latest@sha256:a805a7f326987c4f32bf1a9d16e2e2a6c0bd43c86bce325bd81a36c582fad02b
pullPolicy: Always
env: env:
VERSION: "1.16.1" VERSION: "1.16.1"

5
charts/stable/minecraft-java/ci/j11j9-values.yaml
View File

@ -1,7 +1,4 @@
image: imageSelector: j11j9Image
repository: tccr.io/truecharts/minecraft-java11-openj9
tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4
pullPolicy: Always
env: env:
VERSION: "1.16.1" VERSION: "1.16.1"

4
charts/stable/minecraft-java/ci/j11jdk-values.yaml Normal file
View File

@ -0,0 +1,4 @@
imageSelector: j11jdkImage
env:
VERSION: "1.16.1"

1
charts/stable/minecraft-java/ci/j17alpine-values.yaml Normal file
View File

@ -0,0 +1 @@
imageSelector: j17alpineImage

1
charts/stable/minecraft-java/ci/j17gce-values.yaml Normal file
View File

@ -0,0 +1 @@
imageSelector: j17gceImage

1
charts/stable/minecraft-java/ci/j17j9-values.yaml Normal file
View File

@ -0,0 +1 @@
imageSelector: j17j9Image

1
charts/stable/minecraft-java/ci/j17jdk-values.yaml Normal file
View File

@ -0,0 +1 @@
imageSelector: j17jdkImage

1
charts/stable/minecraft-java/ci/j19-values.yaml Normal file
View File

@ -0,0 +1 @@
imageSelector: j19Image

5
charts/stable/minecraft-java/ci/j8-values.yaml
View File

@ -1,7 +1,4 @@
image: imageSelector: j8Image
repository: tccr.io/truecharts/minecraft-java8-openj9
tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206
pullPolicy: Always
env: env:
VERSION: "1.16.1" VERSION: "1.16.1"

4
charts/stable/minecraft-java/ci/j8gce-values.yaml Normal file
View File

@ -0,0 +1,4 @@
imageSelector: j8gceImage
env:
VERSION: "1.16.1"

5
charts/stable/minecraft-java/ci/j8j9-values.yaml
View File

@ -1,7 +1,4 @@
image: imageSelector: j8j9Image
repository: tccr.io/truecharts/minecraft-java11-openj9
tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4
pullPolicy: Always
env: env:
VERSION: "1.16.1" VERSION: "1.16.1"

4
charts/stable/minecraft-java/ci/j8jdk-values.yaml Normal file
View File

@ -0,0 +1,4 @@
imageSelector: j8jdkImage
env:
VERSION: "1.16.1"

76
charts/stable/minecraft-java/questions.yaml
View File

@ -11,12 +11,28 @@ questions:
enum: enum:
- value: image - value: image
description: Java 17 HotSpot 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 - value: j11Image
description: Java 11 HotSpot description: Java 11 HotSpot
- value: j11j9Image - value: j11j9Image
description: Java 11 OpenJ9 description: Java 11 OpenJ9
- value: j8Image - value: j8Image
description: Java 8 HotSpot description: Java 8 HotSpot
- value: j8gceImage
description: Java 8 GraalVM CE
- value: j8jdkImage
description: Java 8 JDK
- value: j8j9Image - value: j8j9Image
description: Java 8 OpenJ9 description: Java 8 OpenJ9
# Include{controller} # Include{controller}
@ -45,19 +61,20 @@ questions:
type: dict type: dict
attrs: attrs:
- variable: EULA - variable: EULA
label: Minecraft Eula - Link in readme sources label: Minecraft Eula
schema: schema:
type: boolean type: boolean
required: true required: true
default: false default: false
- variable: OVERRIDE_SERVER_PROPERTIES - variable: OVERRIDE_SERVER_PROPERTIES
label: 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: schema:
type: boolean type: boolean
default: false default: false
- variable: VERSION - variable: VERSION
label: Minecraft Version - LATEST, SNAPSHOT, or verison label: Minecraft Version
description: Set the Minecraft Version - LATEST, SNAPSHOT, or specific version.
schema: schema:
type: string type: string
required: true required: true
@ -354,32 +371,33 @@ questions:
required: true required: true
default: 10000 default: 10000
- variable: ALLOW_NETHER - variable: ALLOW_NETHER
label: Enable/Disable Nether label: Enable Nether
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: ANNOUNCE_PLAYER_ACHIEVEMENTS - variable: ANNOUNCE_PLAYER_ACHIEVEMENTS
label: Enable/Disable Announceing Player Achievements label: Enable Announcing Player Achievements
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: ENABLE_COMMAND_BLOCK - variable: ENABLE_COMMAND_BLOCK
label: Enable/Disable Command Blocks label: Enable Command Blocks
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: FORCE_GAMEMODE - variable: FORCE_GAMEMODE
label: Enable/Disable Force Gamemode label: Enable Force Game Mode
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: GENERATE_STRUCTURES - variable: GENERATE_STRUCTURES
label: Enable/Disable Generate Structures label: Enable Generate Structures
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: HARDCORE - 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: schema:
type: boolean type: boolean
default: false default: false
@ -396,17 +414,17 @@ questions:
required: true required: true
default: 60000 default: 60000
- variable: SPAWN_ANIMALS - variable: SPAWN_ANIMALS
label: Enable/Disable Spawning Animals label: Enable Spawning Animals
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: SPAWN_MONSTERS - variable: SPAWN_MONSTERS
label: Enable/Disable Spawning Monsters label: Enable Spawning Monsters
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: SPAWN_NPCS - variable: SPAWN_NPCS
label: Enable/Disable Spawning NPCs label: Enable Spawning NPCs
schema: schema:
type: boolean type: boolean
default: true default: true
@ -442,7 +460,7 @@ questions:
type: string type: string
default: Welcome to Minecraft on TrueNAS Scale! default: Welcome to Minecraft on TrueNAS Scale!
- variable: PVP - variable: PVP
label: Enable/Disable PVP label: Enable PVP
schema: schema:
type: boolean type: boolean
default: false default: false
@ -480,10 +498,28 @@ questions:
- value: "true" - value: "true"
description: "True" description: "True"
- variable: ONLINE_MODE - variable: ONLINE_MODE
label: Enable/Disable Online Mode label: Enable Online Mode
schema: schema:
type: boolean type: boolean
default: true 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 - variable: advanced
label: Show Advanced Server Settings label: Show Advanced Server Settings
schema: schema:
@ -502,12 +538,6 @@ questions:
schema: schema:
type: string type: string
default: "" 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 - variable: JVM_XX_OPTS
label: JVM -X Options label: JVM -X Options
schema: schema:
@ -517,7 +547,7 @@ questions:
# Include{serviceRoot} # Include{serviceRoot}
- variable: main - variable: main
label: Main Service 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: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@ -539,7 +569,7 @@ questions:
required: true required: true
- variable: rcon - variable: rcon
label: RCON Service label: RCON Service
description: The Primary service on which the healthcheck runs, often the webUI description: The RCON service.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@ -566,7 +596,7 @@ questions:
# Include{persistenceRoot} # Include{persistenceRoot}
- variable: data - variable: data
label: App Data Storage label: App Data Storage
description: Stores the Application Configuration. description: Stores the Application Data.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict

70
charts/stable/minecraft-java/values.yaml
View File

@ -2,23 +2,57 @@ image:
repository: tccr.io/truecharts/minecraft-java repository: tccr.io/truecharts/minecraft-java
tag: 2022.16.0@sha256:4383ccf13cc03c19b5dad37d2fbadff9e37dac0b62275f555e55c8a071db6a32 tag: 2022.16.0@sha256:4383ccf13cc03c19b5dad37d2fbadff9e37dac0b62275f555e55c8a071db6a32
pullPolicy: Always 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: j11Image:
repository: tccr.io/truecharts/minecraft-java11 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 pullPolicy: Always
j11j9Image: j11j9Image:
repository: tccr.io/truecharts/minecraft-java11-openj9 repository: tccr.io/truecharts/minecraft-java11-openj9
tag: latest@sha256:6a0fa19b39b9323e8be51bafd3dc12def4059dfd6cb6f45144b23e757a918ca4 tag: 2022.16.0@sha256:3e47a0633f405d428798ea7f9dc97538c04597cc22ff920e5286307f608e468c
pullPolicy: Always pullPolicy: Always
j8Image: j8Image:
repository: tccr.io/truecharts/minecraft-java8-openj9 repository: tccr.io/truecharts/minecraft-java8
tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206 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 pullPolicy: Always
j8j9Image: j8j9Image:
repository: tccr.io/truecharts/minecraft-java8-openj9 repository: tccr.io/truecharts/minecraft-java8-openj9
tag: latest@sha256:409a5354e793438f2eff455d485bd0ea7d029a6d973138f992b8bd5ed079b206 tag: 2022.16.0@sha256:cf576f7b1dd5c46f0efc3018ae98fb512ba2efe186f5a7aa5d1fc09906f2d1cd
pullPolicy: Always pullPolicy: Always
imageSelector: image
securityContext: securityContext:
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
runAsNonRoot: false runAsNonRoot: false
@ -40,12 +74,36 @@ service:
port: 25575 port: 25575
targetPort: 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: secretEnv:
RCON_PASSWORD: "secretrconpass" RCON_PASSWORD: "secretrconpass"
env: env:
SERVER_PORT: "{{ .Values.service.main.ports.main.port }}" SERVER_PORT: "{{ .Values.service.main.ports.main.port }}"
EULA: "TRUE" EULA: "TRUE"
GUI: "FALSE"
OVERRIDE_SERVER_PROPERTIES: true OVERRIDE_SERVER_PROPERTIES: true
VERSION: "LATEST" VERSION: "LATEST"
TYPE: "VANILLA" TYPE: "VANILLA"
@ -111,6 +169,8 @@ env:
# WORLD: "" # WORLD: ""
# FORCE_REDOWNLOAD: false # FORCE_REDOWNLOAD: false
# USE_FLARE_FLAGS: false # USE_FLARE_FLAGS: false
# USE_AIKAR_FLAGS: true
# USE_SIMD_FLAGS: false
# JVM_OPTS: "" # JVM_OPTS: ""
# JVM_XX_OPTS: "" # JVM_XX_OPTS: ""