DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 26 Packages Projects Releases 1 Wiki Activity

fix(valheim): fix open portal button (#4929)

Browse Source 
* fix(valheim): remove unnecessary quotes

* fix(valheim): order variables consistently

Keep the top level boolean values for groups of settings ahead of the
remaining settings.

* fix(valheim): remove extra port

This port is no longer required:
  https://valheimbugs.featureupvote.com/suggestions/219538/please-clarify-is-port-2458-needed-for-dedicated-servers

* fix(valheim): include the portalLink directly

Move from the Include template to directly including the contents in
advance of changing the default "open" port.

* fix(valheim): fix open portal button

The "Open" link previously opened the STATUS_HTTP_PORT, which serves a
status.json generated by querying the Valheim server's query port.  Now
it opens the SUPERVISOR_HTTP_PORT which presents a status and control
web interface for the various processes running under the supervisor.

This seems much more useful than the blank default and JSON file
available in the other server.

* fix(valheim): bump minor version
This commit is contained in:
Dan
2022-11-30 21:28:34 +02:00
committed by GitHub
parent 1d324490bb
commit b71eb0f9ef
2 changed files with 66 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/valheim/questions.yaml
+63 -71
View File
@@ -1,7 +1,12 @@
# Include{groups} # Include{groups}
portals: portals:
open: open:
# Include{portalLink} protocols:
- "$kubernetes-resource_configmap_portal_protocol"
host:
- "$kubernetes-resource_configmap_portal_host"
ports:
- "$variable-service.supervisor.ports.supervisor.port"
questions: questions:
# Include{global} # Include{global}
# Include{controller} # Include{controller}
@@ -9,91 +14,91 @@ questions:
# Include{replica1} # Include{replica1}
# Include{controllerExpertExtraArgs} # Include{controllerExpertExtraArgs}
- variable: secretEnv - variable: secretEnv
group: "App Configuration" group: App Configuration
label: "Image Secrets" label: Image Secrets
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: SUPERVISOR_HTTP_USER - variable: SUPERVISOR_HTTP_USER
label: "SUPERVISOR_HTTP_USER" label: SUPERVISOR_HTTP_USER
schema: schema:
type: string type: string
default: "admin" default: admin
required: true required: true
- variable: SUPERVISOR_HTTP_PASS - variable: SUPERVISOR_HTTP_PASS
label: "SUPERVISOR_HTTP_PASS" label: SUPERVISOR_HTTP_PASS
schema: schema:
type: string type: string
required: true required: true
private: true private: true
default: "REPLACETHIS" default: REPLACETHIS
- variable: SERVER_PASS - variable: SERVER_PASS
label: "SERVER_PASS" label: SERVER_PASS
schema: schema:
type: string type: string
required: true required: true
private: true private: true
default: "REPLACETHIS" default: REPLACETHIS
- variable: env - variable: env
group: "App Configuration" group: App Configuration
label: "Image Environment" label: Image Environment
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: STATUS_HTTP - variable: STATUS_HTTP
label: "STATUS_HTTP" label: STATUS_HTTP
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: SUPERVISOR_HTTP - variable: SUPERVISOR_HTTP
label: "SUPERVISOR_HTTP" label: SUPERVISOR_HTTP
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: SERVER_NAME - variable: SERVER_NAME
label: "SERVER_NAME" label: SERVER_NAME
schema: schema:
type: string type: string
default: "My Server" default: My Server
required: true required: true
- variable: WORLD_NAME - variable: WORLD_NAME
label: "WORLD_NAME" label: WORLD_NAME
schema: schema:
type: string type: string
default: "Dedicated" default: Dedicated
required: true required: true
- variable: SERVER_PUBLIC - variable: SERVER_PUBLIC
label: "SERVER_PUBLIC" label: SERVER_PUBLIC
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: UPDATE_INTERVAL - variable: UPDATE_INTERVAL
label: "UPDATE_INTERVAL" label: UPDATE_INTERVAL
schema: schema:
type: int type: int
default: 10800 default: 10800
required: true required: true
- variable: BACKUPS - variable: BACKUPS
label: "BACKUPS" label: BACKUPS
schema: schema:
type: boolean type: boolean
default: true default: true
- variable: BACKUPS_INTERVAL - variable: BACKUPS_INTERVAL
label: "BACKUPS_INTERVAL" label: BACKUPS_INTERVAL
schema: schema:
type: int type: int
default: 43200 default: 43200
required: true required: true
- variable: BACKUPS_DIRECTORY - variable: BACKUPS_DIRECTORY
label: "BACKUPS_DIRECTORY" label: BACKUPS_DIRECTORY
schema: schema:
type: string type: string
default: "/backups" default: /backups
required: true required: true
- variable: BACKUPS_MAX_AGE - variable: BACKUPS_MAX_AGE
label: "BACKUPS_MAX_AGE" label: BACKUPS_MAX_AGE
schema: schema:
type: int type: int
default: 3 default: 3
@@ -101,8 +106,8 @@ questions:
# Include{containerConfig} # Include{containerConfig}
# Include{serviceRoot} # Include{serviceRoot}
- variable: main - variable: main
label: "Main Service" label: Main Service
description: "The Primary service on which the healthcheck runs, often the webUI" description: The Primary service on which the healthcheck runs, often the webUI
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -110,21 +115,21 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: main - variable: main
label: "Main Service Port Configuration" label: Main Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - variable: port
label: "Port" label: Port
description: "This port exposes the container port on the service" description: This port exposes the container port on the service
schema: schema:
type: int type: int
default: 9010 default: 9010
required: true required: true
- variable: supervisor - variable: supervisor
label: "supervisor Service" label: supervisor Service
description: "The supervisor service" description: The supervisor service
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -132,21 +137,21 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: supervisor - variable: supervisor
label: "supervisor Service Port Configuration" label: supervisor Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - variable: port
label: "Port" label: Port
description: "This port exposes the container port on the service" description: This port exposes the container port on the service
schema: schema:
type: int type: int
default: 9011 default: 9011
required: true required: true
- variable: valheim - variable: valheim
label: "valheim Service" label: valheim Service
description: "The valheim Game service" description: The valheim Game service
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -154,60 +159,47 @@ questions:
# Include{serviceSelectorLoadBalancer} # Include{serviceSelectorLoadBalancer}
# Include{serviceSelectorExtras} # Include{serviceSelectorExtras}
- variable: valheim1 - variable: valheim1
label: "valheim-1 Service Port Configuration" label: valheim-1 Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - variable: port
label: "Port" label: Port
description: "This port exposes the container port on the service" description: This port exposes the container port on the service
schema: schema:
type: int type: int
default: 2456 default: 2456
required: true required: true
- variable: valheim2 - variable: valheim2
label: "valheim-2 Service Port Configuration" label: valheim-2 Service Port Configuration
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
- variable: port - variable: port
label: "Port" label: Port
description: "This port exposes the container port on the service" description: This port exposes the container port on the service
schema: schema:
type: int type: int
default: 2457 default: 2457
required: true required: true
- variable: valheim3
label: "valheim-3 Service Port Configuration"
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 2458
required: true
# Include{serviceExpertRoot} # Include{serviceExpertRoot}
default: false default: false
# Include{serviceExpert} # Include{serviceExpert}
# Include{serviceList} # Include{serviceList}
# Include{persistenceRoot} # Include{persistenceRoot}
- variable: config - variable: config
label: "App Config Storage" label: App Config Storage
description: "Stores the Application Configuration." description: Stores the Application Configuration.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
attrs: attrs:
# Include{persistenceBasic} # Include{persistenceBasic}
- variable: backups - variable: backups
label: "App backups Storage" label: App backups Storage
description: "Stores the Application backups." description: Stores the Application backups.
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -216,7 +208,7 @@ questions:
# Include{persistenceList} # Include{persistenceList}
# Include{ingressRoot} # Include{ingressRoot}
- variable: main - variable: main
label: "Main Ingress" label: Main Ingress
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -225,7 +217,7 @@ questions:
# Include{ingressTLS} # Include{ingressTLS}
# Include{ingressTraefik} # Include{ingressTraefik}
- variable: supervisor - variable: supervisor
label: "supervisor Ingress" label: supervisor Ingress
schema: schema:
additional_attrs: true additional_attrs: true
type: dict type: dict
@@ -237,41 +229,41 @@ questions:
# Include{security} # Include{security}
# Include{securityContextAdvancedRoot} # Include{securityContextAdvancedRoot}
- variable: privileged - variable: privileged
label: "Privileged mode" label: Privileged mode
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: readOnlyRootFilesystem - variable: readOnlyRootFilesystem
label: "ReadOnly Root Filesystem" label: ReadOnly Root Filesystem
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: allowPrivilegeEscalation - variable: allowPrivilegeEscalation
label: "Allow Privilege Escalation" label: Allow Privilege Escalation
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: runAsNonRoot - variable: runAsNonRoot
label: "runAsNonRoot" label: runAsNonRoot
schema: schema:
type: boolean type: boolean
default: false default: false
# Include{podSecurityContextRoot} # Include{podSecurityContextRoot}
- variable: runAsUser - variable: runAsUser
label: "runAsUser" label: runAsUser
description: "The UserID of the user running the application" description: The UserID of the user running the application
schema: schema:
type: int type: int
default: 0 default: 0
- variable: runAsGroup - variable: runAsGroup
label: "runAsGroup" label: runAsGroup
description: "The groupID this App of the user running the application" description: The groupID this App of the user running the application
schema: schema:
type: int type: int
default: 0 default: 0
- variable: fsGroup - variable: fsGroup
label: "fsGroup" label: fsGroup
description: "The group that should own ALL storage." description: The group that should own ALL storage.
schema: schema:
type: int type: int
default: 568 default: 568
charts/stable/valheim/values.yaml
+3 -7
View File
@@ -11,8 +11,8 @@ secretEnv:
env: env:
STATUS_HTTP: true STATUS_HTTP: true
STATUS_HTTP_PORT: "{{ .Values.service.main.ports.main.port }}" STATUS_HTTP_PORT: "{{ .Values.service.main.ports.main.port }}"
SUPERVISOR_HTTP_PORT: "{{ .Values.service.supervisor.ports.supervisor.port }}"
SUPERVISOR_HTTP: true SUPERVISOR_HTTP: true
SUPERVISOR_HTTP_PORT: "{{ .Values.service.supervisor.ports.supervisor.port }}"
SERVER_NAME: My Server SERVER_NAME: My Server
SERVER_PORT: "{{ .Values.service.valheim.ports.valheim1.port }}" SERVER_PORT: "{{ .Values.service.valheim.ports.valheim1.port }}"
WORLD_NAME: Dedicated WORLD_NAME: Dedicated
@@ -54,10 +54,6 @@ service:
enabled: true enabled: true
port: 2457 port: 2457
protocol: UDP protocol: UDP
valheim3:
enabled: true
port: 2458
protocol: UDP
ingress: ingress:
supervisor: supervisor:
@@ -66,10 +62,10 @@ ingress:
persistence: persistence:
config: config:
enabled: true enabled: true
mountPath: "/config" mountPath: /config
backups: backups:
enabled: true enabled: true
mountPath: "/backups" mountPath: /backups
portal: portal:
enabled: true enabled: true