Skip to content

Commit dac3a1c

Browse files
stigusstigus
authored
Merge branch 'master' into feature/playwright-report-on-fail
2 parents 23f34f9 + 1e8c71b commit dac3a1c

File tree

85 files changed

+388
-305
lines changed

Some content is hidden

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

85 files changed

+388
-305
lines changed

‎.nais/redis-dev.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ spec:
4747
max: 1
4848
resources:
4949
limits:
50-
memory: 128Mi
51-
requests:
5250
cpu: 100m
5351
memory: 128Mi
52+
requests:
53+
cpu: 20m
54+
memory: 32Mi
5455
liveness:
5556
path: /health
5657
accessPolicy: # for GCP

‎.nais/redis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ spec:
4747
max: 1
4848
resources:
4949
limits:
50-
memory: 128Mi
51-
requests:
5250
cpu: 100m
5351
memory: 128Mi
52+
requests:
53+
cpu: 20m
54+
memory: 32Mi
5455
liveness:
5556
path: /health
5657
accessPolicy:

‎apps/adresse-service/config.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ spec:
3838
min: 1
3939
max: 1
4040
resources:
41-
limits:
42-
memory: 2048Mi
4341
requests:
42+
cpu: 50m
43+
memory: 800Mi
44+
limits:
4445
cpu: 200m
45-
memory: 1024Mi
46+
memory: 2048Mi
4647
accessPolicy:
4748
inbound:
4849
rules:

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
path: /internal/health/liveness
4242
initialDelay: 10
4343
periodSeconds: 5
44-
failureThreshold: 500
44+
failureThreshold: 10
4545
observability:
4646
logging:
4747
destinations:
@@ -53,7 +53,7 @@ spec:
5353
path: /internal/health/readiness
5454
initialDelay: 10
5555
periodSeconds: 5
56-
failureThreshold: 500
56+
failureThreshold: 10
5757
prometheus:
5858
enabled: true
5959
path: /internal/metrics
@@ -62,9 +62,10 @@ spec:
6262
max: 1
6363
resources:
6464
requests:
65-
cpu: 200m
66-
memory: 1024Mi
65+
cpu: 20m
66+
memory: 800Mi
6767
limits:
68+
cpu: 200m
6869
memory: 2048Mi
6970
env:
7071
- name: SPRING_PROFILES_ACTIVE

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
path: /internal/health/liveness
4646
initialDelay: 10
4747
periodSeconds: 5
48-
failureThreshold: 500
48+
failureThreshold: 10
4949
observability:
5050
logging:
5151
destinations:
@@ -57,7 +57,7 @@ spec:
5757
path: /internal/health/readiness
5858
initialDelay: 10
5959
periodSeconds: 5
60-
failureThreshold: 500
60+
failureThreshold: 10
6161
prometheus:
6262
enabled: true
6363
path: /internal/metrics
@@ -66,9 +66,10 @@ spec:
6666
max: 1
6767
resources:
6868
requests:
69-
cpu: 200m
70-
memory: 1024Mi
69+
cpu: 20m
70+
memory: 900Mi
7171
limits:
72+
cpu: 200m
7273
memory: 2048Mi
7374
env:
7475
- name: SPRING_PROFILES_ACTIVE

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
path: /internal/health/liveness
3434
initialDelay: 4
3535
periodSeconds: 5
36-
failureThreshold: 500
36+
failureThreshold: 10
3737
observability:
3838
logging:
3939
destinations:
@@ -45,7 +45,7 @@ spec:
4545
path: /internal/health/readiness
4646
initialDelay: 4
4747
periodSeconds: 5
48-
failureThreshold: 500
48+
failureThreshold: 10
4949
prometheus:
5050
enabled: true
5151
path: /internal/metrics
@@ -54,9 +54,10 @@ spec:
5454
max: 1
5555
resources:
5656
requests:
57-
cpu: 200m
58-
memory: 1024Mi
57+
cpu: 20m
58+
memory: 800Mi
5959
limits:
60+
cpu: 100m
6061
memory: 2048Mi
6162
envFrom:
6263
- secret: google-sql-testnav-app-tilgang-analyse-service

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
path: /internal/health/liveness
3030
initialDelay: 30
3131
periodSeconds: 30
32-
failureThreshold: 500
32+
failureThreshold: 10
3333
observability:
3434
logging:
3535
destinations:
@@ -40,7 +40,7 @@ spec:
4040
readiness:
4141
path: /internal/health/readiness
4242
initialDelay: 30
43-
failureThreshold: 500
43+
failureThreshold: 10
4444
prometheus:
4545
enabled: true
4646
path: /internal/metrics
@@ -49,9 +49,10 @@ spec:
4949
max: 1
5050
resources:
5151
requests:
52-
cpu: 200m
53-
memory: 1024Mi
52+
cpu: 20m
53+
memory: 600Mi
5454
limits:
55+
cpu: 200m
5556
memory: 2048Mi
5657
ingresses:
5758
- "https://testnav-batch-bestilling-service.intern.dev.nav.no"

‎apps/brreg-stub/config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ spec:
3232
enabled: true
3333
resources:
3434
limits:
35+
cpu: 200m
3536
memory: 2048Mi
3637
requests:
37-
cpu: 200m
38-
memory: 1024Mi
38+
cpu: 50m
39+
memory: 800Mi
3940
accessPolicy:
4041
inbound:
4142
rules:

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
path: /internal/health/liveness
3333
initialDelay: 4
3434
periodSeconds: 5
35-
failureThreshold: 500
35+
failureThreshold: 10
3636
observability:
3737
logging:
3838
destinations:
@@ -44,7 +44,7 @@ spec:
4444
path: /internal/health/readiness
4545
initialDelay: 4
4646
periodSeconds: 5
47-
failureThreshold: 500
47+
failureThreshold: 10
4848
prometheus:
4949
enabled: true
5050
path: /internal/metrics
@@ -61,9 +61,10 @@ spec:
6161
- name: testnav-bruker-service-dev-db
6262
resources:
6363
requests:
64-
cpu: 200m
65-
memory: 1024Mi
64+
cpu: 20m
65+
memory: 800Mi
6666
limits:
67+
cpu: 200m
6768
memory: 2048Mi
6869
env:
6970
- name: SPRING_PROFILES_ACTIVE

‎apps/bruker-service/config.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
path: /internal/health/liveness
3232
initialDelay: 4
3333
periodSeconds: 5
34-
failureThreshold: 500
34+
failureThreshold: 10
3535
observability:
3636
logging:
3737
destinations:
@@ -43,7 +43,7 @@ spec:
4343
path: /internal/health/readiness
4444
initialDelay: 4
4545
periodSeconds: 5
46-
failureThreshold: 500
46+
failureThreshold: 10
4747
prometheus:
4848
enabled: true
4949
path: /internal/metrics
@@ -60,9 +60,10 @@ spec:
6060
max: 1
6161
resources:
6262
requests:
63-
cpu: 200m
64-
memory: 1024Mi
63+
cpu: 20m
64+
memory: 900Mi
6565
limits:
66+
cpu: 200m
6667
memory: 2048Mi
6768
env:
6869
- name: SPRING_PROFILES_ACTIVE

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@ spec:
109109
path: /internal/metrics
110110
resources:
111111
requests:
112-
cpu: 200m
112+
cpu: 100m
113113
memory: 1024Mi
114114
limits:
115+
CPU: 1000m
115116
memory: 2048Mi
116117
gcp:
117118
sqlInstances:

‎apps/dolly-backend/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ spec:
110110
resources:
111111
requests:
112112
cpu: 250m
113-
memory: 4096Mi
113+
memory: 3072Mi
114114
limits:
115+
CPU: 1000m
115116
memory: 8192Mi
116117
gcp:
117118
sqlInstances:

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ spec:
9393
path: /internal/metrics
9494
resources:
9595
requests:
96-
cpu: 250m
96+
cpu: 100m
9797
memory: 1024Mi
9898
limits:
99+
cpu: 500m
99100
memory: 2048Mi
100101
image: "{{image}}"
101102
envFrom:

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,10 @@ spec:
104104
path: /internal/metrics
105105
resources:
106106
requests:
107-
cpu: 500m
107+
cpu: 100m
108108
memory: 1024Mi
109109
limits:
110+
cpu: 800m
110111
memory: 2048Mi
111112
image: "{{image}}"
112113
env:

‎apps/dolly-frontend/config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,11 @@ spec:
101101
path: /internal/metrics
102102
resources:
103103
requests:
104-
cpu: 500m
104+
cpu: 200m
105105
memory: 1024Mi
106106
limits:
107-
memory: 2048Mi
107+
cpu: 1000m
108+
memory: 3072Mi
108109
image: "{{image}}"
109110
envFrom:
110111
- secret: idporten-dolly-prod

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
path: /internal/isAlive
3838
initialDelay: 4
3939
periodSeconds: 5
40-
failureThreshold: 500
40+
failureThreshold: 10
4141
observability:
4242
logging:
4343
destinations:
@@ -49,7 +49,7 @@ spec:
4949
path: /internal/isReady
5050
initialDelay: 4
5151
periodSeconds: 5
52-
failureThreshold: 500
52+
failureThreshold: 10
5353
prometheus:
5454
enabled: true
5555
path: /internal/metrics
@@ -58,9 +58,10 @@ spec:
5858
max: 1
5959
resources:
6060
requests:
61-
cpu: 200m
62-
memory: 1024Mi
61+
cpu: 50m
62+
memory: 800Mi
6363
limits:
64+
cpu: 500m
6465
memory: 2048Mi
6566
env:
6667
- name: SPRING_PROFILES_ACTIVE

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
path: /internal/isAlive
3939
initialDelay: 4
4040
periodSeconds: 5
41-
failureThreshold: 500
41+
failureThreshold: 10
4242
observability:
4343
logging:
4444
destinations:
@@ -50,7 +50,7 @@ spec:
5050
path: /internal/isReady
5151
initialDelay: 4
5252
periodSeconds: 5
53-
failureThreshold: 500
53+
failureThreshold: 10
5454
prometheus:
5555
enabled: true
5656
path: /internal/metrics
@@ -59,9 +59,10 @@ spec:
5959
max: 1
6060
resources:
6161
requests:
62-
cpu: 200m
62+
cpu: 50m
6363
memory: 1024Mi
6464
limits:
65+
cpu: 500m
6566
memory: 2048Mi
6667
env:
6768
- name: SPRING_PROFILES_ACTIVE

‎apps/dollystatus/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
path: /internal/health/liveness
1919
initialDelay: 4
2020
periodSeconds: 5
21-
failureThreshold: 500
21+
failureThreshold: 10
2222
observability:
2323
logging:
2424
destinations:
@@ -30,7 +30,7 @@ spec:
3030
path: /internal/health/readiness
3131
initialDelay: 4
3232
periodSeconds: 5
33-
failureThreshold: 500
33+
failureThreshold: 10
3434
prometheus:
3535
enabled: true
3636
path: /internal/metrics

‎apps/endringsmelding-frontend/config.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ spec:
4444
- application: testnorge-profil-api
4545
- application: testnorge-profil-api-dev
4646
resources:
47+
requests:
48+
cpu: 50m
49+
memory: 600Mi
4750
limits:
51+
cpu: 400m
4852
memory: 2048Mi
49-
requests:
50-
cpu: 200m
51-
memory: 1024Mi
5253
image: "{{image}}"
5354
ingresses:
5455
- "https://testnav-endringsmelding.intern.dev.nav.no"

0 commit comments

Comments
 (0)