From b5f48a51a4dff7d0b33d5f79c342466d5ffb89a8 Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Fri, 28 Feb 2025 12:54:14 +0100 Subject: [PATCH 1/7] Autogenerated initial helm chart --- charts/rust/.helmignore | 23 ++++ charts/rust/Chart.yaml | 24 ++++ charts/rust/templates/NOTES.txt | 22 ++++ charts/rust/templates/_helpers.tpl | 62 +++++++++ charts/rust/templates/deployment.yaml | 68 ++++++++++ charts/rust/templates/hpa.yaml | 32 +++++ charts/rust/templates/ingress.yaml | 43 ++++++ charts/rust/templates/service.yaml | 15 +++ charts/rust/templates/serviceaccount.yaml | 13 ++ .../rust/templates/tests/test-connection.yaml | 15 +++ charts/rust/values.yaml | 123 ++++++++++++++++++ 11 files changed, 440 insertions(+) create mode 100644 charts/rust/.helmignore create mode 100644 charts/rust/Chart.yaml create mode 100644 charts/rust/templates/NOTES.txt create mode 100644 charts/rust/templates/_helpers.tpl create mode 100644 charts/rust/templates/deployment.yaml create mode 100644 charts/rust/templates/hpa.yaml create mode 100644 charts/rust/templates/ingress.yaml create mode 100644 charts/rust/templates/service.yaml create mode 100644 charts/rust/templates/serviceaccount.yaml create mode 100644 charts/rust/templates/tests/test-connection.yaml create mode 100644 charts/rust/values.yaml diff --git a/charts/rust/.helmignore b/charts/rust/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/rust/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/rust/Chart.yaml b/charts/rust/Chart.yaml new file mode 100644 index 0000000..b6a3037 --- /dev/null +++ b/charts/rust/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: rust +description: A Helm chart for running a Rust dedicated server on Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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.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 +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/charts/rust/templates/NOTES.txt b/charts/rust/templates/NOTES.txt new file mode 100644 index 0000000..f541454 --- /dev/null +++ b/charts/rust/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "rust.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "rust.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "rust.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "rust.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/rust/templates/_helpers.tpl b/charts/rust/templates/_helpers.tpl new file mode 100644 index 0000000..1db7690 --- /dev/null +++ b/charts/rust/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "rust.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "rust.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "rust.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "rust.labels" -}} +helm.sh/chart: {{ include "rust.chart" . }} +{{ include "rust.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "rust.selectorLabels" -}} +app.kubernetes.io/name: {{ include "rust.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "rust.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "rust.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/rust/templates/deployment.yaml b/charts/rust/templates/deployment.yaml new file mode 100644 index 0000000..6cfeed2 --- /dev/null +++ b/charts/rust/templates/deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "rust.fullname" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "rust.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "rust.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "rust.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/rust/templates/hpa.yaml b/charts/rust/templates/hpa.yaml new file mode 100644 index 0000000..eb17ddd --- /dev/null +++ b/charts/rust/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "rust.fullname" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "rust.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/rust/templates/ingress.yaml b/charts/rust/templates/ingress.yaml new file mode 100644 index 0000000..32a296f --- /dev/null +++ b/charts/rust/templates/ingress.yaml @@ -0,0 +1,43 @@ +{{- if .Values.ingress.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "rust.fullname" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .Values.ingress.className }} + ingressClassName: {{ . }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- with .pathType }} + pathType: {{ . }} + {{- end }} + backend: + service: + name: {{ include "rust.fullname" $ }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/rust/templates/service.yaml b/charts/rust/templates/service.yaml new file mode 100644 index 0000000..89803a7 --- /dev/null +++ b/charts/rust/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "rust.fullname" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "rust.selectorLabels" . | nindent 4 }} diff --git a/charts/rust/templates/serviceaccount.yaml b/charts/rust/templates/serviceaccount.yaml new file mode 100644 index 0000000..a1ea58b --- /dev/null +++ b/charts/rust/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "rust.serviceAccountName" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/charts/rust/templates/tests/test-connection.yaml b/charts/rust/templates/tests/test-connection.yaml new file mode 100644 index 0000000..9953184 --- /dev/null +++ b/charts/rust/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "rust.fullname" . }}-test-connection" + labels: + {{- include "rust.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "rust.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml new file mode 100644 index 0000000..77bcf2c --- /dev/null +++ b/charts/rust/values.yaml @@ -0,0 +1,123 @@ +# Default values for rust. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ +replicaCount: 1 + +# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ +image: + repository: nginx + # This sets the pull policy for images. + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +# This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +imagePullSecrets: [] +# This is to override the chart name. +nameOverride: "" +fullnameOverride: "" + +# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/ +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +# This is for setting Kubernetes Annotations to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +podAnnotations: {} +# This is for setting Kubernetes Labels to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/ +service: + # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: ClusterIP + # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports + port: 80 + +# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +# This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} From 06bfab3ce6c8c19cbecee0514db60c9c54221cc3 Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Fri, 28 Feb 2025 13:37:42 +0100 Subject: [PATCH 2/7] Converted to statefulset, added image and ports config --- charts/rust/Chart.yaml | 2 +- charts/rust/templates/service.yaml | 12 ++++++++---- .../templates/{deployment.yaml => statefulset.yaml} | 12 ++++++++---- charts/rust/values.yaml | 6 ++---- 4 files changed, 19 insertions(+), 13 deletions(-) rename charts/rust/templates/{deployment.yaml => statefulset.yaml} (88%) diff --git a/charts/rust/Chart.yaml b/charts/rust/Chart.yaml index b6a3037..2c216a4 100644 --- a/charts/rust/Chart.yaml +++ b/charts/rust/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "build-17530898" diff --git a/charts/rust/templates/service.yaml b/charts/rust/templates/service.yaml index 89803a7..a2db47a 100644 --- a/charts/rust/templates/service.yaml +++ b/charts/rust/templates/service.yaml @@ -7,9 +7,13 @@ metadata: spec: type: {{ .Values.service.type }} ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http + - name: server-port + port: 28015 + targetPort: server-port + protocol: UDP + - name: rcon-port + port: 28016 + targetPort: rcon-port + protocol: UDP selector: {{- include "rust.selectorLabels" . | nindent 4 }} diff --git a/charts/rust/templates/deployment.yaml b/charts/rust/templates/statefulset.yaml similarity index 88% rename from charts/rust/templates/deployment.yaml rename to charts/rust/templates/statefulset.yaml index 6cfeed2..b7411d3 100644 --- a/charts/rust/templates/deployment.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -1,11 +1,12 @@ apiVersion: apps/v1 -kind: Deployment +kind: StatefulSet metadata: name: {{ include "rust.fullname" . }} labels: {{- include "rust.labels" . | nindent 4 }} spec: {{- if not .Values.autoscaling.enabled }} + serviceName: {{ include "rust.fullname" . }} replicas: {{ .Values.replicaCount }} {{- end }} selector: @@ -37,9 +38,12 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP + - name: server-port + containerPort: 28015 + protocol: UDP + - name: rcon-port + containerPort: 28016 + protocol: UDP livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml index 77bcf2c..3937b0b 100644 --- a/charts/rust/values.yaml +++ b/charts/rust/values.yaml @@ -7,11 +7,11 @@ replicaCount: 1 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ image: - repository: nginx + repository: "pfeiffermax/rust-game-server" # This sets the pull policy for images. pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "" + tag: "latest" # This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ imagePullSecrets: [] @@ -53,8 +53,6 @@ securityContext: {} service: # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types type: ClusterIP - # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports - port: 80 # This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ ingress: From 90737068524725de04e04d91114994c309365bb3 Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Fri, 28 Feb 2025 14:08:30 +0100 Subject: [PATCH 3/7] Added server and volume config --- charts/rust/templates/statefulset.yaml | 44 ++++++++++++++++++++++---- charts/rust/values.yaml | 21 +++++------- 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/charts/rust/templates/statefulset.yaml b/charts/rust/templates/statefulset.yaml index b7411d3..f0ceccd 100644 --- a/charts/rust/templates/statefulset.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -37,6 +37,33 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + command: + - "+server.ip" + - "0.0.0.0" + - "+server.port" + - "28015" + - "+server.hostname" + - {{ .Values.rustDedicatedServer.hostName }} + - "+server.maxplayers" + - {{ .Values.rustDedicatedServer.maxPlayers }} + - "+server.worldsize" + - {{ .Values.rustDedicatedServer.worldSize }} + - "+server.gamemode" + - "vanilla" + - "+server.seed" + - {{ .Values.rustDedicatedServer.seed }} + - "+server.identity" + - "dedicated" + - "+rcon.ip" + - "0.0.0.0" + - "+rcon.port" + - "28016" + - "+rcon.password" + - {{ .Values.rustDedicatedServer.rconPassword }} + - "+rcon.web" + - {{ .Values.rustDedicatedServer.rconWeb }} + - "-logfile" + - "/var/log/rust-server-dedicated.log" ports: - name: server-port containerPort: 28015 @@ -50,14 +77,9 @@ spec: {{- toYaml .Values.readinessProbe | nindent 12 }} resources: {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.volumeMounts }} volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} + - name: server-identity + mountPath: "/srv/rust/server/dedicated" {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -70,3 +92,11 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + volumeClaimTemplates: + - metadata: + name: server-identity + spec: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 1Gi \ No newline at end of file diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml index 3937b0b..4859e73 100644 --- a/charts/rust/values.yaml +++ b/charts/rust/values.yaml @@ -101,21 +101,16 @@ autoscaling: targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 -# Additional volumes on the output Deployment definition. -volumes: [] -# - name: foo -# secret: -# secretName: mysecret -# optional: false - -# Additional volumeMounts on the output Deployment definition. -volumeMounts: [] -# - name: foo -# mountPath: "/etc/foo" -# readOnly: true - nodeSelector: {} tolerations: [] affinity: {} + +rustDedicatedServer: + hostName: "Vanilla-Rust-Server" + maxPlayers: "20" + worldSize: "3000" + seed: "666" + rconWeb: "0" + rconPassword: "password" From 5c6ecbc1ef330b2ad49870fe9cbb175987fd247a Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Sun, 2 Mar 2025 10:19:31 +0100 Subject: [PATCH 4/7] Configured logfile, removed autoscaling config --- charts/rust/templates/hpa.yaml | 32 -------------------------- charts/rust/templates/statefulset.yaml | 2 +- charts/rust/values.yaml | 8 ------- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 charts/rust/templates/hpa.yaml diff --git a/charts/rust/templates/hpa.yaml b/charts/rust/templates/hpa.yaml deleted file mode 100644 index eb17ddd..0000000 --- a/charts/rust/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "rust.fullname" . }} - labels: - {{- include "rust.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "rust.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/rust/templates/statefulset.yaml b/charts/rust/templates/statefulset.yaml index f0ceccd..9fd132e 100644 --- a/charts/rust/templates/statefulset.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -63,7 +63,7 @@ spec: - "+rcon.web" - {{ .Values.rustDedicatedServer.rconWeb }} - "-logfile" - - "/var/log/rust-server-dedicated.log" + - "/srv/rust/server/dedicated/logs/rust-server.log" ports: - name: server-port containerPort: 28015 diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml index 4859e73..61f28e2 100644 --- a/charts/rust/values.yaml +++ b/charts/rust/values.yaml @@ -93,14 +93,6 @@ readinessProbe: path: / port: http -# This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - nodeSelector: {} tolerations: [] From 0e4a6263caeb0fd8cb266b1d04e0e5182f79dccd Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Sun, 2 Mar 2025 12:23:08 +0100 Subject: [PATCH 5/7] Added lifecycle probes and secret, removed ingress --- build/Dockerfile | 4 +++ charts/rust/templates/ingress.yaml | 43 -------------------------- charts/rust/templates/secret.yaml | 9 ++++++ charts/rust/templates/statefulset.yaml | 24 ++++++++++++-- charts/rust/values.yaml | 27 ---------------- 5 files changed, 34 insertions(+), 73 deletions(-) delete mode 100644 charts/rust/templates/ingress.yaml create mode 100644 charts/rust/templates/secret.yaml diff --git a/build/Dockerfile b/build/Dockerfile index d2c2305..5e00770 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,9 @@ FROM steamcmd/steamcmd:debian-bookworm +RUN apt-get update \ + && apt-get install --no-install-recommends -y \ + netcat-traditional + WORKDIR /srv/rust RUN steamcmd +force_install_dir /srv/rust +login anonymous +app_update 258550 validate +quit diff --git a/charts/rust/templates/ingress.yaml b/charts/rust/templates/ingress.yaml deleted file mode 100644 index 32a296f..0000000 --- a/charts/rust/templates/ingress.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{{- if .Values.ingress.enabled -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ include "rust.fullname" . }} - labels: - {{- include "rust.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- with .Values.ingress.className }} - ingressClassName: {{ . }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- with .pathType }} - pathType: {{ . }} - {{- end }} - backend: - service: - name: {{ include "rust.fullname" $ }} - port: - number: {{ $.Values.service.port }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/rust/templates/secret.yaml b/charts/rust/templates/secret.yaml new file mode 100644 index 0000000..68d163c --- /dev/null +++ b/charts/rust/templates/secret.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: {{ include "rust.fullname" . }} + labels: + {{- include "rust.labels" . | nindent 4 }} +type: Opaque +stringData: + rconPassword: "{{ .Values.rustDedicatedServer.rconPassword }}" \ No newline at end of file diff --git a/charts/rust/templates/statefulset.yaml b/charts/rust/templates/statefulset.yaml index 9fd132e..e3515a4 100644 --- a/charts/rust/templates/statefulset.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -59,11 +59,17 @@ spec: - "+rcon.port" - "28016" - "+rcon.password" - - {{ .Values.rustDedicatedServer.rconPassword }} + - "$RCON_PASSWORD" - "+rcon.web" - {{ .Values.rustDedicatedServer.rconWeb }} - "-logfile" - "/srv/rust/server/dedicated/logs/rust-server.log" + env: + - name: RCON_PASSWORD + valueFrom: + secretKeyRef: + name: {{ include "rust.fullname" . }} + key: rconPassword ports: - name: server-port containerPort: 28015 @@ -72,9 +78,21 @@ spec: containerPort: 28016 protocol: UDP livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} + exec: + command: + - "nc" + - "-up" + - "127.0.0.1" + - "28015" + - "28016" readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} + exec: + command: + - "nc" + - "-up" + - "127.0.0.1" + - "28015" + - "28016" resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml index 61f28e2..75b57cc 100644 --- a/charts/rust/values.yaml +++ b/charts/rust/values.yaml @@ -54,23 +54,6 @@ service: # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types type: ClusterIP -# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little @@ -83,16 +66,6 @@ resources: {} # cpu: 100m # memory: 128Mi -# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ -livenessProbe: - httpGet: - path: / - port: http -readinessProbe: - httpGet: - path: / - port: http - nodeSelector: {} tolerations: [] From 4cd3d5f5094921ad5fc79be91fb405219cececba Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Sun, 2 Mar 2025 13:14:35 +0100 Subject: [PATCH 6/7] Added config for additional ports --- charts/rust/templates/service.yaml | 20 ++++++++++++++++---- charts/rust/templates/statefulset.yaml | 24 +++++++++++++++++++----- charts/rust/values.yaml | 4 ++++ 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/charts/rust/templates/service.yaml b/charts/rust/templates/service.yaml index a2db47a..8774707 100644 --- a/charts/rust/templates/service.yaml +++ b/charts/rust/templates/service.yaml @@ -8,12 +8,24 @@ spec: type: {{ .Values.service.type }} ports: - name: server-port - port: 28015 + port: {{ .Values.rustDedicatedServer.serverPort }} targetPort: server-port protocol: UDP - - name: rcon-port - port: 28016 - targetPort: rcon-port + - name: rcon-port-udp + port: {{ .Values.rustDedicatedServer.rconPort }} + targetPort: rcon-port-udp protocol: UDP + - name: rcon-port-tcp + port: {{ .Values.rustDedicatedServer.rconPort }} + targetPort: rcon-port-tcp + protocol: TCP + - name: server-query-port + port: {{ .Values.rustDedicatedServer.serverQueryPort }} + targetPort: server-query-port + protocol: UDP + - name: app-port + port: {{ .Values.rustDedicatedServer.appPort }} + targetPort: app-port + protocol: TCP selector: {{- include "rust.selectorLabels" . | nindent 4 }} diff --git a/charts/rust/templates/statefulset.yaml b/charts/rust/templates/statefulset.yaml index e3515a4..71777f5 100644 --- a/charts/rust/templates/statefulset.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -42,6 +42,8 @@ spec: - "0.0.0.0" - "+server.port" - "28015" + - "+server.queryport" + - {{ .Values.rustDedicatedServer.serverQueryPort}} - "+server.hostname" - {{ .Values.rustDedicatedServer.hostName }} - "+server.maxplayers" @@ -62,6 +64,8 @@ spec: - "$RCON_PASSWORD" - "+rcon.web" - {{ .Values.rustDedicatedServer.rconWeb }} + - "+app.port" + - {{ .Values.rustDedicatedServer.appPort }} - "-logfile" - "/srv/rust/server/dedicated/logs/rust-server.log" env: @@ -72,11 +76,20 @@ spec: key: rconPassword ports: - name: server-port - containerPort: 28015 + containerPort: {{ .Values.rustDedicatedServer.serverPort }} protocol: UDP - - name: rcon-port - containerPort: 28016 + - name: rcon-port-udp + containerPort: {{ .Values.rustDedicatedServer.rconPort }} protocol: UDP + - name: rcon-port-tcp + containerPort: {{ .Values.rustDedicatedServer.rconPort }} + protocol: TCP + - name: server-query-port + containerPort: {{ .Values.rustDedicatedServer.serverQueryPort }} + protocol: UDP + - name: app-port + containerPort: {{ .Values.rustDedicatedServer.appPort }} + protocol: TCP livenessProbe: exec: command: @@ -114,7 +127,8 @@ spec: - metadata: name: server-identity spec: - accessModes: [ "ReadWriteOnce" ] + accessModes: + - "ReadWriteOnce" resources: requests: - storage: 1Gi \ No newline at end of file + storage: 5Gi \ No newline at end of file diff --git a/charts/rust/values.yaml b/charts/rust/values.yaml index 75b57cc..fde3c7d 100644 --- a/charts/rust/values.yaml +++ b/charts/rust/values.yaml @@ -74,6 +74,10 @@ affinity: {} rustDedicatedServer: hostName: "Vanilla-Rust-Server" + serverPort: "28015" + rconPort: "28016" + serverQueryPort: "28017" + appPort: "28082" maxPlayers: "20" worldSize: "3000" seed: "666" From e13c47023ef69407e66cf8495cddac69573f9375 Mon Sep 17 00:00:00 2001 From: Max Pfeiffer <max@maxpfeiffer.ch> Date: Sun, 2 Mar 2025 13:39:52 +0100 Subject: [PATCH 7/7] Some fixes for ports --- charts/rust/templates/statefulset.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/charts/rust/templates/statefulset.yaml b/charts/rust/templates/statefulset.yaml index 71777f5..0dbebd6 100644 --- a/charts/rust/templates/statefulset.yaml +++ b/charts/rust/templates/statefulset.yaml @@ -41,7 +41,7 @@ spec: - "+server.ip" - "0.0.0.0" - "+server.port" - - "28015" + - {{ .Values.rustDedicatedServer.serverPort }} - "+server.queryport" - {{ .Values.rustDedicatedServer.serverQueryPort}} - "+server.hostname" @@ -59,7 +59,7 @@ spec: - "+rcon.ip" - "0.0.0.0" - "+rcon.port" - - "28016" + - {{ .Values.rustDedicatedServer.rconPort }} - "+rcon.password" - "$RCON_PASSWORD" - "+rcon.web" @@ -94,18 +94,16 @@ spec: exec: command: - "nc" - - "-up" + - "-nuzv" - "127.0.0.1" - - "28015" - - "28016" + - {{ .Values.rustDedicatedServer.serverPort }} readinessProbe: exec: command: - "nc" - - "-up" + - "-nuzv" - "127.0.0.1" - - "28015" - - "28016" + - {{ .Values.rustDedicatedServer.serverPort }} resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: