Skip to content

Commit 415c039

Browse files
krharumkrharum
authored
Merge branch 'master' into feature/opprett-mal-fra-person
2 parents ba8aec7 + a5e9048 commit 415c039

File tree

122 files changed

+2463
-656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+2463
-656
lines changed

‎apps/adresse-service/config.yml

+8-19
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,20 @@ spec:
3939
accessPolicy:
4040
inbound:
4141
rules:
42-
- application: testnav-oversikt-frontend
43-
cluster: dev-gcp
42+
- application: dolly-frontend
43+
- application: dolly-frontend-dev
44+
- application: dolly-frontend-dev-unstable
45+
- application: dolly-idporten
4446
- application: team-dolly-lokal-app
45-
cluster: dev-gcp
47+
- application: testnav-endringsmelding-service
4648
- application: testnav-organisasjon-forvalter
47-
cluster: dev-gcp
49+
- application: testnav-oversikt-frontend
4850
- application: testnav-pdl-forvalter
49-
cluster: dev-gcp
5051
- application: testnav-pdl-forvalter-dev
51-
cluster: dev-gcp
52-
- application: tps-forvalteren-dev
53-
cluster: dev-fss
5452
- application: tps-forvalteren
5553
cluster: dev-fss
56-
- application: dolly-frontend-dev
57-
cluster: dev-gcp
58-
- application: dolly-frontend
59-
cluster: dev-gcp
60-
- application: dolly-idporten
61-
cluster: dev-gcp
62-
- application: app-1
63-
namespace: plattformsikkerhet
64-
cluster: dev-gcp
65-
- application: testnav-endringsmelding-service
66-
cluster: dev-gcp
54+
- application: tps-forvalteren-dev
55+
cluster: dev-fss
6756
outbound:
6857
external:
6958
- host: testnav-pdl-proxy.dev-fss-pub.nais.io

‎apps/amelding-service/config.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,13 @@ spec:
1111
accessPolicy:
1212
inbound:
1313
rules:
14-
- application: team-dolly-lokal-app
15-
cluster: dev-gcp
16-
- application: testnav-oversikt-frontend
17-
cluster: dev-gcp
18-
- application: dolly-backend-dev
19-
cluster: dev-gcp
2014
- application: dolly-backend
21-
cluster: dev-gcp
22-
- application: dolly-frontend-dev
23-
cluster: dev-gcp
15+
- application: dolly-backend-dev
2416
- application: dolly-frontend
25-
cluster: dev-gcp
17+
- application: dolly-frontend-dev
2618
- application: dolly-idporten
27-
cluster: dev-gcp
28-
- application: app-1
29-
namespace: plattformsikkerhet
30-
cluster: dev-gcp
19+
- application: team-dolly-lokal-app
20+
- application: testnav-oversikt-frontend
3121
outbound:
3222
rules:
3323
- application: testnav-oppsummeringsdokument-service

‎apps/app-tilgang-analyse-service/config.yml

-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ spec:
1919
inbound:
2020
rules:
2121
- application: team-dolly-lokal-app
22-
cluster: dev-gcp
2322
- application: testnav-oversikt-frontend
24-
cluster: dev-gcp
25-
- application: app-1
26-
cluster: dev-gcp
27-
namespace: plattformsikkerhet
2823
outbound:
2924
external:
3025
- host: api.github.com

‎apps/batch-bestilling-service/config.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ spec:
1515
inbound:
1616
rules:
1717
- application: team-dolly-lokal-app
18-
cluster: dev-gcp
1918
- application: testnav-oversikt-frontend
20-
cluster: dev-gcp
2119
outbound:
2220
rules:
2321
- application: dolly-backend
22+
- application: dolly-backend-dev
2423
azure:
2524
application:
2625
allowAllUsers: true

‎apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.springframework.context.annotation.Configuration;
44
import org.springframework.context.annotation.Profile;
5+
import org.springframework.lang.NonNull;
56
import org.springframework.vault.annotation.VaultPropertySource;
67
import org.springframework.vault.authentication.ClientAuthentication;
78
import org.springframework.vault.authentication.TokenAuthentication;
@@ -13,17 +14,18 @@
1314
@Configuration
1415
@Profile("dev")
1516
@VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false)
16-
@VaultPropertySource(value = "secret/.common/tokenx/dev/app-1", ignoreSecretNotFound = false)
1717
public class DevConfig extends AbstractVaultConfiguration {
1818

19-
private static final String VAULT_TOKEN = "spring.cloud.vault.token";
19+
private static final String VAULT_TOKEN = "spring.cloud.vault.token";
2020

2121
@Override
22+
@NonNull
2223
public VaultEndpoint vaultEndpoint() {
2324
return VaultEndpoint.create("vault.adeo.no", 443);
2425
}
2526

2627
@Override
28+
@NonNull
2729
public ClientAuthentication clientAuthentication() {
2830
if (System.getenv().containsKey("VAULT_TOKEN")) {
2931
System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

‎apps/bruker-service/config.test.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,11 @@ spec:
2020
accessPolicy:
2121
inbound:
2222
rules:
23-
- application: team-dolly-lokal-app
24-
cluster: dev-gcp
25-
- application: testnav-oversikt-frontend
26-
cluster: dev-gcp
2723
- application: dolly-frontend-dev
28-
cluster: dev-gcp
29-
- application: dolly-idporten
30-
cluster: dev-gcp
3124
- application: dolly-frontend-dev-unstable
32-
cluster: dev-gcp
33-
- application: app-1
34-
namespace: plattformsikkerhet
35-
cluster: dev-gcp
25+
- application: dolly-idporten
26+
- application: team-dolly-lokal-app
27+
- application: testnav-oversikt-frontend
3628
outbound:
3729
rules:
3830
- application: testnav-person-organisasjon-tilgang-service-dev

‎apps/dolly-backend/config.test.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,16 @@ spec:
1616
accessPolicy:
1717
inbound:
1818
rules:
19-
- application: testnav-oversikt-frontend
20-
cluster: dev-gcp
2119
- application: dolly-frontend-dev
22-
cluster: dev-gcp
23-
- application: dolly-idporten
24-
cluster: dev-gcp
2520
- application: dolly-frontend-dev-unstable
26-
cluster: dev-gcp
27-
- application: testnav-batch-bestilling-service
28-
cluster: dev-gcp
21+
- application: dolly-idporten
2922
- application: team-dolly-lokal-app
30-
cluster: dev-gcp
31-
- application: app-1
32-
namespace: plattformsikkerhet
33-
cluster: dev-gcp
23+
- application: testnav-batch-bestilling-service
24+
- application: testnav-dollystatus
25+
- application: testnav-oversikt-frontend
3426
outbound:
3527
rules:
28+
- application: generer-navn-service
3629
- application: testnav-amelding-service
3730
- application: testnav-arbeidsforhold-service
3831
- application: testnav-arbeidsplassencv-proxy

‎apps/dolly-backend/config.yml

+4-15
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,18 @@ spec:
1616
inbound:
1717
rules:
1818
- application: dolly-frontend
19-
cluster: dev-gcp
2019
- application: dolly-idporten
21-
cluster: dev-gcp
20+
- application: testnav-batch-bestilling-service
2221
- application: testnav-dollystatus
23-
cluster: dev-gcp
22+
- application: testnav-helsepersonell-service
2423
- application: testnav-oversikt-frontend
25-
cluster: dev-gcp
26-
- application: testnav-batch-bestilling-service
27-
cluster: dev-gcp
2824
- application: etterlatte-testdata
29-
cluster: dev-gcp
3025
namespace: etterlatte
31-
- application: devtools
32-
cluster: dev-gcp
33-
namespace: aap
34-
- application: bot
35-
cluster: dev-gcp
36-
namespace: aap
37-
- application: testnav-helsepersonell-service
38-
cluster: dev-gcp
3926
- application: statuspoll
4027
namespace: navdig
4128
outbound:
4229
rules:
30+
- application: generer-navn-service
4331
- application: testnav-amelding-service
4432
- application: testnav-arbeidsforhold-service
4533
- application: testnav-arbeidsplassencv-proxy
@@ -50,6 +38,7 @@ spec:
5038
- application: testnav-organisasjon-service
5139
- application: testnav-pdl-forvalter
5240
- application: testnav-person-service
41+
- application: testnav-skattekort-service
5342
- application: testnav-sykemelding-api
5443
- application: testnav-synt-sykemelding-api
5544
- application: testnav-tps-messaging-service

‎apps/dolly-frontend/config.idporten.yml

+24-15
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,38 @@ spec:
2424
accessPolicy:
2525
outbound:
2626
rules:
27-
- application: testnorge-tilbakemelding-api
27+
- application: dolly-backend
28+
- application: dolly-backend-dev
29+
- application: dolly-redis-session
30+
- application: generer-navn-service
2831
- application: testnav-adresse-service
32+
- application: testnav-amelding-service
2933
- application: testnav-arbeidsplassencv-proxy
34+
- application: testnav-bruker-service
35+
- application: testnav-bruker-service-dev
36+
- application: testnav-generer-synt-amelding-service
37+
- application: testnav-helsepersonell-service
38+
- application: testnav-joark-dokument-service
39+
- application: testnav-kodeverk-service
3040
- application: testnav-miljoer-service
31-
- application: testnav-organisasjon-service
32-
- application: testnav-organisasjon-forvalter
3341
- application: testnav-oppsummeringsdokument-service
34-
- application: testnorge-profil-api
35-
- application: testnav-organisasjon-tilgang-service
36-
- application: testnav-joark-dokument-service
3742
- application: testnav-organisasjon-faste-data-service
38-
- application: testnav-tps-messaging-service
39-
- application: testnav-varslinger-service
40-
- application: dolly-redis-session
41-
- application: testnav-person-organisasjon-tilgang-service
43+
- application: testnav-organisasjon-forvalter
44+
- application: testnav-organisasjon-service
45+
- application: testnav-organisasjon-tilgang-service
4246
- application: testnav-pdl-forvalter
43-
- application: testnav-bruker-service
47+
- application: testnav-person-faste-data-service
48+
- application: testnav-person-organisasjon-tilgang-service
49+
- application: testnav-person-organisasjon-tilgang-service-dev
4450
- application: testnav-person-search-service
45-
- application: testnav-helsepersonell-service
46-
- application: dolly-backend
4751
- application: testnav-person-service
48-
- application: generer-navn-service
49-
- application: testnav-kodeverk-service
52+
- application: testnav-skattekort-service
53+
- application: testnav-sykemelding-api
54+
- application: testnav-tenor-search-service
55+
- application: testnav-tps-messaging-service
56+
- application: testnav-varslinger-service
57+
- application: testnorge-profil-api
58+
- application: testnorge-tilbakemelding-api
5059
external:
5160
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
5261
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io

‎apps/dolly-frontend/config.test.yml

+22-15
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
autoLoginIgnorePaths:
1919
- /login
2020
- /assets/*
21+
- /
2122
application:
2223
allowAllUsers: true
2324
enabled: true
@@ -29,29 +30,35 @@ spec:
2930
accessPolicy:
3031
outbound:
3132
rules:
33+
- application: dolly-backend-dev
34+
- application: dolly-dev-redis-session
35+
- application: generer-navn-service
3236
- application: testnav-adresse-service
37+
- application: testnav-amelding-service
3338
- application: testnav-arbeidsplassencv-proxy
39+
- application: testnav-bruker-service-dev
40+
- application: testnav-generer-synt-amelding-service
41+
- application: testnav-helsepersonell-service
42+
- application: testnav-joark-dokument-service
43+
- application: testnav-kodeverk-service
3444
- application: testnav-miljoer-service
35-
- application: testnav-organisasjon-service
36-
- application: testnav-organisasjon-forvalter
37-
- application: testnorge-profil-api-dev
38-
- application: testnav-organisasjon-tilgang-service
3945
- application: testnav-oppsummeringsdokument-service
40-
- application: testnav-joark-dokument-service
4146
- application: testnav-organisasjon-faste-data-service
42-
- application: testnav-tps-messaging-service
43-
- application: testnav-varslinger-service-dev
44-
- application: dolly-dev-redis-session
45-
- application: testnav-person-organisasjon-tilgang-service-dev
47+
- application: testnav-organisasjon-forvalter
48+
- application: testnav-organisasjon-service
49+
- application: testnav-organisasjon-tilgang-service
4650
- application: testnav-pdl-forvalter-dev
47-
- application: testnav-bruker-service-dev
51+
- application: testnav-person-faste-data-service
52+
- application: testnav-person-organisasjon-tilgang-service-dev
4853
- application: testnav-person-search-service
49-
- application: testnav-helsepersonell-service
50-
- application: testnorge-tilbakemelding-api
51-
- application: dolly-backend-dev
5254
- application: testnav-person-service
53-
- application: generer-navn-service
54-
- application: testnav-kodeverk-service
55+
- application: testnav-sykemelding-api
56+
- application: testnav-tenor-search-service
57+
- application: testnav-tps-messaging-service
58+
- application: testnav-varslinger-service
59+
- application: testnav-varslinger-service-dev
60+
- application: testnorge-profil-api-dev
61+
- application: testnorge-tilbakemelding-api
5562
external:
5663
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
5764
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io

‎apps/dolly-frontend/config.unstable.yml

+18-16
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
autoLoginIgnorePaths:
1919
- /login
2020
- /assets/*
21+
- /
2122
application:
2223
allowAllUsers: true
2324
enabled: true
@@ -29,29 +30,30 @@ spec:
2930
accessPolicy:
3031
outbound:
3132
rules:
32-
- application: testnav-arbeidsplassencv-proxy
33-
- application: generer-navn-service
34-
- application: testnav-person-service
3533
- application: dolly-backend-dev
36-
- application: testnav-helsepersonell-service
37-
- application: testnav-person-search-service
38-
- application: testnav-bruker-service-dev
39-
- application: testnav-pdl-forvalter-dev
40-
- application: testnav-person-organisasjon-tilgang-service-dev
4134
- application: dolly-dev-redis-session
42-
- application: testnav-varslinger-service-dev
43-
- application: testnav-tps-messaging-service
44-
- application: testnav-organisasjon-faste-data-service
35+
- application: generer-navn-service
36+
- application: testnav-adresse-service
37+
- application: testnav-arbeidsplassencv-proxy
38+
- application: testnav-bruker-service-dev
39+
- application: testnav-helsepersonell-service
4540
- application: testnav-joark-dokument-service
41+
- application: testnav-kodeverk-service
42+
- application: testnav-miljoer-service
4643
- application: testnav-oppsummeringsdokument-service
47-
- application: testnav-organisasjon-tilgang-service
48-
- application: testnorge-profil-api-dev
44+
- application: testnav-organisasjon-faste-data-service
4945
- application: testnav-organisasjon-forvalter
5046
- application: testnav-organisasjon-service
51-
- application: testnav-miljoer-service
52-
- application: testnav-adresse-service
47+
- application: testnav-organisasjon-tilgang-service
48+
- application: testnav-pdl-forvalter-dev
49+
- application: testnav-person-organisasjon-tilgang-service-dev
50+
- application: testnav-person-search-service
51+
- application: testnav-person-service
52+
- application: testnav-tenor-search-service
53+
- application: testnav-tps-messaging-service
54+
- application: testnav-varslinger-service-dev
55+
- application: testnorge-profil-api-dev
5356
- application: testnorge-tilbakemelding-api
54-
- application: testnav-kodeverk-service
5557
external:
5658
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
5759
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io

0 commit comments

Comments
 (0)