Skip to content

Commit e8bf962

Browse files
wip
1 parent ea1632e commit e8bf962

File tree

3 files changed

+100
-11
lines changed

3 files changed

+100
-11
lines changed

cmd/broker/testdata/providers.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ gcp:
152152
"g2-standard-24": "g2-standard-24 (2GPU, 24vCPU, 96GB RAM)*"
153153
"g2-standard-32": "g2-standard-32 (1GPU, 32vCPU, 128GB RAM)*"
154154
"g2-standard-48": "g2-standard-48 (4GPU, 48vCPU, 192GB RAM)*"
155-
XXX:
156155

157156
regions:
158157
europe-west3:

resources/keb/values.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,34 +31,34 @@ global:
3131
path: europe-docker.pkg.dev/kyma-project/prod
3232
kyma_environment_broker:
3333
dir:
34-
version: "1.19.6"
34+
version: "PR-2069"
3535
kyma_environment_broker_schema_migrator:
3636
dir:
37-
version: 1.19.6
37+
version: PR-2069
3838
kyma_environments_subaccount_cleanup_job:
3939
dir:
40-
version: "1.19.6"
40+
version: "PR-2069"
4141
kyma_environment_trial_cleanup_job:
4242
dir:
43-
version: "1.19.6"
43+
version: "PR-2069"
4444
kyma_environment_expirator_job:
4545
dir:
46-
version: "1.19.6"
46+
version: "PR-2069"
4747
kyma_environment_deprovision_retrigger_job:
4848
dir:
49-
version: "1.19.6"
49+
version: "PR-2069"
5050
kyma_environment_runtime_reconciler:
5151
dir:
52-
version: "1.19.6"
52+
version: "PR-2069"
5353
kyma_environment_subaccount_sync:
5454
dir:
55-
version: "1.19.6"
55+
version: "PR-2069"
5656
kyma_environment_globalaccounts:
5757
dir:
58-
version: "1.19.6"
58+
version: "PR-2069"
5959
kyma_environment_service_binding_cleanup_job:
6060
dir:
61-
version: 1.19.6
61+
version: PR-2069
6262
ingress:
6363
domainName: localhost
6464
istio:

scripts/values.yaml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,40 @@ plansConfiguration:
167167

168168
providersConfiguration:
169169
aws:
170+
machines:
171+
"m6i.large": "m6i.large (2vCPU, 8GB RAM)"
172+
"m6i.xlarge": "m6i.xlarge (4vCPU, 16GB RAM)"
173+
"m6i.2xlarge": "m6i.2xlarge (8vCPU, 32GB RAM)"
174+
"m6i.4xlarge": "m6i.4xlarge (16vCPU, 64GB RAM)"
175+
"m6i.8xlarge": "m6i.8xlarge (32vCPU, 128GB RAM)"
176+
"m6i.12xlarge": "m6i.12xlarge (48vCPU, 192GB RAM)"
177+
"m6i.16xlarge": "m6i.16xlarge (64vCPU, 256GB RAM)"
178+
"m5.large": "m5.large (2vCPU, 8GB RAM)"
179+
"m5.xlarge": "m5.xlarge (4vCPU, 16GB RAM)"
180+
"m5.2xlarge": "m5.2xlarge (8vCPU, 32GB RAM)"
181+
"m5.4xlarge": "m5.4xlarge (16vCPU, 64GB RAM)"
182+
"m5.8xlarge": "m5.8xlarge (32vCPU, 128GB RAM)"
183+
"m5.12xlarge": "m5.12xlarge (48vCPU, 192GB RAM)"
184+
"m5.16xlarge": "m5.16xlarge (64vCPU, 256GB RAM)"
185+
"c7i.large": "c7i.large (2vCPU, 4GB RAM)"
186+
"c7i.xlarge": "c7i.xlarge (4vCPU, 8GB RAM)"
187+
"c7i.2xlarge": "c7i.2xlarge (8vCPU, 16GB RAM)"
188+
"c7i.4xlarge": "c7i.4xlarge (16vCPU, 32GB RAM)"
189+
"c7i.8xlarge": "c7i.8xlarge (32vCPU, 64GB RAM)"
190+
"c7i.12xlarge": "c7i.12xlarge (48vCPU, 96GB RAM)"
191+
"c7i.16xlarge": "c7i.16xlarge (64vCPU, 128GB RAM)"
192+
"g6.xlarge": "g6.xlarge (1GPU, 4vCPU, 16GB RAM)*"
193+
"g6.2xlarge": "g6.2xlarge (1GPU, 8vCPU, 32GB RAM)*"
194+
"g6.4xlarge": "g6.4xlarge (1GPU, 16vCPU, 64GB RAM)*"
195+
"g6.8xlarge": "g6.8xlarge (1GPU, 32vCPU, 128GB RAM)*"
196+
"g6.12xlarge": "g6.12xlarge (4GPU, 48vCPU, 192GB RAM)*"
197+
"g6.16xlarge": "g6.16xlarge (1GPU, 64vCPU, 256GB RAM)*"
198+
"g4dn.xlarge": "g4dn.xlarge (1GPU, 4vCPU, 16GB RAM)*"
199+
"g4dn.2xlarge": "g4dn.2xlarge (1GPU, 8vCPU, 32GB RAM)*"
200+
"g4dn.4xlarge": "g4dn.4xlarge (1GPU, 16vCPU, 64GB RAM)*"
201+
"g4dn.8xlarge": "g4dn.8xlarge (1GPU, 32vCPU, 128GB RAM)*"
202+
"g4dn.12xlarge": "g4dn.12xlarge (4GPU, 48vCPU, 192GB RAM)*"
203+
"g4dn.16xlarge": "g4dn.16xlarge (1GPU, 64vCPU, 256GB RAM)*"
170204
regions:
171205
eu-central-1:
172206
displayName: eu-central-1 (Europe, Frankfurt)
@@ -205,6 +239,31 @@ providersConfiguration:
205239
displayName: eu-west-1 (Europe, Ireland)
206240
zones: [a]
207241
azure:
242+
machines:
243+
"Standard_D2s_v5": "Standard_D2s_v5 (2vCPU, 8GB RAM)"
244+
"Standard_D4s_v5": "Standard_D4s_v5 (4vCPU, 16GB RAM)"
245+
"Standard_D8s_v5": "Standard_D8s_v5 (8vCPU, 32GB RAM)"
246+
"Standard_D16s_v5": "Standard_D16s_v5 (16vCPU, 64GB RAM)"
247+
"Standard_D32s_v5": "Standard_D32s_v5 (32vCPU, 128GB RAM)"
248+
"Standard_D48s_v5": "Standard_D48s_v5 (48vCPU, 192GB RAM)"
249+
"Standard_D64s_v5": "Standard_D64s_v5 (64vCPU, 256GB RAM)"
250+
"Standard_D4_v3": "Standard_D4_v3 (4vCPU, 16GB RAM)"
251+
"Standard_D8_v3": "Standard_D8_v3 (8vCPU, 32GB RAM)"
252+
"Standard_D16_v3": "Standard_D16_v3 (16vCPU, 64GB RAM)"
253+
"Standard_D32_v3": "Standard_D32_v3 (32vCPU, 128GB RAM)"
254+
"Standard_D48_v3": "Standard_D48_v3 (48vCPU, 192GB RAM)"
255+
"Standard_D64_v3": "Standard_D64_v3 (64vCPU, 256GB RAM)"
256+
"Standard_F2s_v2": "Standard_F2s_v2 (2vCPU, 4GB RAM)"
257+
"Standard_F4s_v2": "Standard_F4s_v2 (4vCPU, 8GB RAM)"
258+
"Standard_F8s_v2": "Standard_F8s_v2 (8vCPU, 16GB RAM)"
259+
"Standard_F16s_v2": "Standard_F16s_v2 (16vCPU, 32GB RAM)"
260+
"Standard_F32s_v2": "Standard_F32s_v2 (32vCPU, 64GB RAM)"
261+
"Standard_F48s_v2": "Standard_F48s_v2 (48vCPU, 96GB RAM)"
262+
"Standard_F64s_v2": "Standard_F64s_v2 (64vCPU, 128GB RAM)"
263+
"Standard_NC4as_T4_v3": "Standard_NC4as_T4_v3 (1GPU, 4vCPU, 28GB RAM)*"
264+
"Standard_NC8as_T4_v3": "Standard_NC8as_T4_v3 (1GPU, 8vCPU, 56GB RAM)*"
265+
"Standard_NC16as_T4_v3": "Standard_NC16as_T4_v3 (1GPU, 16vCPU, 110GB RAM)*"
266+
"Standard_NC64as_T4_v3": "Standard_NC64as_T4_v3 (4GPU, 64vCPU, 440GB RAM)*"
208267
regions:
209268
eastus:
210269
displayName: eastus (US East, VA)
@@ -243,6 +302,28 @@ providersConfiguration:
243302
displayName: switzerlandnorth (Switzerland, Zurich)
244303
zones: ['1', '2', '3']
245304
gcp:
305+
machines:
306+
"n2-standard-2": "n2-standard-2 (2vCPU, 8GB RAM)"
307+
"n2-standard-4": "n2-standard-4 (4vCPU, 16GB RAM)"
308+
"n2-standard-8": "n2-standard-8 (8vCPU, 32GB RAM)"
309+
"n2-standard-16": "n2-standard-16 (16vCPU, 64GB RAM)"
310+
"n2-standard-32": "n2-standard-32 (32vCPU, 128GB RAM)"
311+
"n2-standard-48": "n2-standard-48 (48vCPU, 192GB RAM)"
312+
"n2-standard-64": "n2-standard-64 (64vCPU, 256GB RAM)"
313+
"c2d-highcpu-2": "c2d-highcpu-2 (2vCPU, 4GB RAM)"
314+
"c2d-highcpu-4": "c2d-highcpu-4 (4vCPU, 8GB RAM)"
315+
"c2d-highcpu-8": "c2d-highcpu-8 (8vCPU, 16GB RAM)"
316+
"c2d-highcpu-16": "c2d-highcpu-16 (16vCPU, 32GB RAM)"
317+
"c2d-highcpu-32": "c2d-highcpu-32 (32vCPU, 64GB RAM)"
318+
"c2d-highcpu-56": "c2d-highcpu-56 (56vCPU, 112GB RAM)"
319+
"g2-standard-4": "g2-standard-4 (1GPU, 4vCPU, 16GB RAM)*"
320+
"g2-standard-8": "g2-standard-8 (1GPU, 8vCPU, 32GB RAM)*"
321+
"g2-standard-12": "g2-standard-12 (1GPU, 12vCPU, 48GB RAM)*"
322+
"g2-standard-16": "g2-standard-16 (1GPU, 16vCPU, 64GB RAM)*"
323+
"g2-standard-24": "g2-standard-24 (2GPU, 24vCPU, 96GB RAM)*"
324+
"g2-standard-32": "g2-standard-32 (1GPU, 32vCPU, 128GB RAM)*"
325+
"g2-standard-48": "g2-standard-48 (4GPU, 48vCPU, 192GB RAM)*"
326+
246327
regions:
247328
europe-west3:
248329
displayName: europe-west3 (Europe, Frankfurt)
@@ -284,6 +365,15 @@ providersConfiguration:
284365
displayName: europe-west4 (Europe, Netherlands)
285366
zones: [a, b, c]
286367
sap-converged-cloud:
368+
machines:
369+
"g_c2_m8": "g_c2_m8 (2vCPU, 8GB RAM)"
370+
"g_c4_m16": "g_c4_m16 (4vCPU, 16GB RAM)"
371+
"g_c6_m24": "g_c6_m24 (6vCPU, 24GB RAM)"
372+
"g_c8_m32": "g_c8_m32 (8vCPU, 32GB RAM)"
373+
"g_c12_m48": "g_c12_m48 (12vCPU, 48GB RAM)"
374+
"g_c16_m64": "g_c16_m64 (16vCPU, 64GB RAM)"
375+
"g_c32_m128": "g_c32_m128 (32vCPU, 128GB RAM)"
376+
"g_c64_m256": "g_c64_m256 (64vCPU, 256GB RAM)"
287377
regions:
288378
eu-de-1:
289379
displayName: eu-de-1

0 commit comments

Comments
 (0)