Skip to content

Commit 8af9f6c

Browse files
GunaKKIBMGunaKKIBM
authored
Add the e1050 System Type (#2304)
1 parent d78de2f commit 8af9f6c

File tree

5 files changed

+20
-39
lines changed

5 files changed

+20
-39
lines changed

‎api/v1beta2/ibmpowervsmachine_types.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,11 @@ type IBMPowerVSMachineSpec struct {
7777

7878
// systemType is the System type used to host the instance.
7979
// systemType determines the number of cores and memory that is available.
80-
// Few of the supported SystemTypes are s922,e880,e980.
81-
// e880 systemType available only in Dallas Datacenters.
82-
// e980 systemType available in Datacenters except Dallas and Washington.
80+
// Few of the supported SystemTypes are s922,e980,s1022,e1050,e1080.
8381
// When omitted, this means that the user has no opinion and the platform is left to choose a
8482
// reasonable default, which is subject to change over time. The current default is s922 which is generally available.
8583
// + This is not an enum because we expect other values to be added later which should be supported implicitly.
86-
// +kubebuilder:validation:Enum:="s922";"e880";"e980";"s1022";""
84+
// +kubebuilder:validation:Enum:="s922";"e980";"s1022";"e1050";"e1080";""
8785
// +optional
8886
SystemType string `json:"systemType,omitempty"`
8987

@@ -101,10 +99,8 @@ type IBMPowerVSMachineSpec struct {
10199

102100
// processors is the number of virtual processors in a virtual machine.
103101
// when the processorType is selected as Dedicated the processors value cannot be fractional.
104-
// maximum value for the Processors depends on the selected SystemType.
105-
// when SystemType is set to e880 or e980 maximum Processors value is 143.
106-
// when SystemType is set to s922 maximum Processors value is 15.
107-
// minimum value for Processors depends on the selected ProcessorType.
102+
// maximum value for the Processors depends on the selected SystemType,
103+
// and minimum value for Processors depends on the selected ProcessorType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud.
108104
// when ProcessorType is set as Shared or Capped, The minimum processors is 0.25.
109105
// when ProcessorType is set as Dedicated, The minimum processors is 1.
110106
// When omitted, this means that the user has no opinion and the platform is left to choose a
@@ -115,10 +111,7 @@ type IBMPowerVSMachineSpec struct {
115111
Processors intstr.IntOrString `json:"processors,omitempty"`
116112

117113
// memoryGiB is the size of a virtual machine's memory, in GiB.
118-
// maximum value for the MemoryGiB depends on the selected SystemType.
119-
// when SystemType is set to e880 maximum MemoryGiB value is 7463 GiB.
120-
// when SystemType is set to e980 maximum MemoryGiB value is 15307 GiB.
121-
// when SystemType is set to s922 maximum MemoryGiB value is 942 GiB.
114+
// maximum value for the MemoryGiB depends on the selected SystemType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud
122115
// The minimum memory is 2 GiB.
123116
// When omitted, this means the user has no opinion and the platform is left to choose a reasonable
124117
// default, which is subject to change over time. The current default is 2.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -396,10 +396,7 @@ spec:
396396
memoryGiB:
397397
description: |-
398398
memoryGiB is the size of a virtual machine's memory, in GiB.
399-
maximum value for the MemoryGiB depends on the selected SystemType.
400-
when SystemType is set to e880 maximum MemoryGiB value is 7463 GiB.
401-
when SystemType is set to e980 maximum MemoryGiB value is 15307 GiB.
402-
when SystemType is set to s922 maximum MemoryGiB value is 942 GiB.
399+
maximum value for the MemoryGiB depends on the selected SystemType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud
403400
The minimum memory is 2 GiB.
404401
When omitted, this means the user has no opinion and the platform is left to choose a reasonable
405402
default, which is subject to change over time. The current default is 2.
@@ -448,10 +445,8 @@ spec:
448445
description: |-
449446
processors is the number of virtual processors in a virtual machine.
450447
when the processorType is selected as Dedicated the processors value cannot be fractional.
451-
maximum value for the Processors depends on the selected SystemType.
452-
when SystemType is set to e880 or e980 maximum Processors value is 143.
453-
when SystemType is set to s922 maximum Processors value is 15.
454-
minimum value for Processors depends on the selected ProcessorType.
448+
maximum value for the Processors depends on the selected SystemType,
449+
and minimum value for Processors depends on the selected ProcessorType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud.
455450
when ProcessorType is set as Shared or Capped, The minimum processors is 0.25.
456451
when ProcessorType is set as Dedicated, The minimum processors is 1.
457452
When omitted, this means that the user has no opinion and the platform is left to choose a
@@ -501,16 +496,15 @@ spec:
501496
description: |-
502497
systemType is the System type used to host the instance.
503498
systemType determines the number of cores and memory that is available.
504-
Few of the supported SystemTypes are s922,e880,e980.
505-
e880 systemType available only in Dallas Datacenters.
506-
e980 systemType available in Datacenters except Dallas and Washington.
499+
Few of the supported SystemTypes are s922,e980,s1022,e1050,e1080.
507500
When omitted, this means that the user has no opinion and the platform is left to choose a
508501
reasonable default, which is subject to change over time. The current default is s922 which is generally available.
509502
enum:
510503
- s922
511-
- e880
512504
- e980
513505
- s1022
506+
- e1050
507+
- e1080
514508
- ""
515509
type: string
516510
required:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,7 @@ spec:
236236
memoryGiB:
237237
description: |-
238238
memoryGiB is the size of a virtual machine's memory, in GiB.
239-
maximum value for the MemoryGiB depends on the selected SystemType.
240-
when SystemType is set to e880 maximum MemoryGiB value is 7463 GiB.
241-
when SystemType is set to e980 maximum MemoryGiB value is 15307 GiB.
242-
when SystemType is set to s922 maximum MemoryGiB value is 942 GiB.
239+
maximum value for the MemoryGiB depends on the selected SystemType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud
243240
The minimum memory is 2 GiB.
244241
When omitted, this means the user has no opinion and the platform is left to choose a reasonable
245242
default, which is subject to change over time. The current default is 2.
@@ -288,10 +285,8 @@ spec:
288285
description: |-
289286
processors is the number of virtual processors in a virtual machine.
290287
when the processorType is selected as Dedicated the processors value cannot be fractional.
291-
maximum value for the Processors depends on the selected SystemType.
292-
when SystemType is set to e880 or e980 maximum Processors value is 143.
293-
when SystemType is set to s922 maximum Processors value is 15.
294-
minimum value for Processors depends on the selected ProcessorType.
288+
maximum value for the Processors depends on the selected SystemType,
289+
and minimum value for Processors depends on the selected ProcessorType, which can be found here: https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-pricing-virtual-server-on-cloud.
295290
when ProcessorType is set as Shared or Capped, The minimum processors is 0.25.
296291
when ProcessorType is set as Dedicated, The minimum processors is 1.
297292
When omitted, this means that the user has no opinion and the platform is left to choose a
@@ -341,16 +336,15 @@ spec:
341336
description: |-
342337
systemType is the System type used to host the instance.
343338
systemType determines the number of cores and memory that is available.
344-
Few of the supported SystemTypes are s922,e880,e980.
345-
e880 systemType available only in Dallas Datacenters.
346-
e980 systemType available in Datacenters except Dallas and Washington.
339+
Few of the supported SystemTypes are s922,e980,s1022,e1050,e1080.
347340
When omitted, this means that the user has no opinion and the platform is left to choose a
348341
reasonable default, which is subject to change over time. The current default is s922 which is generally available.
349342
enum:
350343
- s922
351-
- e880
352344
- e980
353345
- s1022
346+
- e1050
347+
- e1080
354348
- ""
355349
type: string
356350
required:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/onsi/ginkgo/v2 v2.23.3
2626
github.com/onsi/gomega v1.36.3
2727
github.com/pkg/errors v0.9.1
28-
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240610070307-1c0d75a5c247
28+
github.com/ppc64le-cloud/powervs-utils v0.0.0-20250403153021-219b161805db
2929
github.com/spf13/cobra v1.9.1
3030
github.com/spf13/pflag v1.0.6
3131
github.com/stretchr/testify v1.10.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
281281
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
282282
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
283283
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
284-
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240610070307-1c0d75a5c247 h1:XY7lIZaLKFDyETNfTTiYmaXO+mk9apox4otFel88nUk=
285-
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240610070307-1c0d75a5c247/go.mod h1:yfr6HHPYyJzVgnivMsobLMbHQqUHrzcIqWM4Nav4kc8=
284+
github.com/ppc64le-cloud/powervs-utils v0.0.0-20250403153021-219b161805db h1:Fy2pmDLfLq2H0N77KD2LpNoCWbDGP0BknZU/odPx2+c=
285+
github.com/ppc64le-cloud/powervs-utils v0.0.0-20250403153021-219b161805db/go.mod h1:yfr6HHPYyJzVgnivMsobLMbHQqUHrzcIqWM4Nav4kc8=
286286
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
287287
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
288288
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=

0 commit comments

Comments
 (0)