Skip to content

Commit

Permalink
Merge pull request #22 from Haloghen/bugfix/names
Browse files Browse the repository at this point in the history
  • Loading branch information
James Rhoat authored Nov 13, 2022
2 parents 2206658 + 7fe2a56 commit ae4e899
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion charts/factorio-server-charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sources:
# 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.1.1
version: 1.1.2

# 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
Expand Down

This file was deleted.

3 changes: 3 additions & 0 deletions charts/factorio-server-charts/ci/rcon-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ service:

server_settings:
name: "ClusterIP Test"

serverPassword:
game_password: 'CHANGEME'
6 changes: 3 additions & 3 deletions charts/factorio-server-charts/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
mountPath: /account
{{- end }}
{{- if or (.Values.serverPassword.game_password) (.Values.serverPassword.passwordSecret) }}
- name: gamePassword
- name: game-password
mountPath: /gamePassword
{{- end }}
{{- if .Values.mods.enabled }}
Expand Down Expand Up @@ -166,12 +166,12 @@ spec:
{{- end }}
{{- end }}
{{- if or (.Values.serverPassword.game_password) (.Values.serverPassword.passwordSecret) }}
- name: gamePassword
- name: game-password
secret:
{{- if .Values.serverPassword.passwordSecret }}
secretName: {{ .Values.serverPassword.passwordSecret }}
{{- else }}
secretName: {{ template "factorio-server-charts.fullname" . }}-account
secretName: {{ template "factorio-server-charts.fullname" . }}-password
{{- end }}
{{- end }}
- name: datadir
Expand Down

0 comments on commit ae4e899

Please sign in to comment.