diff --git a/charts/minecraft/Chart.yaml b/charts/minecraft/Chart.yaml index d20ed35..e3ea575 100755 --- a/charts/minecraft/Chart.yaml +++ b/charts/minecraft/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: minecraft -version: 4.23.5 +version: 4.23.6 appVersion: SeeValues home: https://minecraft.net/ description: Minecraft server diff --git a/charts/minecraft/templates/_helpers.tpl b/charts/minecraft/templates/_helpers.tpl index 08859fd..a629c8f 100644 --- a/charts/minecraft/templates/_helpers.tpl +++ b/charts/minecraft/templates/_helpers.tpl @@ -26,11 +26,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- define "minecraft.envMap" }} +{{- if ne (toString (index . 1)) "default" }} {{- if or (index . 1) (kindIs "float64" (index . 1)) (kindIs "bool" (index . 1)) }} - name: {{ index . 0 }} value: {{ index . 1 | quote }} {{- end }} {{- end }} +{{- end }} {{- define "tplRender" -}} {{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }} diff --git a/charts/minecraft/values.schema.json b/charts/minecraft/values.schema.json index 03e8b12..de77e63 100644 --- a/charts/minecraft/values.schema.json +++ b/charts/minecraft/values.schema.json @@ -30,10 +30,16 @@ "type": "string" }, "maxPlayers": { - "type": "integer" + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] }, "maxWorldSize": { - "type": "integer" + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] }, "modrinth": { "type": "object", @@ -50,7 +56,7 @@ "type": "boolean" }, "allowedVersionType": { - "enum": ["release", "beta", "alpha"] + "enum": ["release", "beta", "alpha", "default"] } } }, @@ -135,13 +141,28 @@ } }, "maxBuildHeight": { - "type": "integer" + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] }, "maxTickTime": { - "type": "integer" + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] }, "spawnProtection": { - "type": "integer" + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] + }, + "viewDistance": { + "oneOf": [ + {"type": "integer"}, + {"enum": ["default"]} + ] }, "ftbLegacyJavaFixer": { "anyOf": [{"type": "string", "enum": ["default"]}, {"type": "boolean"}]}, diff --git a/charts/minecraft/values.yaml b/charts/minecraft/values.yaml index 6318e3e..1f52e19 100644 --- a/charts/minecraft/values.yaml +++ b/charts/minecraft/values.yaml @@ -203,9 +203,9 @@ minecraftServer: # A server icon URL for server listings. Auto-scaled and transcoded. icon: # Max connected players. - maxPlayers: 20 + maxPlayers: default # This sets the maximum possible size in blocks, expressed as a radius, that the world border can obtain. - maxWorldSize: 10000 + maxWorldSize: default # Allows players to travel to the Nether. allowNether: default # Allows server to announce when a player gets an achievement. @@ -219,9 +219,9 @@ minecraftServer: # If set to true, players will be set to spectator mode if they die. hardcore: default # The maximum height in which building is allowed. - maxBuildHeight: 256 + maxBuildHeight: default # The maximum number of milliseconds a single tick may take before the server watchdog stops the server with the message. -1 disables this entirely. - maxTickTime: 60000 + maxTickTime: default # Determines if animals will be able to spawn. spawnAnimals: default # Determines if monsters will be spawned. @@ -229,9 +229,9 @@ minecraftServer: # Determines if villagers will be spawned. spawnNPCs: default # Sets the area that non-ops can not edit (0 to disable) - spawnProtection: 16 + spawnProtection: default # Max view distance (in chunks). - viewDistance: 10 + viewDistance: default # Define this if you want a specific map generation seed. levelSeed: # One of: creative, survival, adventure, spectator @@ -273,10 +273,7 @@ minecraftServer: jvmOpts: "" # Options like -X that need to proceed general JVM options jvmXXOpts: "" - # By default, the server configuration will be created and set based on the following environment variables, but only the first time the server is started - # If you would like to override the server configuration each time the container starts up, you can set this to true - # see https://github.com/itzg/docker-minecraft-server#server-configuration - overrideServerProperties: false + overrideServerProperties: default # DEPRECATED: use top-level rconServiceAnnotations instead serviceAnnotations: {} serviceType: ClusterIP @@ -309,7 +306,7 @@ minecraftServer: # Downloads Modrinth project dependencies marked as optional optionalDependencies: false # The version type is used to determine the newest version to use from each project. The allowed values are: release, beta, alpha - allowedVersionType: release + allowedVersionType: default # Config for AUTO_CURSEFORGE server type autoCurseForge: