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.

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

OCPBUGS-46596: aws/permissions - defaults ec2:DescribeInstanceTypeOfferings #9341

Merged
merged 1 commit into from
Jan 18, 2025
Merged
Changes from all commits
Commits
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
OCPBUGS-46596: aws/perm - default ec2:DescribeInstanceTypeOfferings
ec2:DescribeInstanceTypeOfferings is used by machine pools to discover
supported instance type in the region and zones, when it isn't set in
the pool (control plane, compute, or edge).

The discover falls back to the m6i which is supported in mostly regions,
althrough some regions (e.g. ap-southeast-4 and eu-south-2) will fail as
that tye isn't supported. To the discover mechanism works properly
globally the permission must be added by default.

This permission is missing since minimum permissions has been
introduced, currently only the edge pool is including this permission.
This change moves that requirement to default create group.
  • Loading branch information
mtulio committed Jan 2, 2025
commit 821b07b4f16b93edc4f10a0bf71640825aba2a6f
3 changes: 1 addition & 2 deletions pkg/asset/installconfig/aws/permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ var permissions = map[PermissionGroup][]string{
"ec2:DescribeInstanceAttribute",
"ec2:DescribeInstanceCreditSpecifications",
"ec2:DescribeInstances",
"ec2:DescribeInstanceTypeOfferings", // Needed to filter zones by instance type
"ec2:DescribeInternetGateways",
"ec2:DescribeKeyPairs",
"ec2:DescribeNatGateways",
Expand Down Expand Up @@ -333,8 +334,6 @@ var permissions = map[PermissionGroup][]string{
PermissionDefaultZones: {
// Needed to list the zones available in the region
"ec2:DescribeAvailabilityZones",
// Needed to filter zones by instance type
"ec2:DescribeInstanceTypeOfferings",
},
PermissionAssumeRole: {
// Needed so the installer can use the provided custom IAM role
Expand Down