fix: url

SocialGouv · Apr 30, 2024 · 85bb6db · 85bb6db
1 parent f0879ab
commit 85bb6db
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 34 deletions.
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -1,3 +1,16 @@
+jobs:
+  runs:
+    build-frontend:
+      with:
+        buildArgs:
+          NEXT_PUBLIC_BASE_PATH: https://www-{{.Values.global.host}}
+    post-restore:
+      ~needs: [pg, hasura]
+      use: psql
+      with:
+        sqlFile: .kontinuous/sql/post-restore.sql
+        pgSecretRefName: pg-app
+
 hasura:
   imagePackage: hasura
   ~needs: [build-hasura]
@@ -69,12 +82,3 @@ pg:
           region:
             ~tpl~name: "cdtn-prod-backups-access-key"
             key: bucket_region
-
-jobs:
-  runs:
-    post-restore:
-      ~needs: [pg, hasura]
-      use: psql
-      with:
-        sqlFile: .kontinuous/sql/post-restore.sql
-        pgSecretRefName: pg-app
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -1,3 +1,26 @@
+jobs:
+  runs:
+    build-frontend:
+      with:
+        buildArgs:
+          NEXT_PUBLIC_BASE_PATH: https://cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
+    post-restore:
+      ~needs: [pg, hasura]
+      use: psql
+      with:
+        sqlFile: .kontinuous/sql/post-restore.sql
+        pgSecretRefName: pg-app
+    job-ingester:
+      ~needs: [hasura]
+      use: trigger-cronjob
+      with:
+        cronJobName: cron-ingester
+    job-alert:
+      ~needs: [job-ingester]
+      use: trigger-cronjob
+      with:
+        cronJobName: cron-alert
+
 hasura:
   imagePackage: hasura
   ~needs: [build-hasura]
@@ -18,8 +41,6 @@ www:
   env:
     - name: NEXTAUTH_URL
       value: https://cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
-    - name: NEXT_PUBLIC_BASE_PATH
-      value: https://cdtn-admin-preprod.ovh.fabrique.social.gouv.fr
 
 pg:
   ~chart: pg
@@ -50,22 +71,3 @@ pg:
           region:
             ~tpl~name: "cdtn-prod-backups-access-key"
             key: bucket_region
-
-jobs:
-  runs:
-    post-restore:
-      ~needs: [pg, hasura]
-      use: psql
-      with:
-        sqlFile: .kontinuous/sql/post-restore.sql
-        pgSecretRefName: pg-app
-    job-ingester:
-      ~needs: [hasura]
-      use: trigger-cronjob
-      with:
-        cronJobName: cron-ingester
-    job-alert:
-      ~needs: [job-ingester]
-      use: trigger-cronjob
-      with:
-        cronJobName: cron-alert
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -1,3 +1,10 @@
+jobs:
+  runs:
+    build-frontend:
+      with:
+        buildArgs:
+          NEXT_PUBLIC_BASE_PATH: https://cdtn-admin.fabrique.social.gouv.fr
+
 www:
   host: cdtn-admin.fabrique.social.gouv.fr
   ingress:
@@ -6,8 +13,6 @@ www:
   env:
     - name: NEXTAUTH_URL
       value: https://cdtn-admin.fabrique.social.gouv.fr
-    - name: NEXT_PUBLIC_BASE_PATH
-      value: https://cdtn-admin.fabrique.social.gouv.fr
   resources:
     limits:
       cpu: "200m"

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -57,8 +57,6 @@ www:
   env:
     - name: NEXTAUTH_URL
       value: https://www-{{.Values.global.host}}
-    - name: NEXT_PUBLIC_BASE_PATH
-      value: https://www-{{.Values.global.host}}
   resources:
     limits:
       cpu: "100m"