Skip to content

Commit

Permalink
Reorder minecraft chart containers (#224)
Browse files Browse the repository at this point in the history
  • Loading branch information
@drewburr
drewburr authored Aug 23, 2024
1 parent bb9dcf4 commit ba5b3ba
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion charts/minecraft/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: minecraft
version: 4.21.0
version: 4.22.0
appVersion: SeeValues
home: https://minecraft.net/
description: Minecraft server
Expand Down
204 changes: 102 additions & 102 deletions charts/minecraft/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
dnsPolicy: {{ .Values.dnsPolicy}}
{{- end }}
{{- if .Values.dnsConfig }}
dnsConfig:
dnsConfig:
{{- toYaml .Values.dnsConfig | nindent 8 }}
{{- end }}
securityContext:
Expand All @@ -72,105 +72,6 @@ spec:
{{- toYaml .Values.initContainers | nindent 8 }}
{{- end }}
containers:
{{- if and .Values.mcbackup.enabled .Values.minecraftServer.rcon.enabled }}
- name: {{ template "minecraft.fullname" . }}-mc-backup
image: "{{ .Values.mcbackup.image.repository }}:{{ .Values.mcbackup.image.tag }}"
imagePullPolicy: {{ .Values.mcbackup.image.pullPolicy }}
resources:
{{ toYaml .Values.mcbackup.resources | indent 10 }}
{{- with .Values.mcbackup.envFrom }}
envFrom:
{{- . | toYaml | nindent 10 }}{{ end }}
env:
- name: SRC_DIR
value: "/data"
{{- template "minecraft.envMap" list "BACKUP_NAME" .Values.minecraftServer.worldSaveName }}
{{- template "minecraft.envMap" list "INITIAL_DELAY" .Values.mcbackup.initialDelay }}
{{- template "minecraft.envMap" list "BACKUP_INTERVAL" .Values.mcbackup.backupInterval }}
{{- template "minecraft.envMap" list "PRUNE_BACKUPS_DAYS" .Values.mcbackup.pruneBackupsDays }}
{{- template "minecraft.envMap" list "PAUSE_IF_NO_PLAYERS" .Values.mcbackup.pauseIfNoPlayers }}
- name: SERVER_PORT
value: "25565"
- name: RCON_HOST
value: "localhost"
{{- template "minecraft.envMap" list "RCON_PORT" .Values.minecraftServer.rcon.port }}
- name: RCON_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.minecraftServer.rcon.existingSecret | default (printf "%s-rcon" (include "minecraft.fullname" .)) }}
key: {{ .Values.minecraftServer.rcon.secretKey | default "rcon-password" }}
{{- template "minecraft.envMap" list "RCON_RETRIES" .Values.mcbackup.rconRetries }}
{{- template "minecraft.envMap" list "RCON_RETRY_INTERVAL" .Values.mcbackup.rconRetryInterval }}
{{- template "minecraft.envMap" list "EXCLUDES" .Values.mcbackup.excludes }}
{{- template "minecraft.envMap" list "BACKUP_METHOD" .Values.mcbackup.backupMethod }}
{{- if or (eq .Values.mcbackup.backupMethod "tar") (eq .Values.mcbackup.backupMethod "rclone") (eq .Values.mcbackup.backupMethod "rsync") }}
{{- template "minecraft.envMap" list "DEST_DIR" .Values.mcbackup.destDir }}
{{- template "minecraft.envMap" list "LINK_LATEST" .Values.mcbackup.linkLatest }}
{{- if ne .Values.mcbackup.backupMethod "rsync" }}
{{- template "minecraft.envMap" list "TAR_COMPRESS_METHOD" .Values.mcbackup.compressMethod }}
{{- template "minecraft.envMap" list "ZSTD_PARAMETERS" .Values.mcbackup.zstdParameters }}
{{- end }}
{{- if eq .Values.mcbackup.backupMethod "rclone" }}
{{- template "minecraft.envMap" list "RCLONE_REMOTE" .Values.mcbackup.rcloneRemote }}
{{- template "minecraft.envMap" list "RCLONE_DEST_DIR" .Values.mcbackup.rcloneDestDir }}
{{- template "minecraft.envMap" list "RCLONE_COMPRESS_METHOD" .Values.mcbackup.rcloneCompressMethod }}
{{- end }}
{{- end }}
{{- if eq .Values.mcbackup.backupMethod "restic" }}
{{- template "minecraft.envMap" list "RESTIC_REPOSITORY" .Values.mcbackup.resticRepository }}
{{- template "minecraft.envMap" list "RESTIC_ADDITIONAL_TAGS" .Values.mcbackup.resticAdditionalTags }}
{{- template "minecraft.envMap" list "PRUNE_RESTIC_RETENTION" .Values.mcbackup.pruneResticRetention }}
{{- range $key, $value := .Values.mcbackup.resticEnvs }}
{{- if kindIs "map" $value }}
{{- if hasKey $value "valueFrom" }}
- name: {{ $key }}
valueFrom:
{{- $value.valueFrom | toYaml | nindent 12 }}
{{- end }}
{{- else }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
{{- end }}
{{- end }}

{{- range $key, $value := .Values.mcbackup.extraEnv }}
{{- if kindIs "map" $value }}
{{- if hasKey $value "valueFrom" }}
- name: {{ $key }}
valueFrom:
{{- $value.valueFrom | toYaml | nindent 12 }}
{{- end }}
{{- else }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
{{- end }}
volumeMounts:
- name: tmp
mountPath: /tmp
{{- if .Values.persistence.altDataVolumeName }}
- name: {{ .Values.persistence.altDataVolumeName }}
mountPath: /data
{{- else }}
- name: datadir
mountPath: /data
readOnly: true
{{- end }}
- name: backupdir
mountPath: {{ default "/backups" .Values.mcbackup.destDir }}
{{- if or (eq .Values.mcbackup.backupMethod "rclone") (eq (include "isResticWithRclone" $) "true") }}
- name: rclone-config
mountPath: /config/rclone
{{- end }}
{{- range .Values.extraVolumes }}
{{- if .volumeMounts }}
{{- toYaml .volumeMounts | nindent 8 }}
{{- end }}
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
{{- end }}
- name: {{ template "minecraft.fullname" . }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
Expand Down Expand Up @@ -438,6 +339,105 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
{{- if and .Values.mcbackup.enabled .Values.minecraftServer.rcon.enabled }}
- name: {{ template "minecraft.fullname" . }}-mc-backup
image: "{{ .Values.mcbackup.image.repository }}:{{ .Values.mcbackup.image.tag }}"
imagePullPolicy: {{ .Values.mcbackup.image.pullPolicy }}
resources:
{{ toYaml .Values.mcbackup.resources | indent 10 }}
{{- with .Values.mcbackup.envFrom }}
envFrom:
{{- . | toYaml | nindent 10 }}{{ end }}
env:
- name: SRC_DIR
value: "/data"
{{- template "minecraft.envMap" list "BACKUP_NAME" .Values.minecraftServer.worldSaveName }}
{{- template "minecraft.envMap" list "INITIAL_DELAY" .Values.mcbackup.initialDelay }}
{{- template "minecraft.envMap" list "BACKUP_INTERVAL" .Values.mcbackup.backupInterval }}
{{- template "minecraft.envMap" list "PRUNE_BACKUPS_DAYS" .Values.mcbackup.pruneBackupsDays }}
{{- template "minecraft.envMap" list "PAUSE_IF_NO_PLAYERS" .Values.mcbackup.pauseIfNoPlayers }}
- name: SERVER_PORT
value: "25565"
- name: RCON_HOST
value: "localhost"
{{- template "minecraft.envMap" list "RCON_PORT" .Values.minecraftServer.rcon.port }}
- name: RCON_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.minecraftServer.rcon.existingSecret | default (printf "%s-rcon" (include "minecraft.fullname" .)) }}
key: {{ .Values.minecraftServer.rcon.secretKey | default "rcon-password" }}
{{- template "minecraft.envMap" list "RCON_RETRIES" .Values.mcbackup.rconRetries }}
{{- template "minecraft.envMap" list "RCON_RETRY_INTERVAL" .Values.mcbackup.rconRetryInterval }}
{{- template "minecraft.envMap" list "EXCLUDES" .Values.mcbackup.excludes }}
{{- template "minecraft.envMap" list "BACKUP_METHOD" .Values.mcbackup.backupMethod }}
{{- if or (eq .Values.mcbackup.backupMethod "tar") (eq .Values.mcbackup.backupMethod "rclone") (eq .Values.mcbackup.backupMethod "rsync") }}
{{- template "minecraft.envMap" list "DEST_DIR" .Values.mcbackup.destDir }}
{{- template "minecraft.envMap" list "LINK_LATEST" .Values.mcbackup.linkLatest }}
{{- if ne .Values.mcbackup.backupMethod "rsync" }}
{{- template "minecraft.envMap" list "TAR_COMPRESS_METHOD" .Values.mcbackup.compressMethod }}
{{- template "minecraft.envMap" list "ZSTD_PARAMETERS" .Values.mcbackup.zstdParameters }}
{{- end }}
{{- if eq .Values.mcbackup.backupMethod "rclone" }}
{{- template "minecraft.envMap" list "RCLONE_REMOTE" .Values.mcbackup.rcloneRemote }}
{{- template "minecraft.envMap" list "RCLONE_DEST_DIR" .Values.mcbackup.rcloneDestDir }}
{{- template "minecraft.envMap" list "RCLONE_COMPRESS_METHOD" .Values.mcbackup.rcloneCompressMethod }}
{{- end }}
{{- end }}
{{- if eq .Values.mcbackup.backupMethod "restic" }}
{{- template "minecraft.envMap" list "RESTIC_REPOSITORY" .Values.mcbackup.resticRepository }}
{{- template "minecraft.envMap" list "RESTIC_ADDITIONAL_TAGS" .Values.mcbackup.resticAdditionalTags }}
{{- template "minecraft.envMap" list "PRUNE_RESTIC_RETENTION" .Values.mcbackup.pruneResticRetention }}
{{- range $key, $value := .Values.mcbackup.resticEnvs }}
{{- if kindIs "map" $value }}
{{- if hasKey $value "valueFrom" }}
- name: {{ $key }}
valueFrom:
{{- $value.valueFrom | toYaml | nindent 12 }}
{{- end }}
{{- else }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
{{- end }}
{{- end }}

{{- range $key, $value := .Values.mcbackup.extraEnv }}
{{- if kindIs "map" $value }}
{{- if hasKey $value "valueFrom" }}
- name: {{ $key }}
valueFrom:
{{- $value.valueFrom | toYaml | nindent 12 }}
{{- end }}
{{- else }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
{{- end }}
volumeMounts:
- name: tmp
mountPath: /tmp
{{- if .Values.persistence.altDataVolumeName }}
- name: {{ .Values.persistence.altDataVolumeName }}
mountPath: /data
{{- else }}
- name: datadir
mountPath: /data
readOnly: true
{{- end }}
- name: backupdir
mountPath: {{ default "/backups" .Values.mcbackup.destDir }}
{{- if or (eq .Values.mcbackup.backupMethod "rclone") (eq (include "isResticWithRclone" $) "true") }}
- name: rclone-config
mountPath: /config/rclone
{{- end }}
{{- range .Values.extraVolumes }}
{{- if .volumeMounts }}
{{- toYaml .volumeMounts | nindent 8 }}
{{- end }}
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
{{- end }}
{{- if .Values.sidecarContainers }}
{{- toYaml .Values.sidecarContainers | nindent 6 }}
{{- end }}
Expand Down Expand Up @@ -523,15 +523,15 @@ spec:
volumeClaimTemplates:
{{- if and .Values.persistence.dataDir.enabled (not .Values.persistence.dataDir.existingClaim) }}
- metadata:
name: datadir
name: datadir
labels:
app: {{ template "minecraft.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
app.kubernetes.io/name: "{{ .Chart.Name }}"
app.kubernetes.io/instance: {{ template "minecraft.fullname" . }}
app.kubernetes.io/version: "{{ .Chart.Version }}"
app.kubernetes.io/version: "{{ .Chart.Version }}"
annotations:
{{- with .Values.persistence.annotations }}
{{ toYaml . | nindent 10 }}
Expand Down

0 comments on commit ba5b3ba

Please sign in to comment.