Merge pull request #60 from max-pfeiffer/feature/helm-chart-existing-secret

Added existing secret and game mode support to helm chart

Author: max-pfeiffer

.github/workflows/code-quality.yaml

@@ -1,6 +1,10 @@
 name: Code Quality
 
-on: push
+on:
+  push:
+    paths:
+      - build/**
+      - tests/**
 
 jobs:
   code-quality:

charts/rust/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/rust/README.md

@@ -65,6 +65,8 @@ rustDedicatedServer:
   maxPlayers: "20"
   # World size
   worldSize: "3000"
+  # Game mode. Options: vanilla, softcore, hardcore, weapontest, primitive
+  gameMode: "vanilla"  
   # Map seed, always use a string here as Helm number conversion might produce incompatible strings.
   seed: "666"
   # Use 1 to switch on websocket rcon, 0 to switch off websocket rcon
@@ -73,4 +75,8 @@ rustDedicatedServer:
   rconPassword: "yourpassword"
   # Volume size for server identity directory. Rust server stores it's config, saves and blueprints there
   volumeStorageSize: "1Gi"
+  # Name of the existing secret to use for the rconPassword.
+  # If this is set, rustDedicatedServer.rconPassword will be ignored.
+  # The existing secret needs to have stored Rust rconPassword under the key rconPassword.
+  existingSecret: ""
 ```

charts/rust/templates/secret.yaml

@@ -1,3 +1,4 @@
+{{- if not .Values.rustDedicatedServer.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -6,4 +7,5 @@ metadata:
     {{- include "rust.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  rconPassword: "{{ .Values.rustDedicatedServer.rconPassword }}"
+  rconPassword: "{{ .Values.rustDedicatedServer.rconPassword }}"
+{{- end }}

charts/rust/templates/statefulset.yaml

@@ -49,7 +49,7 @@ spec:
             - "+server.worldsize"
             - "{{ .Values.rustDedicatedServer.worldSize }}"
             - "+server.gamemode"
-            - "vanilla"
+            - "{{ .Values.rustDedicatedServer.gameMode }}"
             - "+server.seed"
             - "{{ .Values.rustDedicatedServer.seed }}"
             - "+server.identity"
@@ -68,7 +68,7 @@ spec:
             - name: RCON_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "rust.fullname" . }}
+                  name: {{ ternary (include "rust.fullname" .) .Values.rustDedicatedServer.existingSecret (empty .Values.rustDedicatedServer.existingSecret) }}
                   key: rconPassword
           ports:
             - name: server-port

charts/rust/values.yaml

@@ -105,6 +105,8 @@ rustDedicatedServer:
   maxPlayers: "20"
   # World size
   worldSize: "3000"
+  # Game mode. Options: vanilla, softcore, hardcore, weapontest, primitive
+  gameMode: "vanilla"
   # Map seed, always use a string here as Helm number conversion might produce incompatible strings.
   seed: "666"
   # Use 1 to switch on websocket rcon, 0 to switch off websocket rcon
@@ -113,3 +115,7 @@ rustDedicatedServer:
   rconPassword: "yourpassword"
   # Volume size for server identity directory. Rust server stores it's config, saves and blueprints there
   volumeStorageSize: "1Gi"
+  # Name of the existing secret to use for the rconPassword.
+  # If this is set, rustDedicatedServer.rconPassword will be ignored.
+  # The existing secret needs to have stored Rust rconPassword under the key rconPassword.
+  existingSecret: ""

poetry.lock

@@ -15,10 +15,10 @@ steam = {git = "https://github.com/detiam/steam_websocket.git", branch = "master
 [tool.poetry.group.dev.dependencies]
 bcrypt = "4.3.0"
 furl = "2.1.4"
-pre-commit = "4.2.0"
+pre-commit = "4.3.0"
 pytest = "8.4.1"
 pytest-cov = "6.2.1"
-testcontainers = "4.10.0"
+testcontainers = "4.12.0"
 
 [tool.ruff]
 exclude = [".venv"]