fix(k8s): use env.BASE_URL and fallback on proces.env.BASE_URL (#416)

* fix(k8s): use env.BASE_URL and fallback on proces.env.BASE_URL * pass the BASE_URL through the dev only sitemap-uploader file Co-authored-by: Douglas DUTEIL <[email protected]>
SocialGouv · Apr 8, 2021 · 5aeef2f · 5aeef2f
1 parent 0dc9aab
commit 5aeef2f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/.k8s/__tests__/__snapshots__/generate-prod-sitemap-uploader.ts.snap b/.k8s/__tests__/__snapshots__/generate-prod-sitemap-uploader.ts.snap
@@ -60,8 +60,7 @@ spec:
                 exit 1
               fi
 
-          env:
-            - name: BASE_URL
+          env: []
           envFrom:
             - configMapRef:
                 name: sitemap-uploader-preprod
@@ -191,8 +190,7 @@ spec:
                 exit 1
               fi
 
-          env:
-            - name: BASE_URL
+          env: []
           envFrom:
             - configMapRef:
                 name: sitemap-uploader-prod

diff --git a/.k8s/components/jobs/sitemap-uploader/index.ts b/.k8s/components/jobs/sitemap-uploader/index.ts
@@ -99,10 +99,14 @@ const job = new Job({
             command: ["bash"],
             args: ["-c", uploadSitemapScript],
             env: [
-              {
-                name: "BASE_URL",
-                value: process.env.BASE_URL || env.BASE_URL,
-              },
+              ...(env.BASE_URL
+                ? [
+                    {
+                      name: "BASE_URL",
+                      value: env.BASE_URL,
+                    },
+                  ]
+                : []),
             ],
             envFrom: [
               {

diff --git a/.k8s/environments/dev/sitemap-uploader/index.ts b/.k8s/environments/dev/sitemap-uploader/index.ts
@@ -17,4 +17,6 @@ BASE_URL = https://xxx-code-travail.dev2.fabrique.social.gouv.fr/
 
 `
 );
-export default {};
+export default {
+  BASE_URL: process.env.BASE_URL,
+};