feat: populate SPIGET_RESOURCES env var (#114)

itzg · Mar 18, 2022 · 30076e5 · 30076e5
1 parent 2fea96d
commit 30076e5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/charts/minecraft-proxy/Chart.yaml b/charts/minecraft-proxy/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft-proxy
-version: 2.5.1
+version: 2.6.0
 appVersion: SeeValues
 description: Minecraft proxy server (BungeeCord, Waterfall, Velocity, etc.)
 keywords:

diff --git a/charts/minecraft-proxy/templates/_helpers.tpl b/charts/minecraft-proxy/templates/_helpers.tpl
@@ -14,8 +14,3 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-
-{{- define "helm-toolkit.utils.joinListWithComma" -}}
-{{- $local := dict "first" true -}}
-{{- range $k, $v := . -}}{{- if not $local.first -}},{{- end -}}{{- $v -}}{{- $_ := set $local "first" false -}}{{- end -}}
-{{- end -}}
diff --git a/charts/minecraft-proxy/templates/deployment.yaml b/charts/minecraft-proxy/templates/deployment.yaml
@@ -95,9 +95,9 @@ spec:
           value: {{ .Values.minecraftProxy.jarRevision }}
         {{- end }}
         {{- end }}
-        {{- if .Values.plugins }}
+        {{- if .Values.minecraftProxy.plugins }}
         - name: PLUGINS
-          value: {{ include "helm-toolkit.utils.joinListWithComma" .Values.plugins }}
+          value: {{ join "," .Values.minecraftProxy.plugins }}
         {{- end }}
         - name: MEMORY
           value: {{ .Values.minecraftProxy.memory | quote }}

diff --git a/charts/minecraft/Chart.yaml b/charts/minecraft/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: minecraft
-version: 3.8.2
+version: 3.8.3
 appVersion: SeeValues
 home: https://minecraft.net/
 description: Minecraft server

diff --git a/charts/minecraft/templates/deployment.yaml b/charts/minecraft/templates/deployment.yaml
@@ -266,6 +266,10 @@ spec:
           value: "TRUE"
         {{- end }}
         {{- end }}
+        {{- if .Values.minecraftServer.spigetResources }}
+        - name: SPIGET_RESOURCES
+          value: {{ join "," .Values.minecraftServer.spigetResources }}
+        {{- end }}
         - name: ONLINE_MODE
           value: {{ .Values.minecraftServer.onlineMode | quote }}
         - name: MEMORY

diff --git a/charts/minecraft/values.yaml b/charts/minecraft/values.yaml
@@ -194,6 +194,9 @@ minecraftServer:
   # externalTrafficPolicy: Cluster
   externalIPs:
 
+  # A list of Spigot resources/plugins IDs to download.
+  spigetResources: []
+
   rcon:
     # If you enable this, make SURE to change your password below.
     enabled: false