🎨 Match shared IO structures with parent osu-web chart

ppy · Feb 13, 2025 · 8f3bca6 · 8f3bca6
1 parent eefd3b8
commit 8f3bca6
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/osu/osu-queue-score-statistics/Chart.yaml b/osu/osu-queue-score-statistics/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: 2025.213.0
+version: 2025.213.1
 
 # 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

diff --git a/osu/osu-queue-score-statistics/templates/configmap.yaml b/osu/osu-queue-score-statistics/templates/configmap.yaml
@@ -24,8 +24,8 @@ data:
   {{- if not (eq nil .Values.config.queueScoreStatistics.usersTable) }}
   DB_USERS_TABLE: {{ .Values.config.queueScoreStatistics.usersTable | quote }}
   {{- end }}
-  {{- if not (eq nil .Values.config.queueScoreStatistics.sharedInteropDomain) }}
-  SHARED_IO_DOMAIN: {{ .Values.config.queueScoreStatistics.sharedInteropDomain | quote }}
+  {{- if not (eq nil .Values.config.laravel.legacy.sharedInteropDomain) }}
+  SHARED_IO_DOMAIN: {{ .Values.config.laravel.legacy.sharedInteropDomain | quote }}
   # old name (was replaced as of 20250213)
-  LEGACY_IO_DOMAIN: {{ .Values.config.queueScoreStatistics.sharedInteropDomain | quote }}
+  LEGACY_IO_DOMAIN: {{ .Values.config.laravel.legacy.sharedInteropDomain | quote }}
   {{- end }}
diff --git a/osu/osu-queue-score-statistics/templates/secret.yaml b/osu/osu-queue-score-statistics/templates/secret.yaml
@@ -16,7 +16,7 @@ stringData:
   DB_NAME: {{ .Values.config.db.database | quote }}
   REDIS_HOST: {{ required "Missing redis host" .Values.config.redis.host | quote }}
   CLIENT_CHECK_VERSION: {{ .Values.config.clientCheckVersion | int | quote }}
-  {{- if .Values.config.queueScoreStatistics.sharedInteropSecret }}
-  SHARED_INTEROP_SECRET: {{ .Values.config.queueScoreStatistics.sharedInteropSecret | quote }}
+  {{- if .Values.config.laravel.legacy.sharedInteropSecret }}
+  SHARED_INTEROP_SECRET: {{ .Values.config.laravel.legacy.sharedInteropSecret | quote }}
   {{- end }}
 {{- end }}
diff --git a/osu/osu-queue-score-statistics/values.yaml b/osu/osu-queue-score-statistics/values.yaml
@@ -12,8 +12,6 @@ config:
     # sentryDsn: ""
     # schema: ""
     # usersTable: phpbb_users
-    # sharedInteropDomain: https://osu.ppy.sh
-    # sharedInteropSecret: ""
   # db, redis and clientCheckVersion will be ignored if useSharedSecretsFromOsuWebChart, using secrets from parent chart
   db: {}
     # if connectionString is set, other values are ignored
@@ -25,6 +23,10 @@ config:
   redis: {}
     # host: ""
   clientCheckVersion: false
+  laravel:
+    legacy: {}
+      # sharedInteropDomain: https://osu.ppy.sh
+      # sharedInteropSecret: ""
 
 extraEnv: []
 

diff --git a/osu/osu-server-beatmap-submission/Chart.yaml b/osu/osu-server-beatmap-submission/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: 2025.213.0
+version: 2025.213.1
 
 # 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

diff --git a/osu/osu-server-beatmap-submission/templates/deployment.yaml b/osu/osu-server-beatmap-submission/templates/deployment.yaml
@@ -79,7 +79,7 @@ spec:
               value: {{ .Values.config.serverBeatmapSubmission.jwtValidAudience | quote }}
             - name: PURGE_BEATMAP_MIRROR_CACHES
               value: {{ (ternary "1" "0" (eq true .Values.config.serverBeatmapSubmission.purgeBeatmapMirrorCaches)) | quote }}
-            {{- with .Values.config.serverBeatmapSubmission.sharedInteropDomain }}
+            {{- with .Values.config.laravel.legacy.sharedInteropDomain }}
             - name: SHARED_IO_DOMAIN
               value: {{ . | quote }}
             # old name (was replaced as of 20250213)

diff --git a/osu/osu-server-beatmap-submission/templates/secret.yaml b/osu/osu-server-beatmap-submission/templates/secret.yaml
@@ -12,8 +12,8 @@ data:
   DB_USER: {{ .Values.config.db.username | b64enc | quote }}
   DB_PASS: {{ .Values.config.db.password | b64enc | quote }}
   DB_NAME: {{ .Values.config.db.database | b64enc | quote }}
-  {{- if .Values.config.serverBeatmapSubmission.sharedInteropSecret }}
-  SHARED_INTEROP_SECRET: {{ .Values.config.serverBeatmapSubmission.sharedInteropSecret | b64enc | quote }}
+  {{- if .Values.config.laravel.legacy.sharedInteropSecret }}
+  SHARED_INTEROP_SECRET: {{ .Values.config.laravel.legacy.sharedInteropSecret | b64enc | quote }}
   {{- end }}
 
   BEATMAP_STORAGE_TYPE: {{ .Values.config.storage.driver | b64enc | quote }}

diff --git a/osu/osu-server-beatmap-submission/values.yaml b/osu/osu-server-beatmap-submission/values.yaml
@@ -8,8 +8,6 @@ config:
     env: Development # ASPNETCORE_ENVIRONMENT
     jwtValidAudience: 5 # osu! client id, adjust as required
     # purgeBeatmapMirrorCaches: false
-    # sharedInteropDomain: https://osu.ppy.sh
-    # sharedInteropSecret: ""
     # sentry: {}
       # url: ""
       # environment: development
@@ -23,6 +21,9 @@ config:
   laravel:
     oauth: {}
       # publicKey: "" # required
+    legacy: {}
+      # sharedInteropDomain: https://osu.ppy.sh
+      # sharedInteropSecret: ""
   storage:
     driver: local
     local: