diff --git a/incubator/eco/3.0.0/app-changelog.md b/incubator/eco/3.0.0/app-changelog.md deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/incubator/eco/3.0.0/charts/common-14.0.1.tgz b/incubator/eco/3.0.0/charts/common-14.0.1.tgz deleted file mode 100644 index 656c64047b2..00000000000 Binary files a/incubator/eco/3.0.0/charts/common-14.0.1.tgz and /dev/null differ diff --git a/incubator/eco/3.0.0/ix_values.yaml b/incubator/eco/3.0.0/ix_values.yaml deleted file mode 100644 index 3a82f1202b6..00000000000 --- a/incubator/eco/3.0.0/ix_values.yaml +++ /dev/null @@ -1,64 +0,0 @@ -image: - pullPolicy: IfNotPresent - repository: tccr.io/truecharts/eco - tag: latest@sha256:b68c9690ea433e1d94363ebf5384342652ab2d9316a2d71c740202669c76aca5 - -securityContext: - container: - runAsNonRoot: false - readOnlyRootFilesystem: false - runAsUser: 0 - runAsGroup: 0 - -service: - main: - ports: - main: - port: 3001 - protocol: http - targetPort: 3001 - game: - enabled: true - ports: - game: - enabled: true - port: 3000 - protocol: udp - targetPort: 3000 - -workload: - main: - podSpec: - containers: - main: - probes: - liveness: - path: "/" - type: http - port: "{{ .Values.service.main.ports.main.targetPort }}" - readiness: - path: "/" - type: http - port: "{{ .Values.service.main.ports.main.targetPort }}" - startup: - type: tcp - port: "{{ .Values.service.main.ports.main.targetPort }}" - env: - USERNAME: "" - PASSWRD: "" - GAME_ID: "739590" - GAME_PARAMS: "" - VALIDATE: false - # DATA_PERM: "770" - -persistence: - steamcmd: - enabled: true - mountPath: /serverdata/steamcmd - serverfiles: - enabled: true - mountPath: /serverdata/serverfiles - -portal: - open: - enabled: true diff --git a/incubator/eco/3.0.0/templates/common.yaml b/incubator/eco/3.0.0/templates/common.yaml deleted file mode 100644 index b51394e00a4..00000000000 --- a/incubator/eco/3.0.0/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "tc.v1.common.loader.all" . }} diff --git a/incubator/eco/3.0.0/CHANGELOG.md b/incubator/eco/3.1.0/CHANGELOG.md similarity index 94% rename from incubator/eco/3.0.0/CHANGELOG.md rename to incubator/eco/3.1.0/CHANGELOG.md index f031235f84c..c38cd4e1bb0 100644 --- a/incubator/eco/3.0.0/CHANGELOG.md +++ b/incubator/eco/3.1.0/CHANGELOG.md @@ -4,6 +4,11 @@ +## [eco-3.1.0](https://github.com/truecharts/charts/compare/eco-3.0.0...eco-3.1.0) (2023-09-05) + + + + ## [eco-3.0.0](https://github.com/truecharts/charts/compare/eco-2.0.8...eco-3.0.0) (2023-07-31) @@ -89,11 +94,6 @@ -## [eco-2.0.2](https://github.com/truecharts/charts/compare/doublecommander-6.0.1...eco-2.0.2) (2022-11-30) - - - - ## [eco-2.0.2](https://github.com/truecharts/charts/compare/doublecommander-6.0.1...eco-2.0.2) (2022-11-30) diff --git a/incubator/eco/3.0.0/Chart.yaml b/incubator/eco/3.1.0/Chart.yaml similarity index 95% rename from incubator/eco/3.0.0/Chart.yaml rename to incubator/eco/3.1.0/Chart.yaml index 0d5a5328c8c..2ee1adf0cf2 100644 --- a/incubator/eco/3.0.0/Chart.yaml +++ b/incubator/eco/3.1.0/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 14.0.1 + version: 14.0.3 deprecated: false description: A custom SteamCMD chart that runs ECO. home: https://truecharts.org/charts/incubator/eco @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/eco - https://github.com/ich777/docker-steamcmd-server/tree/eco type: application -version: 3.0.0 +version: 3.1.0 annotations: truecharts.org/catagories: | - games diff --git a/incubator/eco/3.0.0/README.md b/incubator/eco/3.1.0/README.md similarity index 100% rename from incubator/eco/3.0.0/README.md rename to incubator/eco/3.1.0/README.md diff --git a/incubator/eco/3.1.0/app-changelog.md b/incubator/eco/3.1.0/app-changelog.md new file mode 100644 index 00000000000..029b5e17267 --- /dev/null +++ b/incubator/eco/3.1.0/app-changelog.md @@ -0,0 +1,4 @@ + + +## [eco-3.1.0](https://github.com/truecharts/charts/compare/eco-3.0.0...eco-3.1.0) (2023-09-05) + diff --git a/incubator/eco/3.0.0/app-readme.md b/incubator/eco/3.1.0/app-readme.md similarity index 100% rename from incubator/eco/3.0.0/app-readme.md rename to incubator/eco/3.1.0/app-readme.md diff --git a/incubator/eco/3.1.0/charts/common-14.0.3.tgz b/incubator/eco/3.1.0/charts/common-14.0.3.tgz new file mode 100644 index 00000000000..9dab2456ffc Binary files /dev/null and b/incubator/eco/3.1.0/charts/common-14.0.3.tgz differ diff --git a/incubator/eco/3.1.0/ix_values.yaml b/incubator/eco/3.1.0/ix_values.yaml new file mode 100644 index 00000000000..e6f1f1f47f5 --- /dev/null +++ b/incubator/eco/3.1.0/ix_values.yaml @@ -0,0 +1,99 @@ +image: + pullPolicy: IfNotPresent + repository: tccr.io/truecharts/eco + tag: latest@sha256:b68c9690ea433e1d94363ebf5384342652ab2d9316a2d71c740202669c76aca5 + +securityContext: + container: + runAsNonRoot: false + readOnlyRootFilesystem: false + runAsUser: 0 + runAsGroup: 0 + +service: + main: + ports: + main: + protocol: http + port: 3001 + game: + enabled: true + ports: + game: + enabled: true + protocol: udp + port: 3000 + +eco: + game: + id: 739590 + user: "" + password: "" + validate: false + params: [] + network: + PublicServer: true + Playtime: "" + DiscordAddress: "" + Password: "" + # server name + Description: "Truecharts ECO Server" + # server description + DetailedDescription: "Vanilla ECO game" + ServerCategory: "None" + RemoteAddress: "localhost:3000/" + IPAddress: "Any" + GameServerPort: "{{ .Values.service.game.ports.game.port }}" + WebServerPort: "{{ .Values.service.main.ports.main.port }}" + WebServerUrl: "localhost:3001" + Rate: 20 + MaxConnections: -1 + UPnPEnabled: false + +workload: + main: + podSpec: + containers: + main: + probes: + liveness: + path: "/" + type: http + port: "{{ .Values.service.main.ports.main.port }}" + readiness: + path: "/" + type: http + port: "{{ .Values.service.main.ports.main.port }}" + startup: + type: tcp + port: "{{ .Values.service.main.ports.main.port }}" + env: + STEAMCMD_DIR: "{{ .Values.persistence.steamcmd.mountPath }}" + SERVER_DIR: "{{ .Values.persistence.serverfiles.mountPath }}" + GAME_ID: "{{ .Values.eco.game.id }}" + USERNAME: "{{ .Values.eco.game.user }}" + PASSWRD: "{{ .Values.eco.game.password }}" + GAME_PARAMS: '{{ join " " .Values.eco.game.params }}' + VALIDATE: "{{ .Values.eco.game.validate }}" + +persistence: + steamcmd: + enabled: true + mountPath: /serverdata/steamcmd + serverfiles: + enabled: true + mountPath: /serverdata/serverfiles + network-config: + enabled: true + type: configmap + objectName: eco-network + targetSelector: + main: + main: + mountPath: /serverdata/serverfiles/Configs/Network.eco + subPath: Network.eco + readOnly: true + +portal: + open: + enabled: true diff --git a/incubator/eco/3.0.0/questions.yaml b/incubator/eco/3.1.0/questions.yaml similarity index 95% rename from incubator/eco/3.0.0/questions.yaml rename to incubator/eco/3.1.0/questions.yaml index abc85999851..aa84702332b 100644 --- a/incubator/eco/3.0.0/questions.yaml +++ b/incubator/eco/3.1.0/questions.yaml @@ -101,44 +101,6 @@ questions: type: dict attrs: - - variable: env - label: Image Environment - schema: - additional_attrs: true - type: dict - attrs: - - variable: USERNAME - label: "UserName" - description: "Your Steam username (optionally leave it blank)." - schema: - type: string - default: "" - - variable: PASSWRD - label: "Password" - description: "Your Steam password (optionally leave it blank)" - schema: - type: string - private: true - default: "" - - variable: GAME_ID - label: "Game ID" - description: "The ID of the container to download at start up." - schema: - type: string - default: "" - - variable: GAME_PARAMS - label: "Game Params" - description: "Enter your start up commands for the server." - schema: - type: string - default: "" - - variable: VALIDATE - label: "Validate" - description: "Set the Variable to true if you want to validate the installation otherwise leave it blank." - schema: - type: boolean - default: true - - variable: envList label: Extra Environment Variables description: "Please be aware that some variables are set in the background, adding duplicates here might cause issues or prevent the app from starting..." @@ -188,6 +150,141 @@ questions: label: Param schema: type: string + + - variable: eco + group: App Configuration + label: Eco + schema: + additional_attrs: true + type: dict + attrs: + - variable: game + label: Game Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: id + label: Game Id + description: The ID of the container to download at start up. + schema: + type: string + required: true + default: "739590" + - variable: user + label: Steam User + description: Leave blank for anonymous login. + schema: + type: string + default: "" + - variable: password + label: Steam Password + description: Leave blank for anonymous login. + schema: + type: string + default: "" + - variable: validate + label: Validate + description: Validates the game data. + schema: + type: boolean + default: true + - variable: params + label: Game Params + schema: + type: list + default: [] + required: true + items: + - variable: param + label: Param + schema: + type: string + required: true + default: "" + - variable: network + label: Network Configuration + schema: + additional_attrs: true + type: dict + attrs: + - variable: PublicServer + label: Public Server + description: Defines if other players can see server. + schema: + type: boolean + default: false + - variable: Playtime + label: Play time + schema: + type: string + default: "" + - variable: DiscordAddress + label: Discord Address + description: Invite link ID for a Discord server. + schema: + type: string + default: "" + - variable: Password + label: Password + description: Defines if a server's password. + schema: + type: string + default: "" + - variable: Description + label: Server Name + description: Defines the name of the server. + schema: + type: string + default: "Truecharts ECO Server" + - variable: DetailedDescription + label: Detailed Description + description: Defines the server's description. + schema: + type: string + default: "Vanilla ECO game" + - variable: ServerCategory + label: Server Category + description: Set the server Category. + schema: + type: string + default: "None" + enum: + - value: None + description: None + - value: Beginner + description: Beginner + - value: Established + description: Established + - value: BeginnerHard + description: BeginnerHard + - value: Strange + description: Strange + - variable: RemoteAddress + label: Remote Address + description: Public/external IP-address or domain and port number needed to reach the server. + schema: + type: string + default: "localhost:3000/" + - variable: WebServerUrl + label: Web Server Url + description: Public/external web sever URL. + schema: + type: string + default: "localhost:3001" + - variable: Rate + label: Rate + description: The network rate used to communicate between server and client. + schema: + type: int + default: 20 + - variable: MaxConnections + label: Max Connections + description: Maximum number of concurrent players (-1 no limits). + schema: + type: int + default: -1 + - variable: TZ label: Timezone group: "General Settings" diff --git a/incubator/eco/3.0.0/templates/NOTES.txt b/incubator/eco/3.1.0/templates/NOTES.txt similarity index 100% rename from incubator/eco/3.0.0/templates/NOTES.txt rename to incubator/eco/3.1.0/templates/NOTES.txt diff --git a/incubator/eco/3.1.0/templates/_configmap.tpl b/incubator/eco/3.1.0/templates/_configmap.tpl new file mode 100644 index 00000000000..5c2c82f7c95 --- /dev/null +++ b/incubator/eco/3.1.0/templates/_configmap.tpl @@ -0,0 +1,12 @@ +{{/* Define the configmap */}} +{{- define "eco.configmaps" -}} + +{{- $network := .Values.eco.network -}} + +eco-network: + enabled: true + data: + Network.eco: | + {{ $network | toJson }} + +{{- end -}} diff --git a/incubator/eco/3.1.0/templates/common.yaml b/incubator/eco/3.1.0/templates/common.yaml new file mode 100644 index 00000000000..058b6334e77 --- /dev/null +++ b/incubator/eco/3.1.0/templates/common.yaml @@ -0,0 +1,11 @@ +{{/* Make sure all variables are set properly */}} +{{- include "tc.v1.common.loader.init" . -}} + +{{/* Render configmaps for all pods */}} +{{- $configmaps := include "eco.configmaps" . | fromYaml -}} +{{- if $configmaps -}} + {{- $_ := mustMergeOverwrite .Values.configmap $configmaps -}} +{{- end -}} + +{{/* Render the templates */}} +{{- include "tc.v1.common.loader.apply" . -}} diff --git a/incubator/eco/3.0.0/values.yaml b/incubator/eco/3.1.0/values.yaml similarity index 100% rename from incubator/eco/3.0.0/values.yaml rename to incubator/eco/3.1.0/values.yaml