Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

c6i.metal and g5g.metal are nitro instances #1358

Merged
merged 1 commit into from
Aug 24, 2022
+1 −12
Merged

c6i.metal and g5g.metal are nitro instances #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions pkg/cloud/volume_limits.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ const (
nitroMaxAttachments = 28
)

// / It is possible to have an instance family where the virtualized instances are Nitro
// / and metal instances are not
var nonNitroInstances = map[string]struct{}{
"c6i.metal": {},
"g5g.metal": {},
}

// / List of nitro instance types can be found here: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances
var nonNitroInstanceFamilies = map[string]struct{}{
"t2": {},
Expand All @@ -41,10 +34,6 @@ var nonNitroInstanceFamilies = map[string]struct{}{
}

func IsNitroInstanceType(it string) bool {
if _, ok := nonNitroInstances[it]; ok {
return false
}

strs := strings.Split(it, ".")

if len(strs) != 2 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/driver/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,7 @@ func TestNodeGetInfo(t *testing.T) {
region: "us-west-2",
volumeAttachLimit: -1,
attachedENIs: 1,
expMaxVolumes: 31,
expMaxVolumes: 27, // 28 (max) - 1 (eni)
outpostArn: emptyOutpostArn,
},
{
Expand Down