Skip to content

Commit 3206b4e

Browse files
julientinguely-dajulientinguely-da
authored
Pulumify resources for all apps (#2784)
Signed-off-by: Julien Tinguely <julien.tinguely@digitalasset.com>
1 parent fe40383 commit 3206b4e

File tree

14 files changed

+234
-47
lines changed

14 files changed

+234
-47
lines changed

‎cluster/deployment/mock/config.yaml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ multiValidator:
1818
sv:
1919
synchronizer:
2020
skipInitialization: true
21-
scan:
22-
resources:
23-
requests:
24-
cpu: "0.5"
25-
memory: '1536Mi'
26-
limits:
27-
memory: '2048Mi'
2821
splitwell:
2922
maxDarVersion: '0.1.8'
3023
synchronizerMigration:
@@ -116,33 +109,69 @@ loadTester:
116109
enabled: true
117110
svs:
118111
default:
112+
validatorApp:
113+
resources:
114+
requests:
115+
cpu: "1"
116+
memory: '1Gi'
117+
limits:
118+
memory: '2Gi'
119119
scanApp:
120120
additionalEnvVars:
121121
- name: CUSTOM_MOCK_ENV_VAR_NAME
122122
value: CUSTOM_MOCK_ENV_VAR_VALUE
123123
additionalJvmOptions: "-DcustomScanAppJvmFlag"
124+
resources:
125+
requests:
126+
cpu: "0.5"
127+
memory: '1536Mi'
128+
limits:
129+
memory: '2048Mi'
124130
svApp:
125131
additionalEnvVars:
126132
- name: CUSTOM_MOCK_ENV_VAR_NAME
127133
value: CUSTOM_MOCK_ENV_VAR_VALUE
128134
additionalJvmOptions: "-DcustomSvAppJvmFlag"
135+
resources:
136+
requests:
137+
cpu: "1"
138+
memory: '1Gi'
139+
limits:
140+
memory: '2Gi'
129141
participant:
130142
additionalEnvVars:
131143
- name: CUSTOM_MOCK_ENV_VAR_NAME
132144
value: CUSTOM_MOCK_ENV_VAR_VALUE
133145
additionalJvmOptions: "-DcustomParticipantJvmFlag"
146+
resources:
147+
requests:
148+
memory: '12Gi'
149+
limits:
150+
memory: '18Gi'
134151
sequencer:
135152
additionalEnvVars:
136153
- name: CUSTOM_MOCK_ENV_VAR_NAME
137154
value: CUSTOM_MOCK_ENV_VAR_VALUE
138155
additionalJvmOptions: "-DcustomSequencerJvmFlag"
139156
cloudSql:
140157
tier: "sequencer-override-tier"
158+
resources:
159+
requests:
160+
cpu: "1"
161+
memory: '1Gi'
162+
limits:
163+
memory: '2Gi'
141164
mediator:
142165
additionalEnvVars:
143166
- name: CUSTOM_MOCK_ENV_VAR_NAME
144167
value: CUSTOM_MOCK_ENV_VAR_VALUE
145168
additionalJvmOptions: "-DcustomMediatorJvmFlag"
169+
resources:
170+
requests:
171+
cpu: "1"
172+
memory: '1Gi'
173+
limits:
174+
memory: '2Gi'
146175
logging:
147176
appsLogLevel: WARN
148177
cantonLogLevel: INFO

‎cluster/expected/canton-network/expected.json‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,6 +1769,15 @@
17691769
"secretName": "cn-apps-pg-secrets",
17701770
"user": "cnadmin"
17711771
},
1772+
"resources": {
1773+
"limits": {
1774+
"memory": "2Gi"
1775+
},
1776+
"requests": {
1777+
"cpu": "1",
1778+
"memory": "1Gi"
1779+
}
1780+
},
17721781
"scan": {
17731782
"internalUrl": "http://scan-app.sv-1:5012",
17741783
"publicUrl": "https://scan.sv-2.mock.global.canton.network.digitalasset.com"
@@ -1879,10 +1888,11 @@
18791888
},
18801889
"resources": {
18811890
"limits": {
1882-
"memory": "4Gi"
1891+
"memory": "2Gi"
18831892
},
18841893
"requests": {
1885-
"memory": "2Gi"
1894+
"cpu": "1",
1895+
"memory": "1Gi"
18861896
}
18871897
},
18881898
"scanAddress": "http://scan-app.sv-1:5012",
@@ -2594,6 +2604,15 @@
25942604
"secretName": "cn-apps-pg-secrets",
25952605
"user": "cnadmin"
25962606
},
2607+
"resources": {
2608+
"limits": {
2609+
"memory": "2Gi"
2610+
},
2611+
"requests": {
2612+
"cpu": "1",
2613+
"memory": "1Gi"
2614+
}
2615+
},
25972616
"scan": {
25982617
"internalUrl": "http://scan-app.sv-da-1:5012",
25992618
"publicUrl": "https://scan.sv-1.mock.global.canton.network.digitalasset.com"
@@ -2704,10 +2723,11 @@
27042723
},
27052724
"resources": {
27062725
"limits": {
2707-
"memory": "4Gi"
2726+
"memory": "2Gi"
27082727
},
27092728
"requests": {
2710-
"memory": "2Gi"
2729+
"cpu": "1",
2730+
"memory": "1Gi"
27112731
}
27122732
},
27132733
"scanAddress": "http://scan-app.sv-da-1:5012",

‎cluster/expected/sv-canton/expected.json‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,6 +1745,15 @@
17451745
"port": 5432,
17461746
"postgresName": "mediator-3-pg",
17471747
"secretName": "mediator-3-pg-secrets"
1748+
},
1749+
"resources": {
1750+
"limits": {
1751+
"memory": "2Gi"
1752+
},
1753+
"requests": {
1754+
"cpu": "1",
1755+
"memory": "1Gi"
1756+
}
17481757
}
17491758
},
17501759
"metrics": {
@@ -1770,6 +1779,15 @@
17701779
"port": 5432,
17711780
"postgresName": "sequencer-3-pg",
17721781
"secretName": "sequencer-3-pg-secrets"
1782+
},
1783+
"resources": {
1784+
"limits": {
1785+
"memory": "2Gi"
1786+
},
1787+
"requests": {
1788+
"cpu": "1",
1789+
"memory": "1Gi"
1790+
}
17731791
}
17741792
},
17751793
"serviceAccountName": "sv-canton-migration-3",
@@ -1845,6 +1863,15 @@
18451863
"port": 5432,
18461864
"postgresName": "mediator-4-pg",
18471865
"secretName": "mediator-4-pg-secrets"
1866+
},
1867+
"resources": {
1868+
"limits": {
1869+
"memory": "2Gi"
1870+
},
1871+
"requests": {
1872+
"cpu": "1",
1873+
"memory": "1Gi"
1874+
}
18481875
}
18491876
},
18501877
"metrics": {
@@ -1870,6 +1897,15 @@
18701897
"port": 5432,
18711898
"postgresName": "sequencer-4-pg",
18721899
"secretName": "sequencer-4-pg-secrets"
1900+
},
1901+
"resources": {
1902+
"limits": {
1903+
"memory": "2Gi"
1904+
},
1905+
"requests": {
1906+
"cpu": "1",
1907+
"memory": "1Gi"
1908+
}
18731909
}
18741910
},
18751911
"serviceAccountName": "sv-canton-migration-4",
@@ -3859,6 +3895,15 @@
38593895
"port": 5432,
38603896
"postgresName": "mediator-3-pg",
38613897
"secretName": "mediator-3-pg-secrets"
3898+
},
3899+
"resources": {
3900+
"limits": {
3901+
"memory": "2Gi"
3902+
},
3903+
"requests": {
3904+
"cpu": "1",
3905+
"memory": "1Gi"
3906+
}
38623907
}
38633908
},
38643909
"metrics": {
@@ -3884,6 +3929,15 @@
38843929
"port": 5432,
38853930
"postgresName": "sequencer-3-pg",
38863931
"secretName": "sequencer-3-pg-secrets"
3932+
},
3933+
"resources": {
3934+
"limits": {
3935+
"memory": "2Gi"
3936+
},
3937+
"requests": {
3938+
"cpu": "1",
3939+
"memory": "1Gi"
3940+
}
38873941
}
38883942
},
38893943
"serviceAccountName": "sv-canton-migration-3",
@@ -3959,6 +4013,15 @@
39594013
"port": 5432,
39604014
"postgresName": "mediator-4-pg",
39614015
"secretName": "mediator-4-pg-secrets"
4016+
},
4017+
"resources": {
4018+
"limits": {
4019+
"memory": "2Gi"
4020+
},
4021+
"requests": {
4022+
"cpu": "1",
4023+
"memory": "1Gi"
4024+
}
39624025
}
39634026
},
39644027
"metrics": {
@@ -3984,6 +4047,15 @@
39844047
"port": 5432,
39854048
"postgresName": "sequencer-4-pg",
39864049
"secretName": "sequencer-4-pg-secrets"
4050+
},
4051+
"resources": {
4052+
"limits": {
4053+
"memory": "2Gi"
4054+
},
4055+
"requests": {
4056+
"cpu": "1",
4057+
"memory": "1Gi"
4058+
}
39874059
}
39884060
},
39894061
"serviceAccountName": "sv-canton-migration-4",
@@ -5477,6 +5549,15 @@
54775549
"port": 5432,
54785550
"postgresName": "mediator-3-pg",
54795551
"secretName": "mediator-3-pg-secrets"
5552+
},
5553+
"resources": {
5554+
"limits": {
5555+
"memory": "2Gi"
5556+
},
5557+
"requests": {
5558+
"cpu": "1",
5559+
"memory": "1Gi"
5560+
}
54805561
}
54815562
},
54825563
"metrics": {
@@ -5502,6 +5583,15 @@
55025583
"port": 5432,
55035584
"postgresName": "sequencer-3-pg",
55045585
"secretName": "sequencer-3-pg-secrets"
5586+
},
5587+
"resources": {
5588+
"limits": {
5589+
"memory": "2Gi"
5590+
},
5591+
"requests": {
5592+
"cpu": "1",
5593+
"memory": "1Gi"
5594+
}
55055595
}
55065596
},
55075597
"serviceAccountName": "sv-canton-migration-3",
@@ -5577,6 +5667,15 @@
55775667
"port": 5432,
55785668
"postgresName": "mediator-4-pg",
55795669
"secretName": "mediator-4-pg-secrets"
5670+
},
5671+
"resources": {
5672+
"limits": {
5673+
"memory": "2Gi"
5674+
},
5675+
"requests": {
5676+
"cpu": "1",
5677+
"memory": "1Gi"
5678+
}
55805679
}
55815680
},
55825681
"metrics": {
@@ -5602,6 +5701,15 @@
56025701
"port": 5432,
56035702
"postgresName": "sequencer-4-pg",
56045703
"secretName": "sequencer-4-pg-secrets"
5704+
},
5705+
"resources": {
5706+
"limits": {
5707+
"memory": "2Gi"
5708+
},
5709+
"requests": {
5710+
"cpu": "1",
5711+
"memory": "1Gi"
5712+
}
56055713
}
56065714
},
56075715
"serviceAccountName": "sv-canton-migration-4",

‎cluster/expected/sv-runbook/expected.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,15 @@
481481
"postgresName": "apps-pg",
482482
"secretName": "apps-pg-secret"
483483
},
484+
"resources": {
485+
"limits": {
486+
"memory": "2048Mi"
487+
},
488+
"requests": {
489+
"cpu": "0.5",
490+
"memory": "1536Mi"
491+
}
492+
},
484493
"sequencerAddress": "global-domain-3-sequencer",
485494
"spliceInstanceNames": {
486495
"amuletName": "Amulet",
@@ -825,6 +834,15 @@
825834
"postgresName": "apps-pg",
826835
"secretName": "apps-pg-secret"
827836
},
837+
"resources": {
838+
"limits": {
839+
"memory": "2Gi"
840+
},
841+
"requests": {
842+
"cpu": "1",
843+
"memory": "1Gi"
844+
}
845+
},
828846
"scan": {
829847
"internalUrl": "http://scan-app.sv:5012",
830848
"publicUrl": "https://scan.sv.mock.global.canton.network.digitalasset.com"
@@ -1136,6 +1154,15 @@
11361154
"postgresName": "apps-pg",
11371155
"secretName": "apps-pg-secret"
11381156
},
1157+
"resources": {
1158+
"limits": {
1159+
"memory": "2Gi"
1160+
},
1161+
"requests": {
1162+
"cpu": "1",
1163+
"memory": "1Gi"
1164+
}
1165+
},
11391166
"scanAddress": "http://scan-app.sv:5012",
11401167
"spliceInstanceNames": {
11411168
"amuletName": "Amulet",

0 commit comments

Comments
 (0)