wip

SocialGouv · Oct 9, 2024 · 33b5394 · 33b5394
1 parent a2fdb66
commit 33b5394
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 15 deletions.
diff --git a/.kontinuous/config.yaml b/.kontinuous/config.yaml
@@ -1,5 +1,8 @@
 projectName: enfants-du-spectacle
 dependencies:
   fabrique:
-    extends:
-      - name: ovh
+    dependencies:
+      contrib:
+        patches:
+          updateManifestsWithPreprodResources:
+            enabled: false
diff --git a/.kontinuous/env/dev/templates/app.configmap.yaml b/.kontinuous/env/dev/templates/app.configmap.yaml
@@ -6,3 +6,7 @@ data:
   NODE_ENV: "production"
   EMAIL_FROM: "Enfants du Spectacle [DEV] <enfantsduspectacle@diffusion.fabrique.social.gouv.fr>"
   DEMARCHE_NUMBER: "55315"
+  API_URL_INSTRUCTEUR: "https://{{ .Values.global.host }}/api/sync"
+  API_URL_SDP: "https://formulaire-{{ .Values.global.host }}/api/sync"
+  URL_SDP: "https://formulaire-{{ .Values.global.host }}"
+  URL_INSTRUCTEUR: "https://{{ .Values.global.host }}"
diff --git a/.kontinuous/env/dev/templates/app.sealed-secret.yaml b/.kontinuous/env/dev/templates/app.sealed-secret.yaml
@@ -8,6 +8,7 @@ spec:
   encryptedData:
     EMAIL_SERVER_PASSWORD: AgCz3/884rjXiJXXZZ47Sq44sjuJboBUXzktfq43oxwppS0xMMwwTk9UmdT19DQEGu+8GzmhjFPuU+fBAkJ90U86OSqWIHk0YCa1A72Ka6aLnqgR833YkHwfXkxYSl67SyIH6YQF62hRJ7yxDf39cFv2Jis4fPb86lbkqDvsFPgViGvkZ+Diplcp5X6iqcFBRPxu5box7G6TsK4GSB5REnMleE6PUuMM1G5t/gPeaj+jGRfmrC9ze4ozexOV6C8uyZOn/sUCFKsR7RCh8dSmGkjwwNzJhSOQIPeNvEWyZziPmbtLUsQmOubAb676JD8fP8gyRPRUKVpyTLxJxYcTlCMVCKfAN7WV6V/mbbXNnBaXJjKJeM0XUUllQ268MVB51UgwArtJvjH6vEolsUftlJnlKbIsEAjmi/ct4Ywr/yuo0TPTzxeZEpBhN8l/jGTK0prrUOrenxcZ1e/Ax9FzaFd30swey8yWrGqD2dSIwbytz/9+z+owdmwbonhrhEwdNQo6RoPZBz02ZwGEHmD2p6QRMKVEV55xVIrgZDMOzMFlqlwzYtY8H41+Kkl8VefhEY2916TQtXVMXZX7v4dPr9CNaHqS1IU+Y1YKsJ6IXTdZq1kvCBCP42UBAKeS850j5q6oJW2I1HK8yNn8Sc1ma4ER4t9wdY0aPLu/Osq5JQqsf+ZnUSarupJ86uzVhtxg3reInNKMWb1v0W5+k8bJ7CPojL+pCVu1uYhqxSLoo1C6HQ==
     EMAIL_SERVER_USER: AgCZMfaQLcd1OrYMr4b+MpmR+SZYnte+AoQyQ13n4gXduqsowPj53bcIjZ756kd5F65+bQPlG+uaJZj6MK7tOLTpA4rHNn5V/7oDekpNhMh8xcYBZjG75NNaPjDGlce2ml0Nigsv8UcVeQqt6WXs2IwCapDj7fCexeYAnXwk1SN00wqrSBFp33n9rBosv9NTzWJDOhHKKfl7oK2iok3Q5awQdiwb2YXPZB0FzdmOiWeeZ91EjDI85lmK5zyNsEZN4Oc882aWJDX40cKqJhP/Vr5gRrcl18K0OWetas9ZlosDtyfSxW3jQMi7pCNpIruzcZ7c26bQx4OGhUcE2G2H0ikXXWVU5SlbIvSetjwNAhXyeiu2TBojjhwOCOniqYzQ/Zi5TRb+lx7/zcgX0xKsdmBRIDXkr1uzzMsDmQtj/Nr/Vh9BJDnltuCr/OPVqPgyadxI0EXq/RDqNcMufYBESlczMEpAj+wIJ5VrWEfC0rLalE47L+Ia0TtHt6htCDp2K1jYXxc5yAoUkzzfwVbz0JaAM8+/vAirDACxkSDpH/ali5L/DDS9Q7YeibcMKs3AHFjhmOhTkyPptlRn3jEmdtt2voX0ajy5czTf3sAjp9lxOFL1jW9W6qN4vf4TlYrpwoz23CmB51MZ0bDgID/7WGm1qSL3SrfxWMS0e6t2wmFlWgaXYrHWHrIkWadNxw0a89seEbURVkpEfsZEOoJVjwFLdE9+2/kMm7z2UAkoLYLtFw==
+    TOKEN_SIRENE: AgDI59hrqBYbf1mbNWWb0u0J5OiuOKVOhaJR8HuQ58UABgrrsn5Fw4JUyM6qWPcHR370UCvwEZYT6KMjltzwvqHZodZ2f/zm8KbDzbbnMIvBtFjqwitoUnrrFteGtuJ/taEg2p3QFPJY05+XsYRp9P92QYpTSMOdSoyFvrI+69dxkB//2vxS+qgLXdOo/Y4NQXOUtE+wGcl2skEgiscKWy/Gs8asAyMc6VOFZnmLSfC96NsnXoeTJRDat5Ik6s3tBNAUy3gnVgiDiwdcFgZyMs0LMb2c5QrrBJY2zyVRZ80vjlu0aBeROMrClSh+zAvMDCU3b1Fu6yyZD/srDuzrLFiXZISESTZdoDLSZLSOd71MHxnJERXixv5ChJMp/no02XdSqqZGWVrRAWphh9cLGcS23Bfk65++Vyz4dgpYNbzUn2scDg6CoPKcYbITqypNyHRbsrv9Vin3Lb7RHAh2apWx4dP16F/EYmQkuXxnvBt2+se4zQep5+Iuz11v0LuKxKSvlvaGwmZ4wpVwP5gJYMFkvKmSx1W0w9rOFkzAakExlSGjN/oq0m61/XEIK2gnmzXQtaqWyJZSZPbLrf0nqM5gEzP2PJk3ByCMl3svVQTJyya2lF9RqBBoyB9Zx3rLrXBi6WLaLZN6ejAgMyyYXGFdKCIVC08GLpuGJKH7c8PN64AmehUVFkv6jceHNlRaSq7DBN7nXK85tbj33RIPt/kcw9r7TE8THNQv4Epdl7v1IKopgws=
     EMAIL_SERVER_HOST: AgBTV6oLIyEhTDCzUEak7rxayMSotiS65VasDUjw0rSujgduntajZqpgJJODI4DlD2somiziWEEqvpAVOxmBj3guuUMFpKCLbhqXUXnGvzI+ERzkq/52buwBXH5f7Xwjaac743NbSFt6JRPh6HOlzYCZuj0KeZUceOu6+uswWCKiJ27//g9UPaRMW+XchJzmP2E1GXVrAoXMHBElvhy1PdWtZnH30yygxJCUfm6GicE/M9xz2xgSckKHc1UYZQhw+fZ1Jz/PGN8DGsuDCaTMbW7FzWjax4SHuvWsvFlbsyxM656M7e0DXxll0M4lbZdahQGkxbvcPcj4mSpvLZSdIRXscI3yG9u+tw2OLBi8PGIAd7fgZgsjo92puSYTPE6ZLd5Pbe+lzd3RiPrKVcyFIJ1iGrJwf+IkyH7610YHyI0Fde4vPG0G4zA4vRMbI8RG8u/65dO8U08LGmZEng1ZoQM1L55WJqgWFwZQhfO1nOrGm2MoaDAzrcuZT24YdjmBsRXsLvli5dZMyL0etFALUcT+RdEg6mDovLHb0ZGApGtfnTYIGmIsznDaAIrv3ZfTwP2n1o6zGVO+LzB7q2fXSz8ViyB/AlCEtEW2sk7X9coaJh9RJs1FrGoUdOttkREHpt9hqeXVeHOgtnGdOz+nSiJzHXss3sjsk5tO08dCO9lJVJymwVT8rTjtxv0PcZB9bAJO8GAusfQoZh+zvhGCpZgfbQ==
     EMAIL_SERVER_PORT: AgDccfllqZG4Tt5809uAg4dGBn3ttwuWf1QZhVoxN8xYAODQ99odKqPcQL6astzBRrEKoXDIm2BsGqqqcw0u0nnIFrmzbLhXTkxBfTKgsf2lpgYC3vYB5Z9ED1wTBPRWGJEa0nPXwbOknaNVoZ3aij48PgcLrQZniUnwow910rwge8JQkuJHfQYnTbka+BlH+QFfxz/Q0iVQIakI5VbtEfJFYB2Y57Brx97RBETs0IKFXIIZhZjczqFiR76m4smXOzcCPCQ4J+yFUp1OQt2/E62eUddNqxEdCEqk2ryOPR+87b5nVhZI3ExFbrwUFTNTyY7MaTKSZpLdm5PsOU3IAczwFW5CuzvGfjce9v6mNVlwBO2sadeUIi8uoj+7H7sQ3mE4HPx6aL2snsOeEiXU/LgpHmPwno1z+xCNkLlgUCfJ/HJbGWvlKMcYheIcR+oRLA15Z5yj+kNme2Qe3G1RoBBOjdtTmP4tiLys8eURKJTL71kIJyb3NuR5I52gZz/Cvloc7mDPP/HqEocgTro+mevRR71Wo1KlRhxoJWQS1XmV1a2CrS45emfkvjIfnM+5L9EHFC0g+LCaw/1ud/qpsA/KY9A5D9XoJJ+nQS/Mqs3SoppUbhPwZS+kKuhuRVt7LGU3wqJuD2C4BR/uaZLFdawBN6BbJ2HEulfFKMzbgKGAcDrlT9+HTkOrT2V1hD8fMrVflZw=
     NEXTAUTH_SECRET: AgAytCq4l3sWviAdYgi2vQRegThmf2O2IUfVFvU6qXC79TM8DH/cU3zcANTGWIiWgjBLSfbC8ufIYGPLCtVRtKff+lHpJOLoSPV93gVzuGvOZZFCeXfnq3BldxW2AwmQGxfJ2DVhTHERImE5sLuOqgg/DNb8xjaAyQHShZRkZtkW50fDDcejGE7OLUiQ0exSfvSzQ4mnr173WhnUWrGS1u9uN4Y9ebaN5Kn0eVN6JyYx1GtkSssoOVgCrMxbpu4bkL1GDsDlInMmDLL+eu3Jjyi1QLXZ+vnjVhm1dE6yrHJ7FATEpyYgurLiVQm39Hyn5FfVbmguFUHNArxertuOs+K2tbZjnhrnJIVCuV5TuZ9GarrJt8MnRCnL6KfzEABBbLzDzNyMGs/09g5LQ3Kh0YX8R5hI7b5biUsn6lnKr10hOJpwVtoSlwb9BTBklG+Vn2We9gRNJaoYLTKJ1QxrI6q0d8g7ScuNMXz/57u/4D6ec7xKUFVxly22M8Pm5cByz4ndRx7onp4y9RsKYuxFmUynCa5wEf7mXCkizSIkUx2BNxmx8F9SJ9oQAny9lc5cIJ6CN0D4Hmnhr4b76M3rItwWzwP4eU3Sy5krbWt4V0bacTr+UMcRnydkfv5vKaEO46QezRAwI6Bne7gCDsIG3uf03WepwSE3UKSuquprXD9uBRT7v3WSz6R9BCdtoXfDA4gZzhfp8djwwiK14mtcjjtLXEDA81+YwyMxepAZ4HcdYszQ0Y+NqfHvBNxnIw==

diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -14,13 +14,25 @@ form:
     - mountPath: /mnt/docs
       name: docs-form
 
+pg:
+  cnpg-cluster:
+    monitoring:
+      ~tpl~enablePodMonitor: "true"
+
+pg-form:
+  cnpg-cluster:
+    monitoring:
+      ~tpl~enablePodMonitor: "true"
+
 jobs:
   runs:
     build-app:
       with:
         buildArgs:
           NEXT_PUBLIC_SENTRY_ENVIRONMENT: review
           START_SCRIPT: start-review
+          NEXT_PUBLIC_API_URL_SDP:
+            https://formulaire-{{ .Values.global.host }}/api/sync
     build-form:
       with:
         buildArgs:

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -2,13 +2,13 @@ app:
   ~chart: app
   ~needs: [build-app, pg]
   imagePackage: app
+  annotations:
+    "oblik.socialgouv.io/min-request-memory": 1Gi
+    "oblik.socialgouv.io/min-request-cpu": 300m
   resources:
     requests:
-      cpu: 0.2
-      memory: 256Mi
-    limits:
-      cpu: 1
-      memory: 4Gi
+      memory: 1Gi
+      cpu: 300m
   env:
     - name: APP_BASE_URL
       value: "https://{{ $.Values.global.host }}"
@@ -40,14 +40,10 @@ form:
   ~chart: app
   ~needs: [build-form, pg-form]
   imagePackage: form
+  annotations:
+    "oblik.socialgouv.io/min-request-memory": 1Gi
+    "oblik.socialgouv.io/min-request-cpu": 300m
   host: "formulaire-{{ $.Values.global.host }}"
-  resources:
-    requests:
-      cpu: 0.2
-      memory: 256Mi
-    limits:
-      cpu: 1
-      memory: 4Gi
   env:
     - name: APP_BASE_URL
       value: "https://formulaire-{{ $.Values.global.host }}"

diff --git a/formulaire/src/fetching/sync.tsx b/formulaire/src/fetching/sync.tsx
@@ -4,6 +4,7 @@ import { DossierData, EnfantData } from "./dossiers";
 
 const sendDossier = async (dossier: DossierData, demandeur: DemandeurData, societeProduction: SocieteProduction, enfants: EnfantData[]) => {
     const url = "/api/sync/out/dossiers";
+    console.log("SENDING DOSSIER", JSON.stringify({dossier: dossier, demandeur: demandeur, societeProduction: societeProduction, enfants: enfants}))
     const fetching = await fetch(url, {
         body: JSON.stringify({dossier: dossier, demandeur: demandeur, societeProduction: societeProduction, enfants: enfants}),
         method: "POST",
@@ -18,4 +19,4 @@ const sendDossier = async (dossier: DossierData, demandeur: DemandeurData, socie
 
 export {
     sendDossier
-}
+}