Merge branch 'master' into statefulset

.github/workflows/lint-test.yaml

@@ -2,6 +2,7 @@ name: Lint and Test Charts
 
 on: pull_request
 
+
 jobs:
   lint-test:
     runs-on: ubuntu-latest
@@ -35,14 +36,13 @@ jobs:
         run: ct lint
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.8.0
         if: steps.list-changed.outputs.changed == 'true'
-
+        
       - name: Install LoadBalancer
         run: |-
           kubectl config use-context kind-chart-testing
-          kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/namespace.yaml
-          kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/metallb.yaml
+          kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.10/config/manifests/metallb-native.yaml
           kubectl apply -f .github/metallb-configmap.yaml
 
       - name: Run chart-testing (install)

charts/minecraft-bedrock/templates/_helpers.tpl

@@ -14,3 +14,16 @@ 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 "extraDeploy.render" -}}
+{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
+{{- if contains "{{" (toJson .value) }}
+  {{- if .scope }}
+      {{- tpl (cat "{{- with $.RelativeScope -}}" $value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
+  {{- else }}
+    {{- tpl $value .context }}
+  {{- end }}
+{{- else }}
+    {{- $value }}
+{{- end }}
+{{- end -}}

charts/minecraft-bedrock/templates/extra-list.yaml

@@ -0,0 +1,4 @@
+{{- range .Values.extraDeploy }}
+---
+{{ include "extraDeploy.render" (dict "value" . "context" $) }}
+{{- end }}

charts/minecraft-bedrock/values.yaml

@@ -78,6 +78,21 @@ initContainers: []
 #           - vers=4
 extraVolumes: []
 
+## Array of extra objects to deploy with the release
+##
+# extraDeploy:
+#   - |
+#     apiVersion: v1
+#     kind: ConfigMap
+#     metadata:
+#       name: {{ template "minecraft.fullname" . }}-extra-cm
+#     data:
+#       key: |-
+#         {
+#           "key": "value"
+#         }
+extraDeploy: []
+
 minecraftServer:
   # This must be overridden, since we can't accept this for the user.
   eula: "FALSE"

charts/minecraft/templates/_helpers.tpl

@@ -37,4 +37,17 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
         - name: {{ index . 0 }}
           value: {{ index . 1 | quote }}
 {{- end }}
-{{- end }}
+{{- end }}
+
+{{- define "extraDeploy.render" -}}
+{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
+{{- if contains "{{" (toJson .value) }}
+  {{- if .scope }}
+      {{- tpl (cat "{{- with $.RelativeScope -}}" $value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
+  {{- else }}
+    {{- tpl $value .context }}
+  {{- end }}
+{{- else }}
+    {{- $value }}
+{{- end }}
+{{- end -}}

charts/minecraft/templates/deployment.yaml

@@ -166,7 +166,7 @@ spec:
           {{- if .Values.lifecycle.preStop }}
           preStop:
             exec:
-              command: {{- range .Values.lifecycle.postStart }}
+              command: {{- range .Values.lifecycle.preStop }}
                 - {{ . }}
               {{- end }}
           {{- end }}

charts/minecraft/templates/extra-list.yaml

@@ -0,0 +1,4 @@
+{{- range .Values.extraDeploy }}
+---
+{{ include "extraDeploy.render" (dict "value" . "context" $) }}
+{{- end }}

charts/minecraft/templates/extraports-ing.yaml

@@ -16,9 +16,9 @@ metadata:
     chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
-    app.kubernetes.io/name: "{{ .Chart.Name }}"
+    app.kubernetes.io/name: "{{ $.Chart.Name }}"
     app.kubernetes.io/instance: {{ $minecraftFullname }}
-    app.kubernetes.io/version: "{{ .Chart.Version }}"
+    app.kubernetes.io/version: "{{ $.Chart.Version }}"
 spec:
 {{- if .ingress.ingressClassName }}
   ingressClassName: {{ .ingress.ingressClassName }}

charts/minecraft/templates/extraports-svc.yaml

@@ -13,9 +13,9 @@ metadata:
     chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
-    app.kubernetes.io/name: "{{ .Chart.Name }}"
+    app.kubernetes.io/name: "{{ $.Chart.Name }}"
     app.kubernetes.io/instance: {{ $minecraftFullname }}
-    app.kubernetes.io/version: "{{ .Chart.Version }}"
+    app.kubernetes.io/version: "{{ $.Chart.Version }}"
 spec:
 {{- if (or (eq .service.type "ClusterIP") (empty .service.type)) }}
   type: ClusterIP

charts/minecraft/templates/minecraft-svc.yaml

@@ -71,3 +71,6 @@ spec:
       {{- end }}
     {{- end }}
   {{- end }}
+{{- if .Values.minecraftServer.extraServiceSpec }}
+{{ toYaml .Values.minecraftServer.extraServiceSpec | indent 2 }}
+{{- end }}

charts/minecraft/values.yaml

@@ -115,6 +115,22 @@ sidecarContainers: []
 #           - vers=4
 extraVolumes: []
 
+
+## Array of extra objects to deploy with the release
+##
+# extraDeploy:
+#   - |
+#     apiVersion: v1
+#     kind: ConfigMap
+#     metadata:
+#       name: {{ template "minecraft.fullname" . }}-extra-cm
+#     data:
+#       key: |-
+#         {
+#           "key": "value"
+#         }
+extraDeploy: []
+
 minecraftServer:
   # This must be overridden, since we can't accept this for the user.
   eula: "FALSE"
@@ -247,6 +263,9 @@ minecraftServer:
   # A list of Spigot resources/plugins IDs to download.
   spigetResources: []
 
+  # Additional service specs to be defined
+  extraServiceSpec: {}
+
   # A list of Modrinth project slugs with optional version after colon
   modrinth:
     projects: []