Config refactor

charts/minecraft/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft
-version: 4.22.0
+version: 4.22.1
 appVersion: SeeValues
 home: https://minecraft.net/
 description: Minecraft server

charts/minecraft/templates/_helpers.tpl

@@ -25,17 +25,18 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end }}
 {{- end -}}
 
-{{- define "minecraft.envMap" }}
-{{- if index . 1 }}
-        - name: {{ index . 0 }}
-          value: {{ index . 1 | quote }}
-{{- end }}
+{{- define "minecraft.extraEnv" }}
+{{- range $key, $value := . }}
+{{- if kindIs "map" $value }}
+{{-   if hasKey $value "valueFrom" }}
+- name: {{ $key }}
+  valueFrom:
+    {{- $value.valueFrom | toYaml | nindent 4 }}
+{{-   end }}
+{{- else }}
+- name: {{ $key }}
+  value: {{ $value | quote }}
 {{- end }}
-
-{{- define "minecraft.envBoolMap" }}
-{{- if ne (toString (index . 1)) "default" }}
-        - name: {{ index . 0 }}
-          value: {{ index . 1 | quote }}
 {{- end }}
 {{- end }}
 

charts/minecraft/templates/config-backup.yaml

@@ -0,0 +1,38 @@
+{{ with .Values.minecraftServer }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "minecraft.fullname" . }}-backup-config
+data:
+  SRC_DIR: "/data"
+  BACKUP_NAME: {{ .Values.minecraftServer.worldSaveName }}
+  INITIAL_DELAY: {{ .Values.mcbackup.initialDelay }}
+  BACKUP_INTERVAL: {{ .Values.mcbackup.backupInterval }}
+  PRUNE_BACKUPS_DAYS: {{ .Values.mcbackup.pruneBackupsDays }}
+  PAUSE_IF_NO_PLAYERS: {{ .Values.mcbackup.pauseIfNoPlayers }}
+  SERVER_PORT: "25565"
+  RCON_HOST: "localhost"
+  RCON_PORT: {{ .Values.minecraftServer.rcon.port }}
+  RCON_RETRIES: {{ .Values.mcbackup.rconRetries }}
+  RCON_RETRY_INTERVAL: {{ .Values.mcbackup.rconRetryInterval }}
+  EXCLUDES: {{ .Values.mcbackup.excludes }}
+  BACKUP_METHOD: {{ .Values.mcbackup.backupMethod }}
+  {{- if or (eq .Values.mcbackup.backupMethod "tar") (eq .Values.mcbackup.backupMethod "rclone") (eq .Values.mcbackup.backupMethod "rsync") }}
+  DEST_DIR: {{ .Values.mcbackup.destDir }}
+  LINK_LATEST: {{ .Values.mcbackup.linkLatest }}
+  {{-   if ne .Values.mcbackup.backupMethod "rsync" }}
+  TAR_COMPRESS_METHOD: {{ .Values.mcbackup.compressMethod }}
+  ZSTD_PARAMETERS: {{ .Values.mcbackup.zstdParameters }}
+  {{-   end }}
+  {{-   if eq .Values.mcbackup.backupMethod "rclone" }}
+  RCLONE_REMOTE: {{ .Values.mcbackup.rcloneRemote }}
+  RCLONE_DEST_DIR: {{ .Values.mcbackup.rcloneDestDir }}
+  RCLONE_COMPRESS_METHOD: {{ .Values.mcbackup.rcloneCompressMethod }}
+  {{-   end }}
+  {{- end }}
+  {{- if eq .Values.mcbackup.backupMethod "restic" }}
+  RESTIC_REPOSITORY: {{ .Values.mcbackup.resticRepository }}
+  RESTIC_ADDITIONAL_TAGS: {{ .Values.mcbackup.resticAdditionalTags }}
+  PRUNE_RESTIC_RETENTION: {{ .Values.mcbackup.pruneResticRetention }}
+  {{- end }}
+{{- end }}

charts/minecraft/templates/config-server.yaml

@@ -0,0 +1,85 @@
+{{ with .Values.minecraftServer }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "minecraft.fullname" . }}-config
+data:
+  EULA: {{ .eula }}
+  TYPE: {{ .type }}
+  FORGE_INSTALLER_URL: {{ .forgeInstallerUrl }}
+  FORGEVERSION: {{ .forgeVersion }}
+  SPIGOT_DOWNLOAD_URL: {{ .spigotDownloadUrl }}
+  BUKKIT_DOWNLOAD_URL: {{ .bukkitDownloadUrl }}
+  PAPER_DOWNLOAD_URL: {{ .paperDownloadUrl }}
+  {{- if eq .type "FTBA" }}
+  FTB_MODPACK_ID: {{ required "You must supply a minecraftserver.ftbModpackVersionID with type=FTBA" .ftbModpackId }}
+  {{- end }}
+  FTB_MODPACK_VERSION_ID: {{ .ftbModpackVersionId }}
+  CF_SERVER_MOD: {{ .cfServerMod }}
+  FTB_LEGACYJAVAFIXER: {{ .ftbLegacyJavaFixer }}
+  VERSION: {{ .version }}
+  DIFFICULTY: {{ .difficulty }}
+  WHITELIST: {{ .whitelist }}
+  OPS: {{ .ops }}
+  ICON: {{ .icon }}
+  MAX_PLAYERS: {{ .maxPlayers }}
+  MAX_WORLD_SIZE: {{ .maxWorldSize }}
+  ALLOW_NETHER: {{ .allowNether }}
+  ANNOUNCE_PLAYER_ACHIEVEMENTS: {{ .announcePlayerAchievements }}
+  ENABLE_COMMAND_BLOCK: {{ .enableCommandBlock }}
+  FORCE_GAMEMODE: {{ .forcegameMode }}
+  FORCE_REDOWNLOAD: {{ .forceReDownload }}
+  GENERATE_STRUCTURES: {{ .generateStructures }}
+  HARDCORE: {{ .hardcore }}
+  MAX_BUILD_HEIGHT: {{ .maxBuildHeight }}
+  MAX_TICK_TIME: {{ .maxTickTime }}
+  SPAWN_ANIMALS: {{ .spawnAnimals }}
+  SPAWN_MONSTERS: {{ .spawnMonsters }}
+  SPAWN_NPCS: {{ .spawnNPCs }}
+  SPAWN_PROTECTION: {{ .spawnProtection }}
+  VIEW_DISTANCE: {{ .viewDistance }}
+  SEED: {{ .levelSeed }}
+  MODE: {{ .gameMode }}
+  MOTD: {{ .motd }}
+  PVP: {{ .pvp }}
+  LEVEL_TYPE: {{ .levelType }}
+  GENERATOR_SETTINGS: {{ .generatorSettings }}
+  LEVEL: {{ .worldSaveName }}
+  WORLD: {{ .downloadWorldUrl }}
+  MODPACK: {{ .downloadModpackUrl }}
+  REMOVE_OLD_MODS: {{ .removeOldMods }}
+  MODS: {{ join "," .modUrls }}
+  PLUGINS: {{ join "," .pluginUrls }}
+  SPIGET_RESOURCES: {{ join "," .spigetResources }}
+  {{- with .modrinth }}
+  MODRINTH_PROJECTS: {{ join "," .projects }}
+  MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES: {{ .optionalDependencies }} # TODO: Deprecated in favor of MODRINTH_DOWNLOAD_DEPENDENCIES
+  MODRINTH_ALLOWED_VERSION_TYPE: {{ .allowedVersionType }}
+  {{- end }}
+  VANILLATWEAKS_SHARECODE: {{ join "," .vanillaTweaksShareCodes }}
+  RESOURCE_PACK_ENFORCE: {{ .resourcePackEnforce }}
+  RESOURCE_PACK: {{ .resourcePackUrl }}
+  RESOURCE_PACK_SHA1: {{ .resourcePackSha }}
+  ONLINE_MODE: {{ .onlineMode }}
+  ENFORCE_SECURE_PROFILE: {{ .enforceSecureProfile }}
+  MEMORY: {{ .memory }}
+  JVM_OPTS: {{ .jvmOpts }}
+  JVM_XX_OPTS: {{ .jvmXXOpts }}
+  OVERRIDE_SERVER_PROPERTIES: {{ .overrideServerProperties }}
+  ENABLE_RCON: {{ .rcon.enabled }}
+  ENABLE_QUERY: {{ .query.enabled }}
+  QUERY_PORT: {{ .query.port }}
+  {{- with .autoCurseForge }}
+  CF_PAGE_URL: {{ .pageUrl }}
+  CF_SLUG: {{ .slug }}
+  CF_FILE_ID: {{ .fileId }}
+  CF_FILENAME_MATCHER: {{ .filenameMatcher }}
+  CF_EXCLUDE_MODS: {{ join "," .excludeMods }}
+  CF_FORCE_INCLUDE_MODS: {{ join "," .includeMods }}
+  CF_EXCLUDE_INCLUDE_FILE: {{ .excludeIncludeFile }}
+  CF_FORCE_SYNCHRONIZE: {{ .forceSynchronize }}
+  CF_SET_LEVEL_FROM: {{ .setLevelFrom }}
+  CF_PARALLEL_DOWNLOADS: {{ .parallelDownloads }}
+  CF_OVERRIDES_SKIP_EXISTING: "true"
+  {{- end }}
+{{- end }}