Skip to content

Commit 5959ef7

Browse files
dragutin-navdragutin-nav
committed
Rebase on dev
1 parent a003629 commit 5959ef7

File tree

5 files changed

+52
-111
lines changed

5 files changed

+52
-111
lines changed

‎.nais/application/application-config-dev.yaml

Lines changed: 23 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,34 @@ apiVersion: "nais.io/v1alpha1"
33
kind: "Application"
44
metadata:
55
name: veilarbportefolje
6-
namespace: obo
6+
namespace: pto
77
labels:
8-
team: obo
8+
team: pto
99
spec:
1010
image: {{image}}
1111
replicas:
12-
min: 1
12+
min: 2
1313
max: 3
1414
cpuThresholdPercentage: 50
1515
port: 8080
1616
ingresses:
17-
- https://veilarbportefolje.intern.dev.nav.no
17+
- https://veilarbportefolje.dev.intern.nav.no
18+
- https://veilarbportefolje.dev-fss-pub.nais.io
1819
webproxy: true
1920
leaderElection: true
2021
secureLogs:
2122
enabled: true
2223
kafka:
2324
pool: nav-dev
25+
vault:
26+
enabled: true
27+
paths:
28+
- kvPath: /serviceuser/data/dev/srvveilarbportefolje
29+
mountPath: /var/run/secrets/nais.io/service_user
30+
- kvPath: /kv/preprod/fss/veilarbportefolje/q1
31+
mountPath: /var/run/secrets/nais.io/vault
2432
envFrom:
33+
- configmap: pto-config
2534
- secret: veilarbportefolje-unleash-api-token
2635
liveness:
2736
path: veilarbportefolje/internal/isAlive
@@ -37,13 +46,6 @@ spec:
3746
openSearch:
3847
access: admin
3948
instance: veilarbportefolje
40-
gcp:
41-
sqlInstances:
42-
- type: POSTGRES_15
43-
tier: db-f1-micro
44-
databases:
45-
- name: veilarbportefolje
46-
envVarPrefix: DB
4749
azure:
4850
application:
4951
allowAllUsers: true
@@ -68,30 +70,8 @@ spec:
6870
namespace: aura
6971
cluster: dev-gcp
7072
outbound:
71-
rules:
72-
- application: kodeverk-api
73-
namespace: team-rocket
74-
- application: pdl-api
75-
namespace: pdl
76-
cluster: dev-fss
77-
- application: veilarbvedtaksstotte
78-
namespace: pto
79-
cluster: dev-fss
80-
- application: veilarbarena
81-
namespace: pto
82-
cluster: dev-fss
83-
- application: veilarbveileder
84-
namespace: pto
85-
cluster: dev-fss
86-
- application: poao-tilgang
87-
namespace: poao
8873
external:
8974
- host: team-obo-unleash-api.nav.cloud.nais.io
90-
- host: pdl-api.dev-fss-pub.nais.io
91-
- host: veilarboppfolging.dev-fss-pub.nais.io
92-
- host: veilarbvedtaksstotte.dev-fss-pub.nais.io
93-
- host: veilarbveileder.dev-fss-pub.nais.io
94-
- host: veilarbarena.dev-fss-pub.nais.io
9575
resources:
9676
limits:
9777
cpu: "4"
@@ -103,34 +83,34 @@ spec:
10383
- name: JAVA_OPTS
10484
value: "-Xms4098m -Xmx8096m --illegal-access=permit --add-opens=java.base/java.lang=ALL-UNNAMED"
10585
- name: VEILARBOPPFOLGING_URL
106-
value: "https://veilarboppfolging.dev-fss-pub.nais.io/veilarboppfolging"
86+
value: "http://veilarboppfolging.pto.svc.nais.local/veilarboppfolging"
10787
- name: VEILARBOPPFOLGING_TOKEN_SCOPE
10888
value: "api://dev-fss.pto.veilarboppfolging/.default"
10989
- name: VEILARBVEDTAKSSTOTTE_URL
110-
value: "https://veilarbvedtaksstotte.dev-fss-pub.nais.io/veilarbvedtaksstotte"
90+
value: "http://veilarbvedtaksstotte.pto.svc.nais.local/veilarbvedtaksstotte"
11191
- name: VEILARBVEDTAKSSTOTTE_TOKEN_SCOPE
11292
value: "api://dev-fss.pto.veilarbvedtaksstotte/.default"
11393
- name: VEILARBVEILEDER_URL
114-
value: "https://veilarbveileder.dev-fss-pub.nais.io/veilarbveileder"
94+
value: "http://veilarbveileder.pto.svc.nais.local/veilarbveileder"
11595
- name: VEILARBVEILEDER_TOKEN_SCOPE
11696
value: "api://dev-fss.pto.veilarbveileder/.default"
11797
- name: VEILARBARENA_URL
118-
value: "https://veilarbarena.dev-fss-pub.nais.io/veilarbarena"
98+
value: "http://veilarbarena.pto.svc.nais.local/veilarbarena"
11999
- name: VEILARBARENA_TOKEN_SCOPE
120100
value: "api://dev-fss.pto.veilarbarena/.default"
121101
- name: PDL_URL
122-
value: "https://pdl-api.dev-fss-pub.nais.io"
102+
value: "http://pdl-api.pdl.svc.nais.local"
123103
- name: PDL_TOKEN_SCOPE
124104
value: "api://dev-fss.pdl.pdl-api/.default"
125105
- name: POAO_TILGANG_URL
126-
value: "http://poao-tilgang.poao"
106+
value: "http://poao-tilgang.poao.svc.nais.local"
127107
- name: POAO_TILGANG_TOKEN_SCOPE
128-
value: "api://dev-gcp.poao.poao-tilgang/.default"
108+
value: "api://dev-fss.poao.poao-tilgang/.default"
129109
- name: KODEVERK_URL
130-
value: "https://kodeverk-api.intern.dev.nav.no"
110+
value: "https://kodeverk-api.nav.no"
131111
- name: KODEVERK_SCOPE
132112
value: "api://dev-gcp.team-rocket.kodeverk-api/.default"
133113
- name: OPPSLAG_ARBEIDSSOEKERREGISTERET_URL
134-
value: "http://paw-arbeidssoekerregisteret-api-oppslag.paw"
114+
value: "https://oppslag-arbeidssoekerregisteret.intern.dev.nav.no"
135115
- name: OPPSLAG_ARBEIDSSOEKERREGISTERET_SCOPE
136-
value: "api://dev-gcp.paw.paw-arbeidssoekerregisteret-api-oppslag/.default"
116+
value: "api://dev-gcp.paw.paw-arbeidssoekerregisteret-api-oppslag/.default"

‎.nais/application/application-config-prod.yaml

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apiVersion: "nais.io/v1alpha1"
33
kind: "Application"
44
metadata:
55
name: veilarbportefolje
6-
namespace: obo
6+
namespace: pto
77
labels:
8-
team: obo
8+
team: pto
99
spec:
1010
image: {{image}}
1111
replicas:
@@ -15,13 +15,24 @@ spec:
1515
port: 8080
1616
ingresses:
1717
- https://veilarbportefolje.intern.nav.no
18+
- https://veilarbportefolje.prod-fss-pub.nais.io
19+
- https://veilarbportefolje.nais.adeo.no
20+
- https://app.adeo.no/veilarbportefolje
1821
webproxy: true
1922
leaderElection: true
2023
secureLogs:
2124
enabled: true
2225
kafka:
2326
pool: nav-prod
27+
vault:
28+
enabled: true
29+
paths:
30+
- kvPath: /serviceuser/data/prod/srvveilarbportefolje
31+
mountPath: /var/run/secrets/nais.io/service_user
32+
- kvPath: /kv/prod/fss/veilarbportefolje/default
33+
mountPath: /var/run/secrets/nais.io/vault
2434
envFrom:
35+
- configmap: pto-config
2536
- secret: veilarbportefolje-unleash-api-token
2637
liveness:
2738
path: veilarbportefolje/internal/isAlive
@@ -37,13 +48,6 @@ spec:
3748
openSearch:
3849
access: admin
3950
instance: veilarbportefolje
40-
gcp:
41-
sqlInstances:
42-
- type: POSTGRES_15
43-
tier: db-custom-1-4096
44-
databases:
45-
- name: veilarbportefolje
46-
envVarPrefix: DB
4751
azure:
4852
application:
4953
allowAllUsers: true
@@ -57,36 +61,16 @@ spec:
5761
rules:
5862
- application: veilarbportefoljeflatefs
5963
namespace: obo
64+
cluster: prod-gcp
6065
- application: veilarbpersonflate
6166
namespace: poao
67+
cluster: prod-gcp
6268
- application: pto-admin
6369
namespace: pto
6470
cluster: prod-fss
6571
outbound:
66-
rules:
67-
- application: kodeverk-api
68-
namespace: team-rocket
69-
- application: pdl-api
70-
namespace: pdl
71-
cluster: dev-fss
72-
- application: veilarbvedtaksstotte
73-
namespace: pto
74-
cluster: dev-fss
75-
- application: veilarbarena
76-
namespace: pto
77-
cluster: dev-fss
78-
- application: veilarbveileder
79-
namespace: pto
80-
cluster: dev-fss
81-
- application: poao-tilgang
82-
namespace: poao
8372
external:
8473
- host: team-obo-unleash-api.nav.cloud.nais.io
85-
- host: pdl-api.dev-fss-pub.nais.io
86-
- host: veilarboppfolging.dev-fss-pub.nais.io
87-
- host: veilarbvedtaksstotte.dev-fss-pub.nais.io
88-
- host: veilarbveileder.dev-fss-pub.nais.io
89-
- host: veilarbarena.dev-fss-pub.nais.io
9074
resources:
9175
limits:
9276
cpu: "4"
@@ -98,34 +82,34 @@ spec:
9882
- name: JAVA_OPTS
9983
value: "-Xms4096m -Xmx10144m --illegal-access=permit --add-opens=java.base/java.lang=ALL-UNNAMED"
10084
- name: VEILARBOPPFOLGING_URL
101-
value: "https://veilarboppfolging.prod-fss-pub.nais.io/veilarboppfolging"
85+
value: "http://veilarboppfolging.pto.svc.nais.local/veilarboppfolging"
10286
- name: VEILARBOPPFOLGING_TOKEN_SCOPE
10387
value: "api://prod-fss.pto.veilarboppfolging/.default"
10488
- name: VEILARBVEDTAKSSTOTTE_URL
105-
value: "https://veilarbvedtaksstotte.prod-fss-pub.nais.io/veilarbvedtaksstotte"
89+
value: "http://veilarbvedtaksstotte.pto.svc.nais.local/veilarbvedtaksstotte"
10690
- name: VEILARBVEDTAKSSTOTTE_TOKEN_SCOPE
10791
value: "api://prod-fss.pto.veilarbvedtaksstotte/.default"
10892
- name: VEILARBVEILEDER_URL
109-
value: "https://veilarbveileder.prod-fss-pub.nais.io/veilarbveileder"
93+
value: "http://veilarbveileder.pto.svc.nais.local/veilarbveileder"
11094
- name: VEILARBVEILEDER_TOKEN_SCOPE
11195
value: "api://prod-fss.pto.veilarbveileder/.default"
11296
- name: VEILARBARENA_URL
113-
value: "https://veilarbarena.prod-fss-pub.nais.io/veilarbarena"
97+
value: "http://veilarbarena.pto.svc.nais.local/veilarbarena"
11498
- name: VEILARBARENA_TOKEN_SCOPE
11599
value: "api://prod-fss.pto.veilarbarena/.default"
116100
- name: PDL_URL
117-
value: "https://pdl-api.prod-fss-pub.nais.io"
101+
value: "http://pdl-api.pdl.svc.nais.local"
118102
- name: PDL_TOKEN_SCOPE
119103
value: "api://prod-fss.pdl.pdl-api/.default"
120104
- name: POAO_TILGANG_URL
121-
value: "http://poao-tilgang.poao"
105+
value: "http://poao-tilgang.poao.svc.nais.local"
122106
- name: POAO_TILGANG_TOKEN_SCOPE
123107
value: "api://prod-fss.poao.poao-tilgang/.default"
124108
- name: KODEVERK_URL
125-
value: "https://kodeverk-api.intern.nav.no"
109+
value: "https://kodeverk-api.nav.no"
126110
- name: KODEVERK_SCOPE
127111
value: "api://prod-gcp.team-rocket.kodeverk-api/.default"
128112
- name: OPPSLAG_ARBEIDSSOEKERREGISTERET_URL
129-
value: "http://paw-arbeidssoekerregisteret-api-oppslag.paw"
113+
value: "https://oppslag-arbeidssoekerregisteret.intern.nav.no"
130114
- name: OPPSLAG_ARBEIDSSOEKERREGISTERET_SCOPE
131115
value: "api://prod-gcp.paw.paw-arbeidssoekerregisteret-api-oppslag/.default"

‎.nais/application/opensearch-prod.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.nais/application/unleash-apitoken-dev.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ apiVersion: unleash.nais.io/v1
22
kind: ApiToken
33
metadata:
44
name: veilarbportefolje
5-
namespace: obo
5+
namespace: pto
6+
cluster: dev-fss
67
labels:
7-
team: obo
8+
team: pto
89
spec:
910
unleashInstance:
1011
apiVersion: unleash.nais.io/v1

‎.nais/application/unleash-apitoken-prod.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ apiVersion: unleash.nais.io/v1
22
kind: ApiToken
33
metadata:
44
name: veilarbportefolje
5-
namespace: obo
5+
namespace: pto
6+
cluster: prod-fss
67
labels:
7-
team: obo
8+
team: pto
89
spec:
910
unleashInstance:
1011
apiVersion: unleash.nais.io/v1

0 commit comments

Comments
 (0)