Skip to content
This repository was archived by the owner on Aug 11, 2025. It is now read-only.

Commit 808ce0b

Browse files
perchrnielinemosmrbjoern
authored
Setter opp extern ingress for å kunne nå dev-gcp fra internett. (#16)
* Setter opp extern ingress for å kunne nå dev-gcp fra internett. * Legger til ny mock versjon etc. * Rename domene til domene_pa_innsiden * Får med tag i docker image på workflow dispatch * uses checkout * Ingress rydding. * Støtter Sanity Studio for veiviseren, fikser evig redirect for sosialhjelp-veiviser * Riktig redirect sanity studio * Fjerne -mock fra intern url siden denne blir lagt på i 'DOMENE_PA_INNSIDEN' * Legger til proxy for øk. veiviser * Støtter apper med andre basepaths enn /sosialhjelp * Setter riktig url for okonomi-og-gjeld * Støtter andre basepaths enn /sosialhjelp i dev-gcp * Legger til option for dev-gcp-mock i workflow_dispatch * Domene på utsiden kan ikke være det samme som for -mock. Co-authored-by: Line Moseng <[email protected]> Co-authored-by: Halvor Bjørn <[email protected]>
1 parent 195267c commit 808ce0b

File tree

7 files changed

+84
-46
lines changed

7 files changed

+84
-46
lines changed

‎.github/workflows/deploy_gcp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
type: choice
1010
options:
1111
- 'dev-gcp'
12+
- 'dev-gcp-mock'
1213
- 'labs-gcp'
1314
cluster:
1415
description: 'Cluster å deploye til'

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ FROM nginxinc/nginx-unprivileged:1.21.3
22
COPY default.conf /default.conf
33
COPY static /static
44
RUN chmod 660 /etc/nginx/conf.d/default.conf
5-
CMD envsubst '${PORT} ${DOMENE}' < /default.conf > /etc/nginx/conf.d/default.conf && cat /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'
5+
CMD envsubst '${PORT} ${DOMENE_PA_INNSIDEN} ${DOMENE_PA_UTSIDEN}' < /default.conf > /etc/nginx/conf.d/default.conf && cat /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'

‎default.conf‎

Lines changed: 64 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,145 +19,169 @@ server {
1919
}
2020

2121
location /sosialhjelp/soknad {
22-
return 302 https://digisos${DOMENE}/sosialhjelp/soknad/;
22+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/soknad/;
2323
}
2424
location /sosialhjelp/innsyn {
25-
return 302 https://digisos${DOMENE}/sosialhjelp/innsyn/;
25+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/innsyn/;
2626
}
2727
location /sosialhjelp/fagsystem-mock {
28-
return 302 https://digisos${DOMENE}/sosialhjelp/fagsystem-mock/;
28+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/fagsystem-mock/;
2929
}
3030
location /sosialhjelp/modia {
31-
return 302 https://digisos${DOMENE}/sosialhjelp/modia/;
31+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/modia/;
3232
}
3333
location /sosialhjelp/mock-alt {
34-
return 302 https://digisos${DOMENE}/sosialhjelp/mock-alt/;
34+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/mock-alt/;
3535
}
36-
location /sosialhjelp {
37-
return 302 https://digisos${DOMENE}/sosialhjelp/;
36+
location /sosialhjelp/studio {
37+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/sosialhjelp/studio/;
3838
}
3939

40+
location /okonomi-og-gjeld/studio {
41+
return 302 https://digisos${DOMENE_PA_UTSIDEN}/okonomi-og-gjeld/studio/;
42+
}
4043

4144
# BEGIN Søknad master branch
4245

4346
location /sosialhjelp/soknad/ {
44-
proxy_set_header Host sosialhjelp-soknad${DOMENE};
45-
proxy_pass https://sosialhjelp-soknad${DOMENE}/sosialhjelp/soknad/;
47+
proxy_set_header Host sosialhjelp-soknad${DOMENE_PA_INNSIDEN};
48+
proxy_pass https://sosialhjelp-soknad${DOMENE_PA_INNSIDEN}/sosialhjelp/soknad/;
4649
proxy_ssl_server_name on;
4750
proxy_http_version 1.1;
4851
}
4952

5053
location /sosialhjelp/soknad-api/ {
51-
proxy_set_header Host sosialhjelp-soknad-api${DOMENE};
52-
proxy_pass https://sosialhjelp-soknad-api${DOMENE}/sosialhjelp/soknad-api/;
54+
proxy_set_header Host sosialhjelp-soknad-api${DOMENE_PA_INNSIDEN};
55+
proxy_pass https://sosialhjelp-soknad-api${DOMENE_PA_INNSIDEN}/sosialhjelp/soknad-api/;
5356
proxy_ssl_server_name on;
5457
proxy_http_version 1.1;
5558
}
5659

5760
location /sosialhjelp/login-api/soknad-api/ {
58-
proxy_set_header Host sosialhjelp-soknad-api${DOMENE};
59-
proxy_pass https://sosialhjelp-soknad-api${DOMENE}/sosialhjelp/soknad-api/;
61+
proxy_set_header Host sosialhjelp-soknad-api${DOMENE_PA_INNSIDEN};
62+
proxy_pass https://sosialhjelp-soknad-api${DOMENE_PA_INNSIDEN}/sosialhjelp/soknad-api/;
6063
proxy_ssl_server_name on;
6164
proxy_http_version 1.1;
6265
}
6366
# END Søknad master branch
6467

6568
# BEGIN Innsyn master branch
6669
location /sosialhjelp/innsyn/ {
67-
proxy_set_header Host sosialhjelp-innsyn${DOMENE};
68-
proxy_pass https://sosialhjelp-innsyn${DOMENE}/sosialhjelp/innsyn/;
70+
proxy_set_header Host sosialhjelp-innsyn${DOMENE_PA_INNSIDEN};
71+
proxy_pass https://sosialhjelp-innsyn${DOMENE_PA_INNSIDEN}/sosialhjelp/innsyn/;
6972
proxy_ssl_server_name on;
7073
proxy_http_version 1.1;
7174
}
7275

7376
location /sosialhjelp/login-api/innsyn-api/ {
74-
proxy_set_header Host sosialhjelp-innsyn-api${DOMENE};
75-
proxy_pass https://sosialhjelp-innsyn-api${DOMENE}/sosialhjelp/innsyn-api/;
77+
proxy_set_header Host sosialhjelp-innsyn-api${DOMENE_PA_INNSIDEN};
78+
proxy_pass https://sosialhjelp-innsyn-api${DOMENE_PA_INNSIDEN}/sosialhjelp/innsyn-api/;
7679
proxy_ssl_server_name on;
7780
proxy_http_version 1.1;
7881
}
7982

8083
location /sosialhjelp/innsyn-api/ {
81-
proxy_set_header Host sosialhjelp-innsyn-api${DOMENE};
82-
proxy_pass https://sosialhjelp-innsyn-api${DOMENE}/sosialhjelp/innsyn-api/;
84+
proxy_set_header Host sosialhjelp-innsyn-api${DOMENE_PA_INNSIDEN};
85+
proxy_pass https://sosialhjelp-innsyn-api${DOMENE_PA_INNSIDEN}/sosialhjelp/innsyn-api/;
8386
proxy_ssl_server_name on;
8487
proxy_http_version 1.1;
8588
}
8689
# END Innsyn master branch
8790

8891
# BEGIN Modia master branch
8992
location /sosialhjelp/modia/ {
90-
proxy_set_header Host sosialhjelp-modia${DOMENE};
91-
proxy_pass https://sosialhjelp-modia${DOMENE}/sosialhjelp/modia/;
93+
proxy_set_header Host sosialhjelp-modia${DOMENE_PA_INNSIDEN};
94+
proxy_pass https://sosialhjelp-modia${DOMENE_PA_INNSIDEN}/sosialhjelp/modia/;
9295
proxy_ssl_server_name on;
9396
proxy_http_version 1.1;
9497
}
9598

9699
location /sosialhjelp/modia-api/ {
97-
proxy_set_header Host sosialhjelp-modia-api${DOMENE};
98-
proxy_pass https://sosialhjelp-modia-api${DOMENE}/sosialhjelp/modia-api/;
100+
proxy_set_header Host sosialhjelp-modia-api${DOMENE_PA_INNSIDEN};
101+
proxy_pass https://sosialhjelp-modia-api${DOMENE_PA_INNSIDEN}/sosialhjelp/modia-api/;
99102
proxy_ssl_server_name on;
100103
proxy_http_version 1.1;
101104
}
102105
# END Modia master branch
103106

104107
# BEGIN Mock alt master branch
105108
location /sosialhjelp/mock-alt-api/ {
106-
proxy_set_header Host sosialhjelp-mock-alt-api${DOMENE};
107-
proxy_pass https://sosialhjelp-mock-alt-api${DOMENE}/sosialhjelp/mock-alt-api/;
109+
proxy_set_header Host sosialhjelp-mock-alt-api${DOMENE_PA_INNSIDEN};
110+
proxy_pass https://sosialhjelp-mock-alt-api${DOMENE_PA_INNSIDEN}/sosialhjelp/mock-alt-api/;
108111
proxy_ssl_server_name on;
109112
proxy_http_version 1.1;
110113
}
111114

112115
location /sosialhjelp/mock-alt/ {
113-
proxy_set_header Host sosialhjelp-mock-alt${DOMENE};
114-
proxy_pass https://sosialhjelp-mock-alt${DOMENE}/sosialhjelp/mock-alt/;
116+
proxy_set_header Host sosialhjelp-mock-alt${DOMENE_PA_INNSIDEN};
117+
proxy_pass https://sosialhjelp-mock-alt${DOMENE_PA_INNSIDEN}/sosialhjelp/mock-alt/;
115118
proxy_ssl_server_name on;
116119
proxy_http_version 1.1;
117120
}
118121

119122
location /frontendlogger/ {
120-
proxy_set_header Host sosialhjelp-mock-alt-api${DOMENE};
121-
proxy_pass https://sosialhjelp-mock-alt-api${DOMENE}/sosialhjelp/mock-alt-api/frontendlogger/;
123+
proxy_set_header Host sosialhjelp-mock-alt-api${DOMENE_PA_INNSIDEN};
124+
proxy_pass https://sosialhjelp-mock-alt-api${DOMENE_PA_INNSIDEN}/sosialhjelp/mock-alt-api/frontendlogger/;
122125
proxy_ssl_server_name on;
123126
proxy_http_version 1.1;
124127
}
125128
# END Mock alt master branch
126129

127130
# BEGIN Dialog master branch
128131
location /sosialhjelp/meldinger-api/ {
129-
proxy_set_header Host sosialhjelp-dialog-api${DOMENE};
130-
proxy_pass https://sosialhjelp-dialog-api${DOMENE}/sosialhjelp/meldinger-api/;
132+
proxy_set_header Host sosialhjelp-dialog-api${DOMENE_PA_INNSIDEN};
133+
proxy_pass https://sosialhjelp-dialog-api${DOMENE_PA_INNSIDEN}/sosialhjelp/meldinger-api/;
131134
proxy_ssl_server_name on;
132135
proxy_http_version 1.1;
133136
}
134137

135138
location /sosialhjelp/meldinger {
136-
proxy_set_header Host sosialhjelp-dialog-bruker${DOMENE};
137-
proxy_pass https://sosialhjelp-dialog-bruker${DOMENE}/sosialhjelp/meldinger;
139+
proxy_set_header Host sosialhjelp-dialog-bruker${DOMENE_PA_INNSIDEN};
140+
proxy_pass https://sosialhjelp-dialog-bruker${DOMENE_PA_INNSIDEN}/sosialhjelp/meldinger;
138141
proxy_ssl_server_name on;
139142
proxy_http_version 1.1;
140143
}
141144

142145
location /sosialhjelp/meldinger-veileder {
143-
proxy_set_header Host sosialhjelp-dialog-veileder${DOMENE};
144-
proxy_pass https://sosialhjelp-dialog-veileder${DOMENE}/sosialhjelp/meldinger-veileder;
146+
proxy_set_header Host sosialhjelp-dialog-veileder${DOMENE_PA_INNSIDEN};
147+
proxy_pass https://sosialhjelp-dialog-veileder${DOMENE_PA_INNSIDEN}/sosialhjelp/meldinger-veileder;
145148
proxy_ssl_server_name on;
146149
proxy_http_version 1.1;
147150
}
148151

149152
# END Dialog master branch
150153

151154
location /sosialhjelp/fagsystem-mock/ {
152-
proxy_set_header Host sosialhjelp-fagsystem-mock${DOMENE};
153-
proxy_pass https://sosialhjelp-fagsystem-mock${DOMENE}/sosialhjelp/fagsystem-mock/;
155+
proxy_set_header Host sosialhjelp-fagsystem-mock${DOMENE_PA_INNSIDEN};
156+
proxy_pass https://sosialhjelp-fagsystem-mock${DOMENE_PA_INNSIDEN}/sosialhjelp/fagsystem-mock/;
157+
proxy_ssl_server_name on;
158+
proxy_http_version 1.1;
159+
}
160+
161+
location /sosialhjelp/studio/ {
162+
proxy_set_header Host sosialhjelp-veiviser-sanity${DOMENE_PA_INNSIDEN};
163+
proxy_pass https://sosialhjelp-veiviser-sanity${DOMENE_PA_INNSIDEN}/sosialhjelp/studio/;
164+
proxy_ssl_server_name on;
165+
proxy_http_version 1.1;
166+
}
167+
168+
location /sosialhjelp {
169+
proxy_set_header Host sosialhjelp-veiviser${DOMENE_PA_INNSIDEN};
170+
proxy_pass https://sosialhjelp-veiviser${DOMENE_PA_INNSIDEN}/sosialhjelp;
171+
proxy_ssl_server_name on;
172+
proxy_http_version 1.1;
173+
}
174+
175+
location /okonomi-og-gjeld/studio/ {
176+
proxy_set_header Host okonomi-gjeldsradgivning-veiviser-sanity${DOMENE_PA_INNSIDEN};
177+
proxy_pass https://okonomi-gjeldsradgivning-veiviser-sanity${DOMENE_PA_INNSIDEN}/okonomi-og-gjeld/studio/;
154178
proxy_ssl_server_name on;
155179
proxy_http_version 1.1;
156180
}
157181

158-
location /sosialhjelp/ {
159-
proxy_set_header Host sosialhjelp-veiviser${DOMENE};
160-
proxy_pass https://sosialhjelp-veiviser${DOMENE}/sosialhjelp/;
182+
location /okonomi-og-gjeld {
183+
proxy_set_header Host okonomi-gjeldsradgivning-veiviser${DOMENE_PA_INNSIDEN};
184+
proxy_pass https://okonomi-gjeldsradgivning-veiviser${DOMENE_PA_INNSIDEN}/okonomi-og-gjeld;
161185
proxy_ssl_server_name on;
162186
proxy_http_version 1.1;
163187
}

‎nais.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,7 @@ spec:
6464
env:
6565
- name: PORT
6666
value: "8080"
67-
- name: DOMENE
68-
value: {{domene}}
67+
- name: DOMENE_PA_UTSIDEN
68+
value: {{domene_pa_utsiden}}
69+
- name: DOMENE_PA_INNSIDEN
70+
value: {{domene_pa_innsiden}}

‎nais/dev-gcp-mock.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"applicationName": "sosialhjelp-proxy-mock",
3+
"namespace": "teamdigisos",
4+
"domene_pa_innsiden": "-mock.dev.nav.no",
5+
"domene_pa_utsiden": ".ekstern.dev.nav.no",
6+
"ingresses": [
7+
"https://digisos.ekstern.dev.nav.no"
8+
]
9+
}

‎nais/dev-gcp.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"applicationName": "digisos",
33
"namespace": "teamdigisos",
4-
"domene": "-gcp.dev.nav.no",
4+
"domene_pa_innsiden": "-gcp.dev.nav.no",
5+
"domene_pa_utsiden": "-gcp.dev.nav.no",
56
"ingresses": [
6-
"https://digisos-gcp.dev.nav.no/sosialhjelp"
7+
"https://digisos-gcp.dev.nav.no"
78
]
89
}

‎nais/labs-gcp.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"applicationName": "digisos",
33
"namespace": "teamdigisos",
4-
"domene": ".labs.nais.io",
4+
"domene_pa_innsiden": ".labs.nais.io",
5+
"domene_pa_utsiden": ".labs.nais.io",
56
"ingresses": [
67
"https://digisos.labs.nais.io/sosialhjelp"
78
]

0 commit comments

Comments
 (0)