feat: added tunnel for headless clients and makefile

.gitignore

@@ -0,0 +1 @@
+target/*

.helmignore

@@ -1,3 +1,5 @@
 docs/*
 test-values/*
 staging/*
+target/
+Makefile

Chart.yaml

@@ -38,7 +38,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: 0.4.0
+version: 0.5.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

Makefile

@@ -0,0 +1,38 @@
+define validate =
+	set -e
+	for v in $(find ./test-values -name "*.yaml") ; do
+		helm template -f ${v} . | kubeconform
+		echo "✓ Validating chart with ${v}"
+	done
+endef
+
+define snapshot =
+	set -e
+	mkdir -p test-fixtures
+	for v in $(find ./test-values -name "*.yaml") ; do
+		helm template -f ${v} . > ./test-fixtures/$(basename ${v})
+		echo "✓ Updating snapshot for ${v}"
+	done
+endef
+
+define test =
+	set -e
+	for v in $(find ./test-values -name "*.yaml") ; do
+		helm template -f ${v} . | diff - ./test-fixtures/$(basename ${v})
+		echo "✓ Diffing ${v} with ./test-fixtures/$(basename ${v})"
+	done
+endef
+
+.SILENT: validate package snapshot test
+
+.ONESHELL:
+
+validate: ; $(value validate)
+
+package: validate
+	mkdir -p target
+	helm package --dependency-update --destination target/ .
+
+snapshot: validate ; $(value snapshot)
+
+test: ; $(value test)

templates/configmap-headlessclient.yaml

@@ -4,6 +4,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "arma3.fullname" . }}-headlessclient
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   # TODO The profile name == the container name
   {{ .Values.headlessclient.name }}.Arma3Profile: |-
@@ -14,6 +20,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "arma3.fullname" . }}-headlessclient-env
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   ARMA_LIMITFPS: "100"
   {{- with .Values.config.env }}

staging/arma3-envoy-baboon-configmap.yaml → templates/configmap-tunnel.yaml

@@ -1,6 +1,16 @@
 # TODO: Can this go into one "cluster" config?
 # TODO: Can this go into one "listener" config?
+{{- if .Values.headlessclient.enabled }}
 apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "arma3.fullname" . }}-tunnel
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   envoy.yaml: |
     admin:
@@ -162,10 +172,4 @@ data:
                   socket_address:
                     address: 127.0.0.1
                     port_value: 2306
-kind: ConfigMap
-metadata:
-  creationTimestamp: "2022-11-02T21:30:07Z"
-  name: arma3-envoy-baboon
-  namespace: game-servers
-  resourceVersion: "39076310"
-  uid: 5fd02a1c-92fd-4b48-8225-9eb49c674352
+{{- end }}

templates/configmap.yaml

@@ -2,6 +2,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "arma3.fullname" . }}
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   main.cfg: |-
     // GENERAL SETTINGS
@@ -29,6 +35,12 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "arma3.fullname" . }}-env
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   ARMA_CONFIG: main.cfg
   ARMA_LIMITFPS: "100"

templates/deployment.yaml

@@ -106,6 +106,28 @@ spec:
               mountPath: /opt/rsyncd
               readOnly: false
         {{- end }}
+      {{- if .Values.headlessclient.enabled }}
+        - name: tunnel
+          image: "{{ .Values.tunnel.image.repository }}:{{ .Values.tunnel.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+          - containerPort: 2502
+            protocol: UDP
+          - containerPort: 2503
+            protocol: UDP
+          - containerPort: 2504
+            protocol: UDP
+          - containerPort: 2505
+            protocol: UDP
+          - containerPort: 2506
+            protocol: UDP
+          resources:
+            {{- toYaml .Values.tunnel.resources | nindent 12 }}
+          volumeMounts:
+          - mountPath: /etc/envoy
+            name: envoy-config
+            readOnly: true
+          {{- end }}
         - name: server
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -195,6 +217,12 @@ spec:
           emptyDir: {}
         - name: steamcmd
           emptyDir: {}
+        {{- if .Values.headlessclient.enabled }}
+        - name: envoy-config
+          configMap:
+            defaultMode: 420
+            name: {{ include "arma3.fullname" . }}-tunnel
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/headlessclient.yaml

@@ -95,7 +95,7 @@ spec:
             - name: SKIP_INSTALL
               value: "true"
             - name: ARMA_PARAMS
-              value: -client -connect={{ include "arma3.fullname" . }} -password={{ include "serverPassword" . }} -nosound -name={{ .Values.headlessclient.name }}
+              value: -client -connect={{ include "arma3.fullname" . }}-tunnel -password={{ include "serverPassword" . }} -nosound -name={{ .Values.headlessclient.name }}
             {{- if .Values.config.env.MODS_PRESET }}
             - name: MODS_PRESET
               value: {{ .Values.config.env.MODS_PRESET }}

templates/service-tunnel.yaml

@@ -0,0 +1,39 @@
+{{- if .Values.headlessclient.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "arma3.fullname" . }}-tunnel
+  labels:
+    {{- include "arma3.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  ports:
+    - name: udp-1
+      port: 2302
+      targetPort: 2302
+      protocol: UDP
+    - name: udp-2
+      port: 2303
+      targetPort: 2303
+      protocol: UDP
+    - name: upd-3
+      port: 2304
+      targetPort: 2304
+      protocol: UDP
+    - name: upd-4
+      port: 2305
+      targetPort: 2305
+      protocol: UDP
+    - name: upd-5
+      port: 2306
+      targetPort: 2306
+      protocol: UDP
+  selector:
+    {{- include "arma3.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: server
+  sessionAffinity: None
+  type: ClusterIP
+{{- end }}