Skip to content

Commit 87f645a

Browse files
stigusstigus
committed
Merge branch 'refs/heads/master' into feature/inntektstub-fjerne-miljoe-orgnummer
2 parents 72a0b11 + 154af00 commit 87f645a

File tree

86 files changed

+353
-451
lines changed

Some content is hidden

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

86 files changed

+353
-451
lines changed

‎.github/workflows/app.testnorge-statisk-data-forvalter.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
name: testnorge-statisk-data-forvalter
22

33
on:
4-
push:
5-
paths:
6-
- "plugins/**"
7-
- "libs/avro-schema/**"
8-
- "libs/commands/**"
9-
- "libs/csv-converter/**"
10-
- "libs/data-transfer-objects/**"
11-
- "libs/database/**"
12-
- "libs/kafka-config/**"
13-
- "libs/kafka-producers/**"
14-
- "libs/security-core/**"
15-
- "libs/servlet-core/**"
16-
- "libs/servlet-security/**"
17-
- "libs/testing/**"
18-
- "apps/testnorge-statisk-data-forvalter/**"
19-
- ".github/workflows/app.testnorge-statisk-data-forvalter.yml"
4+
workflow_dispatch:
205

216
jobs:
227
workflow:

‎.nais/redis-dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ spec:
4747
max: 1
4848
resources:
4949
limits:
50-
cpu: 100m
5150
memory: 128Mi
5251
requests:
5352
cpu: 20m

‎.nais/redis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ spec:
4747
max: 1
4848
resources:
4949
limits:
50-
cpu: 100m
5150
memory: 128Mi
5251
requests:
5352
cpu: 20m

‎apps/adresse-service/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ spec:
4242
cpu: 50m
4343
memory: 800Mi
4444
limits:
45-
cpu: 200m
4645
memory: 2048Mi
4746
accessPolicy:
4847
inbound:

‎apps/altinn3-tilgang-service/config.dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ spec:
6565
cpu: 20m
6666
memory: 800Mi
6767
limits:
68-
cpu: 200m
6968
memory: 2048Mi
7069
env:
7170
- name: SPRING_PROFILES_ACTIVE

‎apps/altinn3-tilgang-service/config.prod.yml

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ spec:
6969
cpu: 20m
7070
memory: 900Mi
7171
limits:
72-
cpu: 200m
7372
memory: 2048Mi
7473
env:
7574
- name: SPRING_PROFILES_ACTIVE

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ spec:
3131
- name: testnav-app-tilgang-analyse-service-db
3232
liveness:
3333
path: /internal/health/liveness
34-
initialDelay: 4
35-
periodSeconds: 5
36-
failureThreshold: 10
34+
initialDelay: 20
35+
periodSeconds: 10
36+
failureThreshold: 20
3737
observability:
3838
logging:
3939
destinations:
@@ -43,9 +43,9 @@ spec:
4343
runtime: java
4444
readiness:
4545
path: /internal/health/readiness
46-
initialDelay: 4
47-
periodSeconds: 5
48-
failureThreshold: 10
46+
initialDelay: 20
47+
periodSeconds: 10
48+
failureThreshold: 20
4949
prometheus:
5050
enabled: true
5151
path: /internal/metrics
@@ -57,7 +57,6 @@ spec:
5757
cpu: 20m
5858
memory: 800Mi
5959
limits:
60-
cpu: 100m
6160
memory: 2048Mi
6261
envFrom:
6362
- secret: google-sql-testnav-app-tilgang-analyse-service

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

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ spec:
5252
cpu: 20m
5353
memory: 600Mi
5454
limits:
55-
cpu: 200m
5655
memory: 2048Mi
5756
ingresses:
5857
- "https://testnav-batch-bestilling-service.intern.dev.nav.no"

‎apps/brreg-stub/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ spec:
3232
enabled: true
3333
resources:
3434
limits:
35-
cpu: 200m
3635
memory: 2048Mi
3736
requests:
3837
cpu: 50m

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

+6-7
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ spec:
3030
- application: testnav-altinn3-tilgang-service
3131
liveness:
3232
path: /internal/health/liveness
33-
initialDelay: 4
34-
periodSeconds: 5
35-
failureThreshold: 10
33+
initialDelay: 20
34+
periodSeconds: 10
35+
failureThreshold: 20
3636
observability:
3737
logging:
3838
destinations:
@@ -42,9 +42,9 @@ spec:
4242
runtime: java
4343
readiness:
4444
path: /internal/health/readiness
45-
initialDelay: 4
46-
periodSeconds: 5
47-
failureThreshold: 10
45+
initialDelay: 20
46+
periodSeconds: 10
47+
failureThreshold: 20
4848
prometheus:
4949
enabled: true
5050
path: /internal/metrics
@@ -64,7 +64,6 @@ spec:
6464
cpu: 20m
6565
memory: 800Mi
6666
limits:
67-
cpu: 200m
6867
memory: 2048Mi
6968
env:
7069
- name: SPRING_PROFILES_ACTIVE

‎apps/bruker-service/config.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ spec:
2929
- application: testnav-altinn3-tilgang-proxy
3030
liveness:
3131
path: /internal/health/liveness
32-
initialDelay: 4
33-
periodSeconds: 5
34-
failureThreshold: 10
32+
initialDelay: 20
33+
periodSeconds: 10
34+
failureThreshold: 20
3535
observability:
3636
logging:
3737
destinations:
@@ -41,9 +41,9 @@ spec:
4141
runtime: java
4242
readiness:
4343
path: /internal/health/readiness
44-
initialDelay: 4
45-
periodSeconds: 5
46-
failureThreshold: 10
44+
initialDelay: 20
45+
periodSeconds: 10
46+
failureThreshold: 20
4747
prometheus:
4848
enabled: true
4949
path: /internal/metrics
@@ -63,7 +63,6 @@ spec:
6363
cpu: 20m
6464
memory: 900Mi
6565
limits:
66-
cpu: 200m
6766
memory: 2048Mi
6867
env:
6968
- name: SPRING_PROFILES_ACTIVE

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

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ spec:
112112
cpu: 100m
113113
memory: 1024Mi
114114
limits:
115-
CPU: 1000m
116115
memory: 2048Mi
117116
gcp:
118117
sqlInstances:

‎apps/dolly-backend/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ spec:
112112
cpu: 250m
113113
memory: 3072Mi
114114
limits:
115-
CPU: 1000m
116115
memory: 8192Mi
117116
gcp:
118117
sqlInstances:

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

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ spec:
9696
cpu: 100m
9797
memory: 1024Mi
9898
limits:
99-
cpu: 500m
10099
memory: 2048Mi
101100
image: "{{image}}"
102101
envFrom:

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

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ spec:
107107
cpu: 100m
108108
memory: 1024Mi
109109
limits:
110-
cpu: 800m
111110
memory: 2048Mi
112111
image: "{{image}}"
113112
env:

‎apps/dolly-frontend/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ spec:
104104
cpu: 200m
105105
memory: 1024Mi
106106
limits:
107-
cpu: 1000m
108107
memory: 3072Mi
109108
image: "{{image}}"
110109
envFrom:

‎apps/dolly-search-service/config.test.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ spec:
3535
- host: testnav-pdl-proxy.dev-fss-pub.nais.io
3636
liveness:
3737
path: /internal/isAlive
38-
initialDelay: 4
39-
periodSeconds: 5
40-
failureThreshold: 10
38+
initialDelay: 20
39+
periodSeconds: 10
40+
failureThreshold: 20
4141
observability:
4242
logging:
4343
destinations:
@@ -47,9 +47,9 @@ spec:
4747
runtime: java
4848
readiness:
4949
path: /internal/isReady
50-
initialDelay: 4
51-
periodSeconds: 5
52-
failureThreshold: 10
50+
initialDelay: 20
51+
periodSeconds: 10
52+
failureThreshold: 20
5353
prometheus:
5454
enabled: true
5555
path: /internal/metrics
@@ -61,7 +61,6 @@ spec:
6161
cpu: 50m
6262
memory: 800Mi
6363
limits:
64-
cpu: 500m
6564
memory: 2048Mi
6665
env:
6766
- name: SPRING_PROFILES_ACTIVE

‎apps/dolly-search-service/config.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ spec:
3636
- host: testnav-pdl-proxy.dev-fss-pub.nais.io
3737
liveness:
3838
path: /internal/isAlive
39-
initialDelay: 4
40-
periodSeconds: 5
41-
failureThreshold: 10
39+
initialDelay: 20
40+
periodSeconds: 10
41+
failureThreshold: 20
4242
observability:
4343
logging:
4444
destinations:
@@ -48,9 +48,9 @@ spec:
4848
runtime: java
4949
readiness:
5050
path: /internal/isReady
51-
initialDelay: 4
52-
periodSeconds: 5
53-
failureThreshold: 10
51+
initialDelay: 20
52+
periodSeconds: 10
53+
failureThreshold: 20
5454
prometheus:
5555
enabled: true
5656
path: /internal/metrics
@@ -62,7 +62,6 @@ spec:
6262
cpu: 50m
6363
memory: 1024Mi
6464
limits:
65-
cpu: 500m
6665
memory: 2048Mi
6766
env:
6867
- name: SPRING_PROFILES_ACTIVE

‎apps/dollystatus/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ spec:
1616
- application: testnav-budpro-service
1717
liveness:
1818
path: /internal/health/liveness
19-
initialDelay: 4
20-
periodSeconds: 5
21-
failureThreshold: 10
19+
initialDelay: 20
20+
periodSeconds: 10
21+
failureThreshold: 20
2222
observability:
2323
logging:
2424
destinations:
@@ -28,9 +28,9 @@ spec:
2828
runtime: java
2929
readiness:
3030
path: /internal/health/readiness
31-
initialDelay: 4
32-
periodSeconds: 5
33-
failureThreshold: 10
31+
initialDelay: 20
32+
periodSeconds: 10
33+
failureThreshold: 20
3434
prometheus:
3535
enabled: true
3636
path: /internal/metrics

‎apps/endringsmelding-frontend/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ spec:
4848
cpu: 50m
4949
memory: 600Mi
5050
limits:
51-
cpu: 400m
5251
memory: 2048Mi
5352
image: "{{image}}"
5453
ingresses:

‎apps/endringsmelding-service/config.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ spec:
3333
- application: testnav-adresse-service
3434
liveness:
3535
path: /internal/health/liveness
36-
initialDelay: 4
37-
periodSeconds: 5
38-
failureThreshold: 10
36+
initialDelay: 20
37+
periodSeconds: 10
38+
failureThreshold: 20
3939
observability:
4040
logging:
4141
destinations:
@@ -45,9 +45,9 @@ spec:
4545
runtime: java
4646
readiness:
4747
path: /internal/health/readiness
48-
initialDelay: 4
49-
periodSeconds: 5
50-
failureThreshold: 10
48+
initialDelay: 20
49+
periodSeconds: 10
50+
failureThreshold: 20
5151
prometheus:
5252
enabled: true
5353
path: /internal/metrics
@@ -59,7 +59,6 @@ spec:
5959
cpu: 50m
6060
memory: 800Mi
6161
limits:
62-
cpu: 400m
6362
memory: 2048Mi
6463
ingresses:
6564
- "https://testnav-endringsmelding-service.intern.dev.nav.no"

‎apps/faste-data-frontend/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ spec:
5252
cpu: 50m
5353
memory: 600Mi
5454
limits:
55-
cpu: 500m
5655
memory: 2048Mi
5756
image: "{{image}}"
5857
ingresses:

0 commit comments

Comments
 (0)