fix: Ingress for production env.

SocialGouv · May 19, 2021 · a166cdb · a166cdb
1 parent db9a9ca
commit a166cdb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -355,6 +355,8 @@ Seed:
     refs:
       - master
       - alpha
+      - beta
+      - next
     variables:
       # Don't run when deploying in production or releasing
       - $PRODUCTION

diff --git a/.k8s/components/backend.ts b/.k8s/components/backend.ts
@@ -57,7 +57,7 @@ export const getManifests = () => {
       ingress: true,
       withPostgres: true,
       containerPort: 3000,
-      subDomainPrefix: process.env.PRODUCTION ? `${subdomain}.` : `${subdomain}-`,
+      subDomainPrefix: process.env.PRODUCTION ? `fake-` : `${subdomain}-`,
     },
     deployment: {
       image: getHarborImagePath({ name }),

diff --git a/.k8s/components/frontend.ts b/.k8s/components/frontend.ts
@@ -32,7 +32,9 @@ export const getManifests = () => {
 
   const manifests = create(name, {
     env,
-    config: { subdomain },
+    config: {
+      subdomain: process.env.PRODUCTION ? `fake-${subdomain}` : subdomain,
+     },
     deployment: {
       image: getHarborImagePath({ name }),
       ...podProbes,

diff --git a/.k8s/environments/prod/backend.configmap.yaml b/.k8s/environments/prod/backend.configmap.yaml
@@ -6,4 +6,3 @@ data:
   NODE_ENV: production
   PGSSLMODE: "require"
   DOMIFA_ENV_ID: prod
-  SECRET: my_great_production_secret
-Original file line number
+Diff line change
@@ Expand Up / @@ -355,6 +355,8 @@ Seed: @@
         refs:
           - master
           - alpha
+          - beta
+          - next
         variables:
           # Don't run when deploying in production or releasing
           - $PRODUCTION
@@ Expand Down @@