Skip to content

ROSAENG-906: Request AWS additional SQS permissions for ROSA Managed Policies (Spot Instance Support) #2782

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

Merged
openshift-merge-bot merged 2 commits into from
Jun 15, 2026
Merged

ROSAENG-906: Request AWS additional SQS permissions for ROSA Managed Policies (Spot Instance Support) #2782

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d554aa6
Inital commit
ratnam915 Jun 9, 2026
2556aad
Removing fedramp changes
ratnam915 Jun 9, 2026
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
16 changes: 16 additions & 0 deletions ...sts/4.14/fedramp-hypershift/openshift_hcp_capa_controller_manager_credentials_policy.json
View file
Open in desktop

@joshbranham joshbranham Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this change, FedRAMP uses the same managed policies from AWS, unsure why this file is here.

@ratnam915 ratnam915 Jun 9, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,22 @@
}
}
},
{
"Sid": "NodePoolSQSActions",
"Effect": "Allow",
"Action": [
"sqs:DeleteMessage",
"sqs:ReceiveMessage"
],
"Resource": [
"arn:aws-us-gov:sqs:*:*:*"
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/red-hat": "true"
}
}
},
{
"Sid": "ManagedKMSRestrictedResourceTag",
"Effect": "Allow",
Expand Down
16 changes: 16 additions & 0 deletions resources/sts/hypershift/openshift_hcp_capa_controller_manager_credentials_policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,22 @@
}
}
},
{
"Sid": "NodePoolSQSActions",
"Effect": "Allow",
"Action": [
"sqs:DeleteMessage",
"sqs:ReceiveMessage"
],
"Resource": [
"arn:aws:sqs:*:*:*"
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/red-hat": "true"

@rafael-azevedo rafael-azevedo Jun 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why red-hat resource tag versus the "aws:ResourceTag/red-hat-managed": "true" in this case ?

@ratnam915 ratnam915 Jun 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rafael-azevedo : The SQS queues for the spot termination handler are created by HyperShift at runtime specifically for the Node Termination Handler. The red-hat-managed tag is used for infrastructure resources (EC2 instances, security groups, network interfaces) that are created during cluster provisioning and managed as part of the cluster lifecycle.

The red-hat tag is already an established pattern in this same policy for non-infrastructure resources — see the ManagedKMSRestrictedResourceTag and CreateGrantRestricted statements which use aws:ResourceTag/red-hat: true for KMS keys. The SQS queues follow the same pattern since they are operator-managed resources, not cluster infrastructure.

}
}
},
{
"Sid": "ManagedKMSRestrictedResourceTag",
"Effect": "Allow",
Expand Down