Retter til riktig app name postfix. (#29)

Author: perchrnie

.github/workflows/deploy_gcp.yml

@@ -5,10 +5,9 @@ on:
       config-file-name:
         description: 'Config-fil som skal deployes'
         required: true
-        default: 'dev-gcp'
+        default: 'mock'
         type: choice
         options:
-          - 'dev-gcp'
           - 'mock'
           - 'dev'
           - 'labs-gcp'

nais.yaml

@@ -17,25 +17,26 @@ spec:
       external:
         - host: "appres.nav.no"
         - host: "nav.psplugin.com"
-        - host: "sosialhjelp-veiviser{{domene}}"
-        - host: "sosialhjelp-soknad{{domene}}"
-        - host: "sosialhjelp-soknad-api{{domene}}"
-        - host: "sosialhjelp-innsyn{{domene}}"
-        - host: "sosialhjelp-innsyn-api{{domene}}"
-        - host: "sosialhjelp-modia{{domene}}"
-        - host: "sosialhjelp-modia-api{{domene}}"
-        - host: "sosialhjelp-mock-alt{{domene}}"
-        - host: "sosialhjelp-mock-alt-api{{domene}}"
-        - host: "sosialhjelp-dialog-bruker{{domene}}"
-        - host: "sosialhjelp-dialog-veileder{{domene}}"
-        - host: "sosialhjelp-dialog-api{{domene}}"
-        - host: "sosialhjelp-fagsystem-mock{{domene}}"
+      rules:
+        - application: "sosialhjelp-veiviser{{appNamePostfix}}"
+        - application: "sosialhjelp-soknad{{appNamePostfix}}"
+        - application: "sosialhjelp-soknad-api{{appNamePostfix}}"
+        - application: "sosialhjelp-innsyn{{appNamePostfix}}"
+        - application: "sosialhjelp-innsyn-api{{appNamePostfix}}"
+        - application: "sosialhjelp-modia{{appNamePostfix}}"
+        - application: "sosialhjelp-modia-api{{appNamePostfix}}"
+        - application: "sosialhjelp-mock-alt{{appNamePostfix}}"
+        - application: "sosialhjelp-mock-alt-api{{appNamePostfix}}"
+        - application: "sosialhjelp-dialog-bruker{{appNamePostfix}}"
+        - application: "sosialhjelp-dialog-veileder{{appNamePostfix}}"
+        - application: "sosialhjelp-dialog-api{{appNamePostfix}}"
+        - application: "sosialhjelp-fagsystem-mock{{appNamePostfix}}"
     inbound:
       rules:
-        - application: sosialhjelp-soknad-api
-        - application: sosialhjelp-innsyn-api
-        - application: sosialhjelp-modia-api
-        - application: sosialhjelp-dialog-api
+        - application: "sosialhjelp-soknad-api{{appNamePostfix}}"
+        - application: "sosialhjelp-innsyn-api{{appNamePostfix}}"
+        - application: "sosialhjelp-modia-api{{appNamePostfix}}"
+        - application: "sosialhjelp-dialog-api{{appNamePostfix}}"
   ingresses:
 {{#each ingresses}}
     - "{{this}}"

nais/dev-gcp.json

@@ -1,6 +1,7 @@
 {
   "applicationName": "sosialhjelp-proxy-dev",
   "namespace": "teamdigisos",
+  "appNamePostfix": "-dev",
   "domene_pa_innsiden": "-dev.dev.nav.no",
   "domene_pa_utsiden": ".dev.nav.no",
   "ingresses": ["https://digisos.dev.nav.no"]

nais/dev.json

@@ -1,6 +1,7 @@
 {
   "applicationName": "digisos",
   "namespace": "teamdigisos",
+  "appNamePostfix": "",
   "domene_pa_innsiden": ".labs.nais.io",
   "domene_pa_utsiden": ".labs.nais.io",
   "ingresses": [

nais/labs-gcp.json

@@ -1,6 +1,7 @@
 {
   "applicationName": "sosialhjelp-proxy-mock",
   "namespace": "teamdigisos",
+  "appNamePostfix": "-mock",
   "domene_pa_innsiden": "-mock.dev.nav.no",
   "domene_pa_utsiden": ".ekstern.dev.nav.no",
   "ingresses": ["https://digisos.ekstern.dev.nav.no"]