fix: update fivenet config in values

Signed-off-by: Alexander Trost <[email protected]>

charts/fivenet/Chart.yaml

@@ -15,7 +15,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.9.1
+version: 0.9.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

charts/fivenet/README.md

@@ -34,18 +34,18 @@ The following table lists the configurable parameters of the FiveNet chart and t
 | Parameter | Description | Default |
 |-----------|-------------|---------|
 | `affinity` |  | `{}` |
-| `discord` | FiveNet Discord Bot deployment config | `{"additionalEnv":[],"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"docker.io/galexrt/fivenet","tag":""},"livenessProbe":{"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":15,"periodSeconds":10},"readinessProbe":null,"replicaCount":1,"resources":{},"revisionHistoryLimit":1,"serviceMonitor":{"additionalLabels":{},"enabled":false,"namespaceSelector":null,"scrapeInterval":"30s"},"startupProbe":{"failureThreshold":20,"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":5,"periodSeconds":10}}` |
+| `discord` | FiveNet Discord Bot deployment config | `{"additionalEnv":[],"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/fivenet-app/fivenet","tag":""},"livenessProbe":{"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":15,"periodSeconds":10},"readinessProbe":null,"replicaCount":1,"resources":{},"revisionHistoryLimit":1,"serviceMonitor":{"additionalLabels":{},"enabled":false,"namespaceSelector":null,"scrapeInterval":"30s"},"startupProbe":{"failureThreshold":20,"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":5,"periodSeconds":10}}` |
 | `discord.serviceMonitor.additionalLabels` | Additional Labels for the ServiceMonitor object | `{}` |
 | `discord.serviceMonitor.enabled` | Specifies whether a prometheus-operator ServiceMonitor should be created | `false` |
 | `discord.serviceMonitor.scrapeInterval` | Interval at which metrics should be scraped | `"30s"` |
 | `extraObjects` | Extra objects to deploy (value evaluated as a template) | `[]` |
-| `fivenet.config` | FiveNet config | `{"audit":{"retentionDays":90},"auth":{"superuserGroups":["projektleiter","teamleitung"],"superuserUsers":[]},"cache":{"refreshTime":"2m"},"database":{"connMaxIdleTime":"15m","connMaxLifetime":"60m","custom":{"columns":{"user":{"playtime":"playtime","visum":"visum"},"vehicle":{"model":"model"}},"conditions":{"user":{"filterEmptyName":false}}},"dsn":"DB_USER:DB_PASS@tcp(DB_HOST:DB_PORT)/DB_NAME?collation=utf8mb4_unicode_ci&parseTime=True&loc=Europe%2FBerlin","maxIdleConns":5,"maxOpenConns":32},"discord":{"commands":{"enabled":true},"enabled":true,"groupSync":{"enabled":false,"mapping":{}},"presence":{"gameStatus":"FiveNet"},"token":"your_discord_bot_token","userInfoSync":{"employeeRoleFormat":"%s Personal","enabled":false,"gradeRoleFormat":"[%grade%] %grade_label%","jobsAbsceneRoleName":"Absent","nicknameRegex":"^(?P<prefix>\\[\\S+][ ]*)?(?P<name>[^\\[]+)(?P<suffix>[ ]*\\[\\S+])?"}},"dispatchCenter":{"convertJobs":[]},"http":{"adminListen":":7070","listen":":8080","origins":["https://fivenet.example.com"],"publicURL":"https://fivenet.example.com","sessions":{"cookieSecret":"your_generated_cookie_secret","domain":"localhost"}},"imageProxy":{"cachePrefix":"images/","enabled":true,"options":{"allowHosts":[],"denyHosts":[]},"url":"/api/image_proxy/"},"jwt":{"secret":"your_generated_jwt_secret"},"logLevel":"INFO","mode":"release","nats":{"url":"nats://localhost:4222"},"oauth2":{"providers":[]},"postalsFile":".output/data/postals.json","storage":{"filesystem":{"path":"/data"},"s3":{"accessKeyID":"","bucketName":"","endpoint":"","prefix":"","region":"us-east-1","secretAccessKey":"","useSSL":true},"type":"filesystem"},"tracing":{"attributes":[],"enabled":false,"environment":"live","insecure":false,"ratio":0.1,"timeout":"10s","type":"stdout","url":"https://localhost:4317"}}` |
+| `fivenet.config` | FiveNet config | `{"audit":{"retentionDays":90},"auth":{"superuserGroups":["projektleiter","teamleitung"],"superuserUsers":[]},"cache":{"refreshTime":"2m"},"database":{"connMaxIdleTime":"15m","connMaxLifetime":"60m","custom":{"columns":{"user":{"playtime":"playtime","visum":"visum"},"vehicle":{"model":"model"}},"conditions":{"user":{"filterEmptyName":false}}},"dsn":"DB_USER:DB_PASS@tcp(DB_HOST:DB_PORT)/DB_NAME?collation=utf8mb4_unicode_ci&parseTime=True&loc=Europe%2FBerlin","maxIdleConns":5,"maxOpenConns":32},"discord":{"commands":{"enabled":true},"enabled":true,"groupSync":{"enabled":false,"mapping":{}},"token":"your_discord_bot_token","userInfoSync":{"employeeRoleFormat":"%s Personal","enabled":false,"gradeRoleFormat":"[%grade%] %grade_label%","jobsAbsceneRoleName":"Absent","nicknameRegex":"^(?P<prefix>\\[\\S+][ ]*)?(?P<name>[^\\[]+)(?P<suffix>[ ]*\\[\\S+])?"}},"dispatchCenter":{"convertJobs":[]},"http":{"adminListen":":7070","listen":":8080","origins":["https://fivenet.example.com"],"publicURL":"https://fivenet.example.com","sessions":{"cookieSecret":"your_generated_cookie_secret","domain":"localhost"}},"imageProxy":{"cachePrefix":"images/","enabled":true,"options":{"allowHosts":[],"denyHosts":[]},"url":"/api/image_proxy/"},"jwt":{"secret":"your_generated_jwt_secret"},"logLevel":"INFO","mode":"release","nats":{"url":"nats://localhost:4222"},"oauth2":{"providers":[]},"postalsFile":".output/data/postals.json","storage":{"filesystem":{"path":"/data"},"s3":{"accessKeyID":"","bucketName":"","endpoint":"","prefix":"","region":"us-east-1","secretAccessKey":"","useSSL":true},"type":"filesystem"},"tracing":{"attributes":[],"enabled":false,"environment":"live","insecure":false,"ratio":0.1,"timeout":"10s","type":"stdout","url":"https://localhost:4317"}}` |
 | `fullnameOverride` |  | `""` |
 | `iconify` | Iconify helm chart options, please see https://github.com/fivenet-app/charts/tree/main/charts/iconify for more information | `{"enabled":true,"ingress":{"annotations":{"nginx.ingress.kubernetes.io/rewrite-target":"/$2"},"className":"nginx","enabled":true,"hosts":[{"host":"chart-example.local","paths":[{"path":"/api/icons(/|$)(.*)","pathType":"Prefix"}]}],"tls":[]}}` |
 | `imagePullSecrets` |  | `[]` |
 | `ingress.annotations` |  | `{}` |
-| `ingress.className` |  | `"nginx"` |
-| `ingress.enabled` |  | `true` |
+| `ingress.className` | Ingress class name | `"nginx"` |
+| `ingress.enabled` | If an ingress object should be created. | `true` |
 | `ingress.hosts[0].host` |  | `"chart-example.local"` |
 | `ingress.hosts[0].paths[0].path` |  | `"/api"` |
 | `ingress.hosts[0].paths[0].pathType` |  | `"Prefix"` |
@@ -62,7 +62,7 @@ The following table lists the configurable parameters of the FiveNet chart and t
 | `server.additionalEnv` |  | `[]` |
 | `server.enabled` |  | `true` |
 | `server.image.pullPolicy` |  | `"IfNotPresent"` |
-| `server.image.repository` |  | `"docker.io/galexrt/fivenet"` |
+| `server.image.repository` |  | `"ghcr.io/fivenet-app/fivenet"` |
 | `server.image.tag` |  | `""` |
 | `server.livenessProbe.failureThreshold` |  | `3` |
 | `server.livenessProbe.httpGet.path` |  | `"/readiness"` |
@@ -87,7 +87,7 @@ The following table lists the configurable parameters of the FiveNet chart and t
 | `serviceAccount.create` |  | `true` |
 | `serviceAccount.name` |  | `""` |
 | `tolerations` |  | `[]` |
-| `worker` | FiveNet Worker deployment config | `{"additionalEnv":[],"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"docker.io/galexrt/fivenet","tag":""},"livenessProbe":{"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":15,"periodSeconds":10},"readinessProbe":null,"replicaCount":1,"resources":{},"revisionHistoryLimit":1,"serviceMonitor":{"additionalLabels":{},"enabled":false,"namespaceSelector":null,"scrapeInterval":"30s"},"startupProbe":{"failureThreshold":20,"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":5,"periodSeconds":10}}` |
+| `worker` | FiveNet Worker deployment config | `{"additionalEnv":[],"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/fivenet-app/fivenet","tag":""},"livenessProbe":{"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":15,"periodSeconds":10},"readinessProbe":null,"replicaCount":1,"resources":{},"revisionHistoryLimit":1,"serviceMonitor":{"additionalLabels":{},"enabled":false,"namespaceSelector":null,"scrapeInterval":"30s"},"startupProbe":{"failureThreshold":20,"httpGet":{"path":"/readiness","port":"metrics"},"initialDelaySeconds":5,"periodSeconds":10}}` |
 | `worker.serviceMonitor.additionalLabels` | Additional Labels for the ServiceMonitor object | `{}` |
 | `worker.serviceMonitor.enabled` | Specifies whether a prometheus-operator ServiceMonitor should be created | `false` |
 | `worker.serviceMonitor.scrapeInterval` | Interval at which metrics should be scraped | `"30s"` |

charts/fivenet/values.yaml

@@ -163,12 +163,6 @@ fivenet:
     discord:
       enabled: true
       token: "your_discord_bot_token"
-      presence:
-        gameStatus: "FiveNet"
-        #listeningStatus: ""
-        #streamingStatus: ""
-        #streamingStatusUrl: ""
-        #watchStatus: ""
       userInfoSync:
         enabled: false
         gradeRoleFormat: "[%grade%] %grade_label%"