Skip to content

Commit 302b913

Browse files
jsafranek8s-infra-cherrypick-robot
authored and
k8s-infra-cherrypick-robot
committed
Fix hyperdisk attach limits
Reserve 1 attachment for the root / OS disk when reporting nr. of attachable hyperdisks.
1 parent 1f75136 commit 302b913

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

pkg/common/constants.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ var Gen4MachineHyperdiskAttachLimitMap = []struct {
6363
max int64
6464
value int64
6565
}{
66-
{max: 4, value: 16},
67-
{max: 8, value: 24},
68-
{max: 16, value: 32},
69-
{max: 32, value: 48},
70-
{max: 64, value: 64},
71-
{max: 1024, value: 128},
66+
{max: 4, value: 15},
67+
{max: 8, value: 23},
68+
{max: 16, value: 31},
69+
{max: 32, value: 49},
70+
{max: 64, value: 63},
71+
{max: 1024, value: 127},
7272
}

pkg/gce-pd-csi-driver/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ const (
9999
volumeLimitSmall int64 = 15
100100
volumeLimitBig int64 = 127
101101
// doc https://cloud.google.com/compute/docs/memory-optimized-machines#x4_disks
102-
x4HyperdiskLimit int64 = 40
102+
x4HyperdiskLimit int64 = 39
103103
// doc https://cloud.google.com/compute/docs/accelerator-optimized-machines#a4-disks
104-
a4HyperdiskLimit int64 = 128
104+
a4HyperdiskLimit int64 = 127
105105
defaultLinuxFsType = "ext4"
106106
defaultWindowsFsType = "ntfs"
107107
fsTypeExt3 = "ext3"

pkg/gce-pd-csi-driver/node_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -259,27 +259,27 @@ func TestNodeGetVolumeLimits(t *testing.T) {
259259
{
260260
name: "c4-standard-192",
261261
machineType: "c4-standard-192",
262-
expVolumeLimit: 128,
262+
expVolumeLimit: 127,
263263
},
264264
{
265265
name: "c4-standard-48",
266266
machineType: "c4-standard-48",
267-
expVolumeLimit: 64,
267+
expVolumeLimit: 63,
268268
},
269269
{
270270
name: "c4a-standard-4",
271271
machineType: "c4a-standard-4",
272-
expVolumeLimit: 16,
272+
expVolumeLimit: 15,
273273
},
274274
{
275275
name: "n4-standard-16",
276276
machineType: "n4-standard-16",
277-
expVolumeLimit: 32,
277+
expVolumeLimit: 31,
278278
},
279279
{
280280
name: "n4-highcpu-4",
281281
machineType: "n4-highcpu-4",
282-
expVolumeLimit: 16,
282+
expVolumeLimit: 15,
283283
},
284284
{
285285
name: "invalid gen4 machine type",

0 commit comments

Comments
 (0)