✨ osu-web: Add SESSION_PREFIX env var support and add to shared secre…

…t for osu-notification-server subchart
ppy · Aug 20, 2024 · e6d6eb2 · e6d6eb2
1 parent acbb1a2
commit e6d6eb2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/osu/osu-web/Chart.lock b/osu/osu-web/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 2023.905.0
 - name: osu-notification-server
   repository: https://ppy.github.io/helm-charts
-  version: 2023.905.0
+  version: 2024.820.0
 - name: osu-server-spectator
   repository: https://ppy.github.io/helm-charts
   version: 2024.612.0
@@ -26,5 +26,5 @@ dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
   version: 7.16.2
-digest: sha256:1f72dba6407bad4f21d93f98d4c550832ecd7b04a45a31600978a2a6ef3abb1a
-generated: "2024-06-12T21:09:21.304368104+02:00"
+digest: sha256:b10a273b4d24eaa776ac6b1cc720f186e882bbedff2e504833a2a30cdfaa806e
+generated: "2024-08-20T16:15:57.621830584+02:00"
diff --git a/osu/osu-web/Chart.yaml b/osu/osu-web/Chart.yaml
@@ -15,21 +15,21 @@ 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: 2024.612.1
+version: 2024.820.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: "2024.612.0"
+appVersion: "2024.814.0"
 
 dependencies:
   - name: osu-beatmap-difficulty-lookup-cache
     version: 2023.905.0
     repository: https://ppy.github.io/helm-charts
     condition: osu-beatmap-difficulty-lookup-cache.enabled
   - name: osu-notification-server
-    version: 2023.905.0
+    version: 2024.820.0
     repository: https://ppy.github.io/helm-charts
     condition: osu-notification-server.enabled
   - name: osu-server-spectator

diff --git a/osu/osu-web/templates/_helpers.tpl b/osu/osu-web/templates/_helpers.tpl
@@ -108,6 +108,7 @@ Create the name of the service account to use
 {{ template "osu-web-chart.env-var" (dict "name" "SESSION_DRIVER" "value" .Values.config.laravel.session.driver) }}
 {{ template "osu-web-chart.env-var" (dict "name" "SESSION_DOMAIN" "value" (include "osu-web.laravelSessionDomain" .)) }}
 {{ template "osu-web-chart.env-var" (dict "name" "SESSION_SECURE_COOKIE" "value" (include "osu-web.laravelSessionSecureCookie" .)) }}
+{{ template "osu-web-chart.env-var" (dict "name" "SESSION_PREFIX" "value" .Values.config.laravel.session.prefix) }}
 
 {{ template "osu-web-chart.env-var" (dict "name" "MAIL_DRIVER" "value" .Values.config.mail.driver) }}
 {{ template "osu-web-chart.env-var" (dict "name" "MAIL_HOST" "value" .Values.config.mail.host) }}

diff --git a/osu/osu-web/templates/secret-shared.yaml b/osu/osu-web/templates/secret-shared.yaml
@@ -33,3 +33,6 @@ stringData:
   REDIS_PORT: {{ .Values.config.redis.app.port | quote }}
   NOTIFICATION_REDIS_HOST: {{ include "osu-web.redisNotificationHost" . }}
   NOTIFICATION_REDIS_PORT: {{ .Values.config.redis.notification.port | quote }}
+  {{- if .Values.config.laravel.session.prefix }}
+  SESSION_PREFIX: "{{ .Values.config.laravel.session.prefix }}"
+  {{- end }}
diff --git a/osu/osu-web/values.yaml b/osu/osu-web/values.yaml
@@ -40,6 +40,7 @@ config:
       driver: redis # SESSION_DRIVER
       # domain: "" # SESSION_DOMAIN
       # secureCookie: false # SESSION_SECURE_COOKIE
+      # prefix: "" # SESSION_PREFIX
 
     legacy: {}
       # sharedInteropSecret: "" # SHARED_INTEROP_SECRET