Skip to content

Commit 2126bb0

Browse files
committed
Støtt deploy av samme naisconfig mot to URLer i prod
1 parent 7ca300a commit 2126bb0

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/build_n_deploy_prod.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- 'main'
1010

1111
env:
12-
BASE_PATH: /familie/barnetrygd/soknad/ # TODO: må endres når vi endrer path for prod
12+
BASE_PATH: /barnetrygd/soknad/
1313

1414
jobs:
1515
test:
@@ -86,7 +86,7 @@ jobs:
8686
env:
8787
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
8888
CLUSTER: dev-gcp
89-
RESOURCE: build_n_deploy/naiserator/naiserator_dev_gammel_URL.yaml # TODO: må endres når vi endrer path for prod
89+
RESOURCE: build_n_deploy/naiserator/naiserator_dev.yaml
9090
VAR: base_path=${{ env.BASE_PATH }}
9191
IMAGE: ${{ needs.bygg.outputs.image }}
9292

build_n_deploy/naiserator/naiserator_prod.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ spec:
2727
enabled: true
2828
path: /metrics
2929
ingresses:
30-
- https://www.nav.no/familie/barnetrygd/soknad # TODO: må endres når vi endrer path for prod
30+
- https://www.nav.no/barnetrygd/soknad
31+
- https://www.nav.no/familie/barnetrygd/soknad
3132
accessPolicy:
3233
outbound:
3334
rules:
@@ -49,8 +50,10 @@ spec:
4950
autoLogin: true
5051
level: Level4
5152
autoLoginIgnorePaths:
52-
- /familie/barnetrygd/soknad/**/*.css # TODO: må endres når vi endrer path for prod
53-
- /familie/barnetrygd/soknad/**/manifest.json # TODO: må endres når vi endrer path for prod
53+
- /barnetrygd/soknad/**/*.css
54+
- /barnetrygd/soknad/**/manifest.json
55+
- /familie/barnetrygd/soknad/**/*.css
56+
- /familie/barnetrygd/soknad/**/manifest.json
5457
tokenx:
5558
enabled: true
5659
env:

0 commit comments

Comments
 (0)