Merge branch 'master' into fix-env

.k8s/__tests__/__snapshots__/dev.ts.snap

@@ -141,7 +141,7 @@ spec:
     app: strapi-cache
   type: ClusterIP
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -168,8 +168,11 @@ spec:
       http:
         paths:
           - backend:
-              serviceName: strapi-cache
-              servicePort: 80
+              service:
+                name: strapi-cache
+                port:
+                  name: http
+                  number: 80
             path: /
   tls:
     - hosts:

.k8s/__tests__/__snapshots__/preprod.ts.snap

@@ -141,7 +141,7 @@ spec:
     app: strapi-cache
   type: ClusterIP
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -168,8 +168,11 @@ spec:
       http:
         paths:
           - backend:
-              serviceName: strapi-cache
-              servicePort: 80
+              service:
+                name: strapi-cache
+                port:
+                  name: http
+                  number: 80
             path: /
   tls:
     - hosts:

.k8s/__tests__/__snapshots__/prod.ts.snap

@@ -118,7 +118,7 @@ spec:
     app: strapi-cache
   type: ClusterIP
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -146,8 +146,11 @@ spec:
       http:
         paths:
           - backend:
-              serviceName: strapi-cache
-              servicePort: 80
+              service:
+                name: strapi-cache
+                port:
+                  name: http
+                  number: 80
             path: /
   tls:
     - hosts:

.k8s/components/cache/index.ts

@@ -9,13 +9,13 @@ import { getDeployment } from "@socialgouv/kosko-charts/utils/getDeployment";
 import { IIoK8sApiCoreV1HTTPGetAction, Volume } from "kubernetes-models/v1";
 import { ConfigMap } from "kubernetes-models/v1/ConfigMap";
 import { Ingress } from "kubernetes-models/api/networking/v1";
-import gitlab from "@socialgouv/kosko-charts/environments/gitlab";
+import ci from "@socialgouv/kosko-charts/environments";
 
 const httpGet: IIoK8sApiCoreV1HTTPGetAction = {
   path: "/_health",
   port: "http",
 };
-const envParams = gitlab(process.env);
+const envParams = ci(process.env);
 const strapiParams = env.component("strapi");
 
 // renovate: datasource=docker depName=nginx versioning=1.19.6
@@ -90,9 +90,9 @@ export default async () => {
   const configMap = new ConfigMap({
     metadata: {
       name: "strapi-cache",
-      labels: envParams.labels,
-      annotations: envParams.annotations,
-      namespace: envParams.namespace.name,
+      labels: envParams.metadata.labels,
+      annotations: envParams.metadata.annotations,
+      namespace: envParams.metadata.namespace.name,
     },
     data: {
       "nginx.conf": fs
@@ -108,7 +108,7 @@ export default async () => {
       ...ingress.metadata.annotations,
       "nginx.ingress.kubernetes.io/proxy-body-size": "1g",
       "nginx.ingress.kubernetes.io/limit-rps": "20",
-      "nginx.ingress.kubernetes.io/limit-rpm": "300"
+      "nginx.ingress.kubernetes.io/limit-rpm": "300",
     };
   }
 

.k8s/components/pg.ts

@@ -3,7 +3,7 @@ import { SealedSecret } from "@kubernetes-models/sealed-secrets/bitnami.com/v1al
 
 import { loadYaml } from "@socialgouv/kosko-charts/utils/getEnvironmentComponent";
 import { updateMetadata } from "@socialgouv/kosko-charts/utils/updateMetadata";
-import gitlab from "@socialgouv/kosko-charts/environments/gitlab";
+import ci from "@socialgouv/kosko-charts/environments";
 
 import { create } from "@socialgouv/kosko-charts/components/azure-pg";
 
@@ -15,17 +15,20 @@ export default async () => {
   }
 
   // in prod/preprod, we try to add a fixed sealed-secret
-  const secret = await loadYaml<SealedSecret>(env, `pg-user.sealed-secret.yaml`);
+  const secret = await loadYaml<SealedSecret>(
+    env,
+    `pg-user.sealed-secret.yaml`
+  );
   if (!secret) {
     return [];
   }
 
-  const envParams = gitlab(process.env);
+  const envParams = ci(process.env);
   // add gitlab annotations
   updateMetadata(secret, {
-    annotations: envParams.annotations || {},
-    labels: envParams.labels || {},
-    namespace: envParams.namespace,
+    annotations: envParams.metadata.annotations || {},
+    labels: envParams.metadata.labels || {},
+    namespace: envParams.metadata.namespace,
   });
   return [secret];
 };

.k8s/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@kosko/env": "^2.0.1",
     "@kubernetes-models/sealed-secrets": "^1.6.3",
-    "@socialgouv/kosko-charts": "^6.5.0",
+    "@socialgouv/kosko-charts": "^8.0.1",
     "@types/node": "^15.12.5",
     "kosko": "^1.1.5",
     "kubernetes-models": "^1.7.1",

.k8s/yarn.lock

@@ -665,13 +665,14 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@socialgouv/kosko-charts@^6.5.0":
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-6.5.0.tgz#be22aab06fb99ad173e270bfd0ddb8ae60e9a97f"
-  integrity sha512-YwLOCrBkJ77ojlG1eEYvF3V4vXIJWMAl/1XZ9hUl5bhF9MyYbEAI0izwiClwPZaTSv1DaP2+IRf5WS80KoCVUA==
+"@socialgouv/kosko-charts@^8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@socialgouv/kosko-charts/-/kosko-charts-8.0.1.tgz#93071672f72abdbdd0b004c01b65d346b1b5b5ab"
+  integrity sha512-xLbWuTdogmbPn75f75d/maWoHmHjMKiEJGWwAQ1RZ3h3mmojRSEC8sCvRxRqsTkImP4f/9kDtu2+BTCHJXNo8w==
   dependencies:
     "@sindresorhus/is" "^4.0.1"
     fs-extra "^10.0.0"
+    slugify "^1.6.0"
 
 "@tootallnate/once@1":
   version "1.1.2"
@@ -2806,6 +2807,11 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slugify@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.0.tgz#6bdf8ed01dabfdc46425b67e3320b698832ff893"
+  integrity sha512-FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang==
+
 source-map-support@^0.5.17, source-map-support@^0.5.6:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"

CHANGELOG.md

+## [1.67.1](https://github.com/SocialGouv/1000jours/compare/v1.67.0...v1.67.1) (2021-07-16)
+
+
+### Bug Fixes
+
+* **epds:** Corrige l'envoie des scores au backend, refs [#512](https://github.com/SocialGouv/1000jours/issues/512) ([#528](https://github.com/SocialGouv/1000jours/issues/528)) ([2a33965](https://github.com/SocialGouv/1000jours/commit/2a339659ad3280fab11bf41ab12d13cb975c8ae8))
+
 # [1.67.0](https://github.com/SocialGouv/1000jours/compare/v1.66.0...v1.67.0) (2021-07-16)