fix(ci): better DNS prefixes (#73)

* fix(ci): better DNS prefixes * rename * Update README.md
SocialGouv · Mar 24, 2021 · de5155f · de5155f
1 parent 760d9eb
commit de5155f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/.k8s/__tests__/__snapshots__/dev.ts.snap b/.k8s/__tests__/__snapshots__/dev.ts.snap
@@ -385,7 +385,7 @@ metadata:
   namespace: 1000jours-85-master-dev2
 spec:
   rules:
-    - host: hasura-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
+    - host: api-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -394,7 +394,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
+        - api-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
       secretName: wildcard-crt
 ---
 apiVersion: batch/v1
@@ -714,7 +714,7 @@ metadata:
   namespace: 1000jours-85-master-dev2
 spec:
   rules:
-    - host: strapi-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
+    - host: backoffice-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -723,7 +723,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - strapi-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
+        - backoffice-chore-d-u8fps8-les1000jours.dev2.fabrique.social.gouv.fr
       secretName: wildcard-crt
 "
 `;
diff --git a/.k8s/__tests__/__snapshots__/preprod.ts.snap b/.k8s/__tests__/__snapshots__/preprod.ts.snap
@@ -383,7 +383,7 @@ metadata:
   namespace: 1000jours-85-preprod-dev2
 spec:
   rules:
-    - host: hasura-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
+    - host: api-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -392,7 +392,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
+        - api-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
       secretName: wildcard-crt
 ---
 apiVersion: bitnami.com/v1alpha1
@@ -675,7 +675,7 @@ metadata:
   namespace: 1000jours-85-preprod-dev2
 spec:
   rules:
-    - host: strapi-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
+    - host: backoffice-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -684,7 +684,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - strapi-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
+        - backoffice-v1-2-3-les1000jours.dev2.fabrique.social.gouv.fr
       secretName: wildcard-crt
 "
 `;
diff --git a/.k8s/__tests__/__snapshots__/prod.ts.snap b/.k8s/__tests__/__snapshots__/prod.ts.snap
@@ -364,7 +364,7 @@ metadata:
   namespace: les1000jours
 spec:
   rules:
-    - host: hasura.les1000jours.fabrique.social.gouv.fr
+    - host: api-les1000jours.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -373,7 +373,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura.les1000jours.fabrique.social.gouv.fr
+        - api-les1000jours.fabrique.social.gouv.fr
       secretName: hasura-crt
 ---
 apiVersion: bitnami.com/v1alpha1
@@ -653,7 +653,7 @@ metadata:
   namespace: les1000jours
 spec:
   rules:
-    - host: strapi-les1000jours.fabrique.social.gouv.fr
+    - host: backoffice-les1000jours.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -662,7 +662,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - strapi-les1000jours.fabrique.social.gouv.fr
+        - backoffice-les1000jours.fabrique.social.gouv.fr
       secretName: strapi-crt
 "
 `;
diff --git a/.k8s/components/hasura.ts b/.k8s/components/hasura.ts
@@ -11,6 +11,7 @@ const manifests = create({
   env,
   config: {
     ingress: true,
+    subDomainPrefix: "api-",
   },
   deployment: {
     image: getHarborImagePath({ name: "les1000jours-hasura" }),

diff --git a/.k8s/components/strapi.ts b/.k8s/components/strapi.ts
@@ -32,7 +32,7 @@ const manifests = create("strapi", {
   config: {
     containerPort: 1337,
     withPostgres: true,
-    subDomainPrefix: "strapi-",
+    subDomainPrefix: "backoffice-",
   },
   deployment: {
     image: getHarborImagePath({ name: "les1000jours-strapi" }),

diff --git a/README.md b/README.md
@@ -44,3 +44,4 @@ yarn ios
 ### Application back-end
 
 TODO
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,4 @@ yarn ios
		### Application back-end

		TODO