feat(k8s): add subdomain prefix

SocialGouv · Jul 29, 2020 · 88046e2 · 88046e2
1 parent f9ea78f
commit 88046e2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env dev.ts.snap
@@ -159,7 +159,7 @@ metadata:
   namespace: sample-next-app-24-e2e-branch-42
 spec:
   rules:
-    - host: hasura-sample-next-app.dev.fabrique.social.gouv.fr
+    - host: hasura-e2e-branch-42-sample-next-app.dev.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -168,7 +168,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura-sample-next-app.dev.fabrique.social.gouv.fr
+        - hasura-e2e-branch-42-sample-next-app.dev.fabrique.social.gouv.fr
       secretName: wildcard-crt
 apiVersion: extensions/v1beta1
 kind: Ingress

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env preprod.ts.snap
@@ -16,7 +16,7 @@ metadata:
     owner: sample-next-app
     team: sample-next-app
     cert: wildcard
-  name: sample-next-app-24-e2e-branch-42
+  name: sample-next-app-24-preprod-dev2
 apiVersion: v1
 kind: Namespace
 ---
@@ -27,12 +27,12 @@ metadata:
     app.gitlab.com/env.name: e2e-branch-dev2
   labels:
     app: hasura
-    application: v1-2-3-sample-next-app
+    application: preprod-sample-next-app
     owner: sample-next-app
     team: sample-next-app
     cert: wildcard
   name: hasura
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   replicas: 1
   selector:
@@ -46,7 +46,7 @@ spec:
         app.gitlab.com/env.name: e2e-branch-dev2
       labels:
         app: hasura
-        application: v1-2-3-sample-next-app
+        application: preprod-sample-next-app
         owner: sample-next-app
         team: sample-next-app
         cert: wildcard
@@ -123,7 +123,7 @@ kind: Deployment
 metadata:
   labels:
     app: hasura
-    application: v1-2-3-sample-next-app
+    application: preprod-sample-next-app
     owner: sample-next-app
     team: sample-next-app
     cert: wildcard
@@ -132,7 +132,7 @@ metadata:
     app.gitlab.com/app: socialgouv-sample-next-app
     app.gitlab.com/env: e2e-branch-42
     app.gitlab.com/env.name: e2e-branch-dev2
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   ports:
     - port: 80
@@ -151,15 +151,15 @@ metadata:
     app.gitlab.com/env.name: e2e-branch-dev2
   labels:
     app: hasura
-    application: v1-2-3-sample-next-app
+    application: preprod-sample-next-app
     owner: sample-next-app
     team: sample-next-app
     cert: wildcard
   name: hasura
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   rules:
-    - host: hasura-sample-next-app.dev.fabrique.social.gouv.fr
+    - host: hasura-preprod-sample-next-app.dev.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -168,7 +168,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura-sample-next-app.dev.fabrique.social.gouv.fr
+        - hasura-preprod-sample-next-app.dev.fabrique.social.gouv.fr
       secretName: wildcard-crt
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -186,7 +186,7 @@ metadata:
     cert: wildcard
     component: next
   name: www
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   replicas: 1
   selector:
@@ -258,7 +258,7 @@ metadata:
     app.gitlab.com/app: socialgouv-sample-next-app
     app.gitlab.com/env: e2e-branch-42
     app.gitlab.com/env.name: e2e-branch-dev2
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   ports:
     - port: 80
@@ -282,7 +282,7 @@ metadata:
     team: sample-next-app
     cert: wildcard
   name: www
-  namespace: sample-next-app-24-e2e-branch-42
+  namespace: sample-next-app-24-preprod-dev2
 spec:
   rules:
     - host: preprod-sample-next-app.dev.fabrique.social.gouv.fr

diff --git a/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap b/e2e/templates/simple/kosko generate/__tests__/__snapshots__/--env prod.ts.snap
@@ -141,7 +141,7 @@ metadata:
   namespace: sample-next-app
 spec:
   rules:
-    - host: hasura-sample-next-app.dev.fabrique.social.gouv.fr
+    - host: hasura.sample-next-app.dev.fabrique.social.gouv.fr
       http:
         paths:
           - backend:
@@ -150,7 +150,7 @@ spec:
             path: /
   tls:
     - hosts:
-        - hasura-sample-next-app.dev.fabrique.social.gouv.fr
+        - hasura.sample-next-app.dev.fabrique.social.gouv.fr
       secretName: hasura-crt
 apiVersion: extensions/v1beta1
 kind: Ingress