Skip to content

SPLAT-2741: Add SetSecurityGroups perms for AWS CCM for BYO SG on AWS NLB #8401

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

Open
mfbonfigli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SPLAT-2741: Add SetSecurityGroups perms for AWS CCM for BYO SG on AWS NLB #8401

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
3 changes: 3 additions & 0 deletions cmd/infra/aws/delegating_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,9 @@ func (c *elasticloadbalancingv2Client) ModifyTargetGroupAttributes(ctx context.C
func (c *elasticloadbalancingv2Client) RegisterTargets(ctx context.Context, input *elasticloadbalancingv2.RegisterTargetsInput, optFns ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.RegisterTargetsOutput, error) {
return c.cloudController.elasticloadbalancingv2Client.RegisterTargets(ctx, input, optFns...)
}
func (c *elasticloadbalancingv2Client) SetSecurityGroups(ctx context.Context, input *elasticloadbalancingv2.SetSecurityGroupsInput, optFns ...func(*elasticloadbalancingv2.Options)) (*elasticloadbalancingv2.SetSecurityGroupsOutput, error) {
return c.cloudController.elasticloadbalancingv2Client.SetSecurityGroups(ctx, input, optFns...)
}

// route53Client delegates to individual component clients for API calls we know those components will have privileges to make.
type route53Client struct {
Expand Down
1 change: 1 addition & 0 deletions cmd/infra/aws/delegatingclientgenerator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ func adjustAPIs(delegates aws.ServicesByDelegate) aws.ServicesByDelegate {
"ModifyListener",
"ModifyTargetGroup",
"ModifyTargetGroupAttributes",
"SetSecurityGroups",
),
"elasticloadbalancingv2": sets.New(
"ApplySecurityGroupsToLoadBalancer",
Expand Down
5 changes: 4 additions & 1 deletion cmd/infra/aws/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ var (
"elasticloadbalancing:ModifyTargetGroup",
"elasticloadbalancing:RegisterTargets",
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
"elasticloadbalancing:SetSecurityGroups",
"iam:CreateServiceLinkedRole",
"kms:DescribeKey"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
],
Expand Down Expand Up @@ -936,6 +937,7 @@ func (o *CreateIAMOptions) CreateOIDCResources(ctx context.Context, iamClient aw
// The permissions are:
// - elasticloadbalancing:DescribeTargetGroupAttributes
// - elasticloadbalancing:ModifyTargetGroupAttributes
// - elasticloadbalancing:SetSecurityGroups
//
// https://issues.redhat.com/browse/OCPBUGS-65885
//
Expand All @@ -946,7 +948,8 @@ func (o *CreateIAMOptions) CreateOIDCResources(ctx context.Context, iamClient aw
"Effect": "Allow",
"Action": [
"elasticloadbalancing:DescribeTargetGroupAttributes",
"elasticloadbalancing:ModifyTargetGroupAttributes"
"elasticloadbalancing:ModifyTargetGroupAttributes",
"elasticloadbalancing:SetSecurityGroups"
],
"Resource": "*"
}`
Expand Down
1 change: 1 addition & 0 deletions docs/content/reference/aggregated-docs.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/content/reference/infrastructure/aws.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ And these are samples for each one of the roles Hypershift uses:
"elasticloadbalancing:ModifyTargetGroupAttributes",
"elasticloadbalancing:RegisterTargets",
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
"elasticloadbalancing:SetSecurityGroups",
"iam:CreateServiceLinkedRole",
"kms:DescribeKey"
],
Expand Down
1 change: 1 addition & 0 deletions support/awsapi/elasticloadbalancingv2.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.