Skip to content

Commit ba5b3ba

Browse files
drewburrdrewburr
authored
Reorder minecraft chart containers (#224)
1 parent bb9dcf4 commit ba5b3ba

File tree

2 files changed

+103
-103
lines changed

2 files changed

+103
-103
lines changed

‎charts/minecraft/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: minecraft
3-
version: 4.21.0
3+
version: 4.22.0
44
appVersion: SeeValues
55
home: https://minecraft.net/
66
description: Minecraft server

‎charts/minecraft/templates/deployment.yaml‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
dnsPolicy: {{ .Values.dnsPolicy}}
6363
{{- end }}
6464
{{- if .Values.dnsConfig }}
65-
dnsConfig:
65+
dnsConfig:
6666
{{- toYaml .Values.dnsConfig | nindent 8 }}
6767
{{- end }}
6868
securityContext:
@@ -72,105 +72,6 @@ spec:
7272
{{- toYaml .Values.initContainers | nindent 8 }}
7373
{{- end }}
7474
containers:
75-
{{- if and .Values.mcbackup.enabled .Values.minecraftServer.rcon.enabled }}
76-
- name: {{ template "minecraft.fullname" . }}-mc-backup
77-
image: "{{ .Values.mcbackup.image.repository }}:{{ .Values.mcbackup.image.tag }}"
78-
imagePullPolicy: {{ .Values.mcbackup.image.pullPolicy }}
79-
resources:
80-
{{ toYaml .Values.mcbackup.resources | indent 10 }}
81-
{{- with .Values.mcbackup.envFrom }}
82-
envFrom:
83-
{{- . | toYaml | nindent 10 }}{{ end }}
84-
env:
85-
- name: SRC_DIR
86-
value: "/data"
87-
{{- template "minecraft.envMap" list "BACKUP_NAME" .Values.minecraftServer.worldSaveName }}
88-
{{- template "minecraft.envMap" list "INITIAL_DELAY" .Values.mcbackup.initialDelay }}
89-
{{- template "minecraft.envMap" list "BACKUP_INTERVAL" .Values.mcbackup.backupInterval }}
90-
{{- template "minecraft.envMap" list "PRUNE_BACKUPS_DAYS" .Values.mcbackup.pruneBackupsDays }}
91-
{{- template "minecraft.envMap" list "PAUSE_IF_NO_PLAYERS" .Values.mcbackup.pauseIfNoPlayers }}
92-
- name: SERVER_PORT
93-
value: "25565"
94-
- name: RCON_HOST
95-
value: "localhost"
96-
{{- template "minecraft.envMap" list "RCON_PORT" .Values.minecraftServer.rcon.port }}
97-
- name: RCON_PASSWORD
98-
valueFrom:
99-
secretKeyRef:
100-
name: {{ .Values.minecraftServer.rcon.existingSecret | default (printf "%s-rcon" (include "minecraft.fullname" .)) }}
101-
key: {{ .Values.minecraftServer.rcon.secretKey | default "rcon-password" }}
102-
{{- template "minecraft.envMap" list "RCON_RETRIES" .Values.mcbackup.rconRetries }}
103-
{{- template "minecraft.envMap" list "RCON_RETRY_INTERVAL" .Values.mcbackup.rconRetryInterval }}
104-
{{- template "minecraft.envMap" list "EXCLUDES" .Values.mcbackup.excludes }}
105-
{{- template "minecraft.envMap" list "BACKUP_METHOD" .Values.mcbackup.backupMethod }}
106-
{{- if or (eq .Values.mcbackup.backupMethod "tar") (eq .Values.mcbackup.backupMethod "rclone") (eq .Values.mcbackup.backupMethod "rsync") }}
107-
{{- template "minecraft.envMap" list "DEST_DIR" .Values.mcbackup.destDir }}
108-
{{- template "minecraft.envMap" list "LINK_LATEST" .Values.mcbackup.linkLatest }}
109-
{{- if ne .Values.mcbackup.backupMethod "rsync" }}
110-
{{- template "minecraft.envMap" list "TAR_COMPRESS_METHOD" .Values.mcbackup.compressMethod }}
111-
{{- template "minecraft.envMap" list "ZSTD_PARAMETERS" .Values.mcbackup.zstdParameters }}
112-
{{- end }}
113-
{{- if eq .Values.mcbackup.backupMethod "rclone" }}
114-
{{- template "minecraft.envMap" list "RCLONE_REMOTE" .Values.mcbackup.rcloneRemote }}
115-
{{- template "minecraft.envMap" list "RCLONE_DEST_DIR" .Values.mcbackup.rcloneDestDir }}
116-
{{- template "minecraft.envMap" list "RCLONE_COMPRESS_METHOD" .Values.mcbackup.rcloneCompressMethod }}
117-
{{- end }}
118-
{{- end }}
119-
{{- if eq .Values.mcbackup.backupMethod "restic" }}
120-
{{- template "minecraft.envMap" list "RESTIC_REPOSITORY" .Values.mcbackup.resticRepository }}
121-
{{- template "minecraft.envMap" list "RESTIC_ADDITIONAL_TAGS" .Values.mcbackup.resticAdditionalTags }}
122-
{{- template "minecraft.envMap" list "PRUNE_RESTIC_RETENTION" .Values.mcbackup.pruneResticRetention }}
123-
{{- range $key, $value := .Values.mcbackup.resticEnvs }}
124-
{{- if kindIs "map" $value }}
125-
{{- if hasKey $value "valueFrom" }}
126-
- name: {{ $key }}
127-
valueFrom:
128-
{{- $value.valueFrom | toYaml | nindent 12 }}
129-
{{- end }}
130-
{{- else }}
131-
- name: {{ $key }}
132-
value: {{ $value | quote }}
133-
{{- end }}
134-
{{- end }}
135-
{{- end }}
136-
137-
{{- range $key, $value := .Values.mcbackup.extraEnv }}
138-
{{- if kindIs "map" $value }}
139-
{{- if hasKey $value "valueFrom" }}
140-
- name: {{ $key }}
141-
valueFrom:
142-
{{- $value.valueFrom | toYaml | nindent 12 }}
143-
{{- end }}
144-
{{- else }}
145-
- name: {{ $key }}
146-
value: {{ $value | quote }}
147-
{{- end }}
148-
{{- end }}
149-
volumeMounts:
150-
- name: tmp
151-
mountPath: /tmp
152-
{{- if .Values.persistence.altDataVolumeName }}
153-
- name: {{ .Values.persistence.altDataVolumeName }}
154-
mountPath: /data
155-
{{- else }}
156-
- name: datadir
157-
mountPath: /data
158-
readOnly: true
159-
{{- end }}
160-
- name: backupdir
161-
mountPath: {{ default "/backups" .Values.mcbackup.destDir }}
162-
{{- if or (eq .Values.mcbackup.backupMethod "rclone") (eq (include "isResticWithRclone" $) "true") }}
163-
- name: rclone-config
164-
mountPath: /config/rclone
165-
{{- end }}
166-
{{- range .Values.extraVolumes }}
167-
{{- if .volumeMounts }}
168-
{{- toYaml .volumeMounts | nindent 8 }}
169-
{{- end }}
170-
{{- end }}
171-
securityContext:
172-
{{- toYaml .Values.securityContext | nindent 10 }}
173-
{{- end }}
17475
- name: {{ template "minecraft.fullname" . }}
17576
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
17677
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -438,6 +339,105 @@ spec:
438339
{{- end }}
439340
securityContext:
440341
{{- toYaml .Values.securityContext | nindent 10 }}
342+
{{- if and .Values.mcbackup.enabled .Values.minecraftServer.rcon.enabled }}
343+
- name: {{ template "minecraft.fullname" . }}-mc-backup
344+
image: "{{ .Values.mcbackup.image.repository }}:{{ .Values.mcbackup.image.tag }}"
345+
imagePullPolicy: {{ .Values.mcbackup.image.pullPolicy }}
346+
resources:
347+
{{ toYaml .Values.mcbackup.resources | indent 10 }}
348+
{{- with .Values.mcbackup.envFrom }}
349+
envFrom:
350+
{{- . | toYaml | nindent 10 }}{{ end }}
351+
env:
352+
- name: SRC_DIR
353+
value: "/data"
354+
{{- template "minecraft.envMap" list "BACKUP_NAME" .Values.minecraftServer.worldSaveName }}
355+
{{- template "minecraft.envMap" list "INITIAL_DELAY" .Values.mcbackup.initialDelay }}
356+
{{- template "minecraft.envMap" list "BACKUP_INTERVAL" .Values.mcbackup.backupInterval }}
357+
{{- template "minecraft.envMap" list "PRUNE_BACKUPS_DAYS" .Values.mcbackup.pruneBackupsDays }}
358+
{{- template "minecraft.envMap" list "PAUSE_IF_NO_PLAYERS" .Values.mcbackup.pauseIfNoPlayers }}
359+
- name: SERVER_PORT
360+
value: "25565"
361+
- name: RCON_HOST
362+
value: "localhost"
363+
{{- template "minecraft.envMap" list "RCON_PORT" .Values.minecraftServer.rcon.port }}
364+
- name: RCON_PASSWORD
365+
valueFrom:
366+
secretKeyRef:
367+
name: {{ .Values.minecraftServer.rcon.existingSecret | default (printf "%s-rcon" (include "minecraft.fullname" .)) }}
368+
key: {{ .Values.minecraftServer.rcon.secretKey | default "rcon-password" }}
369+
{{- template "minecraft.envMap" list "RCON_RETRIES" .Values.mcbackup.rconRetries }}
370+
{{- template "minecraft.envMap" list "RCON_RETRY_INTERVAL" .Values.mcbackup.rconRetryInterval }}
371+
{{- template "minecraft.envMap" list "EXCLUDES" .Values.mcbackup.excludes }}
372+
{{- template "minecraft.envMap" list "BACKUP_METHOD" .Values.mcbackup.backupMethod }}
373+
{{- if or (eq .Values.mcbackup.backupMethod "tar") (eq .Values.mcbackup.backupMethod "rclone") (eq .Values.mcbackup.backupMethod "rsync") }}
374+
{{- template "minecraft.envMap" list "DEST_DIR" .Values.mcbackup.destDir }}
375+
{{- template "minecraft.envMap" list "LINK_LATEST" .Values.mcbackup.linkLatest }}
376+
{{- if ne .Values.mcbackup.backupMethod "rsync" }}
377+
{{- template "minecraft.envMap" list "TAR_COMPRESS_METHOD" .Values.mcbackup.compressMethod }}
378+
{{- template "minecraft.envMap" list "ZSTD_PARAMETERS" .Values.mcbackup.zstdParameters }}
379+
{{- end }}
380+
{{- if eq .Values.mcbackup.backupMethod "rclone" }}
381+
{{- template "minecraft.envMap" list "RCLONE_REMOTE" .Values.mcbackup.rcloneRemote }}
382+
{{- template "minecraft.envMap" list "RCLONE_DEST_DIR" .Values.mcbackup.rcloneDestDir }}
383+
{{- template "minecraft.envMap" list "RCLONE_COMPRESS_METHOD" .Values.mcbackup.rcloneCompressMethod }}
384+
{{- end }}
385+
{{- end }}
386+
{{- if eq .Values.mcbackup.backupMethod "restic" }}
387+
{{- template "minecraft.envMap" list "RESTIC_REPOSITORY" .Values.mcbackup.resticRepository }}
388+
{{- template "minecraft.envMap" list "RESTIC_ADDITIONAL_TAGS" .Values.mcbackup.resticAdditionalTags }}
389+
{{- template "minecraft.envMap" list "PRUNE_RESTIC_RETENTION" .Values.mcbackup.pruneResticRetention }}
390+
{{- range $key, $value := .Values.mcbackup.resticEnvs }}
391+
{{- if kindIs "map" $value }}
392+
{{- if hasKey $value "valueFrom" }}
393+
- name: {{ $key }}
394+
valueFrom:
395+
{{- $value.valueFrom | toYaml | nindent 12 }}
396+
{{- end }}
397+
{{- else }}
398+
- name: {{ $key }}
399+
value: {{ $value | quote }}
400+
{{- end }}
401+
{{- end }}
402+
{{- end }}
403+
404+
{{- range $key, $value := .Values.mcbackup.extraEnv }}
405+
{{- if kindIs "map" $value }}
406+
{{- if hasKey $value "valueFrom" }}
407+
- name: {{ $key }}
408+
valueFrom:
409+
{{- $value.valueFrom | toYaml | nindent 12 }}
410+
{{- end }}
411+
{{- else }}
412+
- name: {{ $key }}
413+
value: {{ $value | quote }}
414+
{{- end }}
415+
{{- end }}
416+
volumeMounts:
417+
- name: tmp
418+
mountPath: /tmp
419+
{{- if .Values.persistence.altDataVolumeName }}
420+
- name: {{ .Values.persistence.altDataVolumeName }}
421+
mountPath: /data
422+
{{- else }}
423+
- name: datadir
424+
mountPath: /data
425+
readOnly: true
426+
{{- end }}
427+
- name: backupdir
428+
mountPath: {{ default "/backups" .Values.mcbackup.destDir }}
429+
{{- if or (eq .Values.mcbackup.backupMethod "rclone") (eq (include "isResticWithRclone" $) "true") }}
430+
- name: rclone-config
431+
mountPath: /config/rclone
432+
{{- end }}
433+
{{- range .Values.extraVolumes }}
434+
{{- if .volumeMounts }}
435+
{{- toYaml .volumeMounts | nindent 8 }}
436+
{{- end }}
437+
{{- end }}
438+
securityContext:
439+
{{- toYaml .Values.securityContext | nindent 10 }}
440+
{{- end }}
441441
{{- if .Values.sidecarContainers }}
442442
{{- toYaml .Values.sidecarContainers | nindent 6 }}
443443
{{- end }}
@@ -523,15 +523,15 @@ spec:
523523
volumeClaimTemplates:
524524
{{- if and .Values.persistence.dataDir.enabled (not .Values.persistence.dataDir.existingClaim) }}
525525
- metadata:
526-
name: datadir
526+
name: datadir
527527
labels:
528528
app: {{ template "minecraft.fullname" . }}
529529
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
530530
release: "{{ .Release.Name }}"
531531
heritage: "{{ .Release.Service }}"
532532
app.kubernetes.io/name: "{{ .Chart.Name }}"
533533
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
534-
app.kubernetes.io/version: "{{ .Chart.Version }}"
534+
app.kubernetes.io/version: "{{ .Chart.Version }}"
535535
annotations:
536536
{{- with .Values.persistence.annotations }}
537537
{{ toYaml . | nindent 10 }}

0 commit comments

Comments
 (0)