Add extraPodSpec to allow customizing Pods

itzg · Apr 27, 2024 · 09b29b3 · 09b29b3
1 parent 2b653c6
commit 09b29b3
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 0 deletions.
diff --git a/charts/mc-router/templates/deployment.yaml b/charts/mc-router/templates/deployment.yaml
@@ -164,3 +164,6 @@ spec:
         {{-   end }}
         {{- end }}
       {{- end }}
+      {{- range $key, $value := .Values.extraPodSpec }}
+      {{ $key }}: {{ tpl $value $ }}
+      {{- end }}
diff --git a/charts/mc-router/values.schema.json b/charts/mc-router/values.schema.json
@@ -249,6 +249,9 @@
           ]
         }
       }
+    },
+    "extraPodSpec": {
+      "type": "object"
     }
   }
 }
diff --git a/charts/mc-router/values.yaml b/charts/mc-router/values.yaml
@@ -114,6 +114,16 @@ extraEnv: {}
   #     fieldRef:
   #       fieldPath: status.hostIP
 
+# Extra fields to set on the pod
+#
+# Fields set here will be added to the end of the Pod spec
+# Can include any fields from https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
+# that are not already set by the chart.
+#
+# The value of the field will be interpretted as a template.
+extraPodSpec: {}
+#   priorityClassName: 'my-priority-class'
+
 # Array of extra objects to deploy with the release.
 # This value is evaluated as a template
 extraDeploy: []

diff --git a/charts/minecraft-bedrock/templates/deployment.yaml b/charts/minecraft-bedrock/templates/deployment.yaml
@@ -230,6 +230,9 @@ spec:
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
     {{- end }}
+    {{- range $key, $value := .Values.extraPodSpec }}
+      {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
   {{- if .Values.workloadAsStatefulSet }}
   volumeClaimTemplates:
     {{- if and .Values.persistence.dataDir.enabled (not .Values.persistence.dataDir.existingClaim) }}

diff --git a/charts/minecraft-bedrock/values.yaml b/charts/minecraft-bedrock/values.yaml
@@ -92,6 +92,16 @@ sidecarContainers: ""
 #           - vers=4
 extraVolumes: []
 
+# Extra fields to set on the pod
+#
+# Fields set here will be added to the end of the Pod spec
+# Can include any fields from https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
+# that are not already set by the chart.
+#
+# The value of the field will be interpretted as a template.
+extraPodSpec: {}
+#   priorityClassName: 'my-priority-class'
+
 ## Array of extra objects to deploy with the release
 ##
 # extraDeploy:

diff --git a/charts/minecraft-proxy/templates/deployment.yaml b/charts/minecraft-proxy/templates/deployment.yaml
@@ -209,3 +209,6 @@ spec:
     {{- if .Values.tolerations }}
       tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
     {{- end }}
+    {{- range $key, $value := .Values.extraPodSpec }}
+      {{ $key }}: {{ tpl $value $ }}
+    {{- end }}
diff --git a/charts/minecraft-proxy/values.yaml b/charts/minecraft-proxy/values.yaml
@@ -83,6 +83,16 @@ sidecarContainers: []
 #           - vers=4
 extraVolumes: []
 
+# Extra fields to set on the pod
+#
+# Fields set here will be added to the end of the Pod spec
+# Can include any fields from https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
+# that are not already set by the chart.
+#
+# The value of the field will be interpretted as a template.
+extraPodSpec: {}
+#   priorityClassName: 'my-priority-class'
+
 minecraftProxy:
   # This can be one of "BUNGEECORD", "WATERFALL", "VELOCITY", "CUSTOM"
   type: BUNGEECORD

diff --git a/charts/minecraft/templates/deployment.yaml b/charts/minecraft/templates/deployment.yaml
@@ -481,6 +481,9 @@ spec:
       {{-     toYaml .volumes | nindent 6 }}
       {{-   end }}
       {{- end }}
+      {{- range $key, $value := .Values.extraPodSpec }}
+      {{ $key }}: {{ tpl $value $ }}
+      {{- end }}
     {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}

diff --git a/charts/minecraft/values.schema.json b/charts/minecraft/values.schema.json
@@ -192,6 +192,9 @@
                     "type": "string"
                 }
             }
+        },
+        "extraPodSpec": {
+            "type": "object"
         }
     }
 }
diff --git a/charts/minecraft/values.yaml b/charts/minecraft/values.yaml
@@ -131,6 +131,18 @@ extraVolumes: []
 #         }
 extraDeploy: []
 
+## Extra fields to set on the pod
+##
+## Fields set here will be added to the end of the Pod spec
+## Can include any fields from https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
+## that are not already set by the chart.
+##
+## The value of the field will be interpretted as a template.
+##
+# extraPodSpec:
+#   priorityClassName: 'my-priority-class'
+extraPodSpec: {}
+
 minecraftServer:
   # This must be overridden, since we can't accept this for the user.
   eula: "FALSE"

diff --git a/charts/rcon-web-admin/templates/deployment.yaml b/charts/rcon-web-admin/templates/deployment.yaml
@@ -130,3 +130,6 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- range $key, $value := .Values.extraPodSpec }}
+      {{ $key }}: {{ tpl $value $ }}
+      {{- end }}
diff --git a/charts/rcon-web-admin/values.yaml b/charts/rcon-web-admin/values.yaml
@@ -70,6 +70,16 @@ tolerations: []
 
 affinity: {}
 
+# Extra fields to set on the pod
+#
+# Fields set here will be added to the end of the Pod spec
+# Can include any fields from https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
+# that are not already set by the chart.
+#
+# The value of the field will be interpretted as a template.
+extraPodSpec: {}
+#   priorityClassName: 'my-priority-class'
+
 rconWeb:
   # Sets the initial user as an admin
   isAdmin: false