Merge pull request kubernetes-sigs#1542 from gtxu/volme_attach_count

Add non-negative check on getVolumeLimit()
jcyepez · Mar 23, 2023 · 5d75bf4 · 5d75bf4
2 parents d889329 + f66f30a
commit 5d75bf4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/pkg/driver/node.go b/pkg/driver/node.go
@@ -743,10 +743,14 @@ func (d *nodeService) getVolumesLimit() int64 {
 	if isNitro {
 		enis := d.metadata.GetNumAttachedENIs()
 		nvmeInstanceStoreVolumes := cloud.GetNVMeInstanceStoreVolumesForInstanceType(instanceType)
-		availableAttachments = availableAttachments - enis - blockVolumes - nvmeInstanceStoreVolumes
-	} else {
-		availableAttachments -= blockVolumes
+		availableAttachments = availableAttachments - enis - nvmeInstanceStoreVolumes
+	}
+	availableAttachments = availableAttachments - blockVolumes
+
+	if availableAttachments < 0 {
+		availableAttachments = 0
 	}
+
 	maxEBSAttachments, ok := cloud.GetEBSLimitForInstanceType(instanceType)
 	if ok {
 		availableAttachments = min(maxEBSAttachments, availableAttachments)

diff --git a/pkg/driver/node_test.go b/pkg/driver/node_test.go
@@ -2053,6 +2053,42 @@ func TestNodeGetInfo(t *testing.T) {
 			expMaxVolumes:     25,
 			outpostArn:        emptyOutpostArn,
 		},
+		{
+			name:              "nitro instance already attached max EBS volumes",
+			instanceID:        "i-123456789abcdef01",
+			instanceType:      "t3.xlarge",
+			availabilityZone:  "us-west-2b",
+			region:            "us-west-2",
+			volumeAttachLimit: -1,
+			attachedENIs:      1,
+			blockDevices:      27,
+			expMaxVolumes:     0,
+			outpostArn:        emptyOutpostArn,
+		},
+		{
+			name:              "non-nitro instance already attached max EBS volumes",
+			instanceID:        "i-123456789abcdef01",
+			instanceType:      "m5.xlarge",
+			availabilityZone:  "us-west-2b",
+			region:            "us-west-2",
+			volumeAttachLimit: -1,
+			attachedENIs:      1,
+			blockDevices:      39,
+			expMaxVolumes:     0,
+			outpostArn:        emptyOutpostArn,
+		},
+		{
+			name:              "nitro instance already attached max ENIs",
+			instanceID:        "i-123456789abcdef01",
+			instanceType:      "t3.xlarge",
+			availabilityZone:  "us-west-2b",
+			region:            "us-west-2",
+			volumeAttachLimit: -1,
+			attachedENIs:      27,
+			blockDevices:      1,
+			expMaxVolumes:     0,
+			outpostArn:        emptyOutpostArn,
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {