Skip to content

Commit c60c4b9

Browse files
krharumkrharum
committed
Reduce CPU and memory requests in configuration files
1 parent fc88637 commit c60c4b9

File tree

47 files changed

+191
-149
lines changed

Some content is hidden

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

47 files changed

+191
-149
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

+3-2
Original file line numberDiff line numberDiff line change
@@ -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

+3-2
Original file line numberDiff line numberDiff line change
@@ -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

+3-2
Original file line numberDiff line numberDiff line change
@@ -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/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/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/generer-navn-service/config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ spec:
7171
max: 1
7272
resources:
7373
requests:
74-
cpu: 200m
75-
memory: 1024Mi
74+
cpu: 50m
75+
memory: 600Mi
7676
limits:
77+
cpu: 200m
7778
memory: 2048Mi
7879
ingresses:
7980
- "https://generer-navn-service.intern.dev.nav.no"

‎apps/helsepersonell-service/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ spec:
5555
resources:
5656
requests:
5757
cpu: 100m
58-
memory: 4000Mi
58+
memory: 1000Mi
5959
limits:
60-
memory: 5000Mi
60+
memory: 2000Mi
6161
ingresses:
6262
- "https://testnav-helsepersonell-service.intern.dev.nav.no"

‎apps/jenkins-batch-status-service/config.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ spec:
5555
max: 2
5656
resources:
5757
requests:
58+
cpu: 50m
59+
memory: 300Mi
60+
limits:
5861
cpu: 200m
5962
memory: 1024Mi
60-
limits:
61-
memory: 2048Mi
6263
ingresses:
6364
- "https://testnav-jenkins-batch-status-service.intern.dev.nav.no"

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,10 @@ spec:
6666
max: 2
6767
resources:
6868
requests:
69-
cpu: 200m
70-
memory: 1024Mi
69+
cpu: 50m
70+
memory: 800Mi
7171
limits:
72+
cpu: 200m
7273
memory: 2048Mi
7374
envFrom:
7475
- secret: google-sql-organisasjon-bestilling-service

‎apps/sykemelding-api/config.test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ spec:
5050
value: dev
5151
resources:
5252
requests:
53-
cpu: 200m
54-
memory: 4000Mi
53+
cpu: 100m
54+
memory: 1000Mi
5555
limits:
56-
memory: 5000Mi
56+
memory: 2000Mi
5757
accessPolicy:
5858
inbound:
5959
rules:

‎apps/sykemelding-api/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ spec:
5050
value: prod
5151
resources:
5252
requests:
53-
cpu: 200m
54-
memory: 4000Mi
53+
cpu: 100m
54+
memory: 500Mi
5555
limits:
56-
memory: 5000Mi
56+
memory: 2000Mi
5757
accessPolicy:
5858
inbound:
5959
rules:

‎apps/synt-vedtakshistorikk-service/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
max: 1
3737
resources:
3838
requests:
39-
cpu: 200m
39+
cpu: 100m
4040
memory: 1024Mi
4141
limits:
4242
memory: 2048Mi

‎apps/tilbakemelding-api/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ spec:
5656
max: 1
5757
resources:
5858
requests:
59-
cpu: 200m
60-
memory: 4000Mi
59+
cpu: 100m
60+
memory: 1000Mi
6161
limits:
62-
memory: 5000Mi
62+
memory: 2000Mi
6363
envFrom:
6464
- secret: teamdolly-slack-secret
6565
ingresses:

‎proxies/aareg-proxy/config.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
path: /internal/health/liveness
5757
initialDelay: 4
5858
periodSeconds: 5
59-
failureThreshold: 500
59+
failureThreshold: 10
6060
observability:
6161
logging:
6262
destinations:
@@ -68,16 +68,17 @@ spec:
6868
path: /internal/health/readiness
6969
initialDelay: 4
7070
periodSeconds: 5
71-
failureThreshold: 500
71+
failureThreshold: 10
7272
replicas:
7373
min: 1
7474
max: 1
7575
resources:
7676
requests:
77-
cpu: 100m
78-
memory: 4000Mi
77+
cpu: 50m
78+
memory: 800Mi
7979
limits:
80-
memory: 5000Mi
80+
cpu: 200m
81+
memory: 2000Mi
8182
envFrom:
8283
- secret: azure-trygdeetaten-testnav-aareg-proxy-trygdeetaten
8384
ingresses:

‎proxies/altinn3-tilgang-proxy/config.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
path: /internal/health/liveness
3535
initialDelay: 4
3636
periodSeconds: 5
37-
failureThreshold: 500
37+
failureThreshold: 10
3838
observability:
3939
logging:
4040
destinations:
@@ -46,15 +46,16 @@ spec:
4646
path: /internal/health/readiness
4747
initialDelay: 4
4848
periodSeconds: 5
49-
failureThreshold: 500
49+
failureThreshold: 10
5050
replicas:
5151
min: 1
5252
max: 1
5353
resources:
5454
requests:
55-
cpu: 100m
56-
memory: 1025Mi
55+
cpu: 20m
56+
memory: 800Mi
5757
limits:
58+
cpu: 100m
5859
memory: 2048Mi
5960
ingresses:
6061
- "https://testnav-altinn3-tilgang-proxy.intern.dev.nav.no"

‎proxies/arbeidsplassencv-proxy/config.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
path: /internal/health/liveness
3636
initialDelay: 4
3737
periodSeconds: 5
38-
failureThreshold: 500
38+
failureThreshold: 10
3939
observability:
4040
logging:
4141
destinations:
@@ -47,15 +47,16 @@ spec:
4747
path: /internal/health/readiness
4848
initialDelay: 4
4949
periodSeconds: 5
50-
failureThreshold: 500
50+
failureThreshold: 10
5151
replicas:
5252
min: 1
5353
max: 1
5454
resources:
5555
requests:
56-
cpu: 100m
57-
memory: 1024Mi
56+
cpu: 20m
57+
memory: 800Mi
5858
limits:
59+
cpu: 100m
5960
memory: 2048Mi
6061
ingresses:
6162
- "https://testnav-arbeidsplassencv-proxy.intern.dev.nav.no"

‎proxies/arbeidssoekerregisteret-proxy/config.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ spec:
5151
path: /internal/health/liveness
5252
initialDelay: 4
5353
periodSeconds: 5
54-
failureThreshold: 500
54+
failureThreshold: 10
5555
observability:
5656
logging:
5757
destinations:
@@ -63,15 +63,16 @@ spec:
6363
path: /internal/health/readiness
6464
initialDelay: 4
6565
periodSeconds: 5
66-
failureThreshold: 500
66+
failureThreshold: 10
6767
replicas:
6868
min: 1
6969
max: 1
7070
resources:
7171
requests:
72-
cpu: 100m
73-
memory: 1024Mi
72+
cpu: 20m
73+
memory: 800Mi
7474
limits:
75+
cpu: 100m
7576
memory: 2048Mi
7677
envFrom:
7778
- secret: azure-trygdeetaten-testnav-arbeidssoekerregisteret-proxy-trygdeetaten

0 commit comments

Comments
 (0)