Skip to content

OCPBUGS-65885: added 1.34 required ELBv2 perms to CCM role #7339

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
Jan 21, 2026
Merged

OCPBUGS-65885: added 1.34 required ELBv2 perms to CCM role #7339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f458160
fix(ccm): added required permissions to CCM policy
mtulio Dec 4, 2025
a87596c
docs(aws): required permissions on CCM to NLB TargetGroup
mtulio Dec 15, 2025
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
6 changes: 6 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 @@ -497,6 +497,9 @@ func (c *elbv2Client) DescribeLoadBalancerAttributesWithContext(ctx aws.Context,
func (c *elbv2Client) DescribeLoadBalancersWithContext(ctx aws.Context, input *elbv2.DescribeLoadBalancersInput, opts ...request.Option) (*elbv2.DescribeLoadBalancersOutput, error) {
return c.cloudController.elbv2Client.DescribeLoadBalancersWithContext(ctx, input, opts...)
}
func (c *elbv2Client) DescribeTargetGroupAttributesWithContext(ctx aws.Context, input *elbv2.DescribeTargetGroupAttributesInput, opts ...request.Option) (*elbv2.DescribeTargetGroupAttributesOutput, error) {
return c.cloudController.elbv2Client.DescribeTargetGroupAttributesWithContext(ctx, input, opts...)
}
func (c *elbv2Client) DescribeTargetGroupsWithContext(ctx aws.Context, input *elbv2.DescribeTargetGroupsInput, opts ...request.Option) (*elbv2.DescribeTargetGroupsOutput, error) {
return c.cloudController.elbv2Client.DescribeTargetGroupsWithContext(ctx, input, opts...)
}
Expand All @@ -512,6 +515,9 @@ func (c *elbv2Client) ModifyLoadBalancerAttributesWithContext(ctx aws.Context, i
func (c *elbv2Client) ModifyTargetGroupWithContext(ctx aws.Context, input *elbv2.ModifyTargetGroupInput, opts ...request.Option) (*elbv2.ModifyTargetGroupOutput, error) {
return c.cloudController.elbv2Client.ModifyTargetGroupWithContext(ctx, input, opts...)
}
func (c *elbv2Client) ModifyTargetGroupAttributesWithContext(ctx aws.Context, input *elbv2.ModifyTargetGroupAttributesInput, opts ...request.Option) (*elbv2.ModifyTargetGroupAttributesOutput, error) {
return c.cloudController.elbv2Client.ModifyTargetGroupAttributesWithContext(ctx, input, opts...)
}
func (c *elbv2Client) RegisterTargetsWithContext(ctx aws.Context, input *elbv2.RegisterTargetsInput, opts ...request.Option) (*elbv2.RegisterTargetsOutput, error) {
return c.cloudController.elbv2Client.RegisterTargetsWithContext(ctx, input, opts...)
}
Expand Down
2 changes: 2 additions & 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,9 +308,11 @@ func adjustAPIs(delegates aws.ServicesByDelegate) aws.ServicesByDelegate {
"DeregisterTargets",
"DescribeListeners",
"DescribeTargetGroups",
"DescribeTargetGroupAttributes",
"DescribeTargetHealth",
"ModifyListener",
"ModifyTargetGroup",
"ModifyTargetGroupAttributes",
),
"elbv2": sets.New(
"ApplySecurityGroupsToLoadBalancer",
Expand Down
103 changes: 79 additions & 24 deletions cmd/infra/aws/iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ var (
"elasticloadbalancing:DetachLoadBalancerFromSubnets",
"elasticloadbalancing:DeregisterInstancesFromLoadBalancer",
"elasticloadbalancing:ModifyLoadBalancerAttributes",
"elasticloadbalancing:ModifyTargetGroupAttributes",
"elasticloadbalancing:RegisterInstancesWithLoadBalancer",
"elasticloadbalancing:SetLoadBalancerPoliciesForBackendServer",
"elasticloadbalancing:AddTags",
Expand All @@ -201,6 +202,7 @@ var (
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
"elasticloadbalancing:DescribeTargetGroups",
"elasticloadbalancing:DescribeTargetGroupAttributes",
"elasticloadbalancing:DescribeTargetHealth",
"elasticloadbalancing:ModifyListener",
"elasticloadbalancing:ModifyTargetGroup",
Expand Down Expand Up @@ -897,33 +899,86 @@ func (o *CreateIAMOptions) CreateOIDCResources(ctx context.Context, iamClient ia
//
// Currently ingress operator managed policy is scoped to specific DNS domain names,
// which is why we need to create an additional policy on top to allow it to manage routes with the DNS basedomain specified by the CLI user.
policy := fmt.Sprintf(`{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"route53:ChangeResourceRecordSets"
],
"Resource": "*",
"Condition": {
"ForAllValues:StringLike": {
"route53:ChangeResourceRecordSetsNormalizedRecordNames": [
"*.%s"
]
}
ingressPolicyStatement := fmt.Sprintf(
`{
"Effect": "Allow",
"Action": [
"route53:ChangeResourceRecordSets"
],
"Resource": "*",
"Condition": {
"ForAllValues:StringLike": {
"route53:ChangeResourceRecordSetsNormalizedRecordNames": [
"*.%s"
]
}
}
]
}`, o.BaseDomain)

}`, o.BaseDomain)
ingressRoleName := output.Roles.IngressARN[strings.LastIndex(output.Roles.IngressARN, "/")+1:]
if _, err := iamClient.PutRolePolicyWithContext(ctx, &iam.PutRolePolicyInput{
PolicyName: aws.String(ingressRoleName),
RoleName: aws.String(ingressRoleName),
PolicyDocument: aws.String(policy),
}); err != nil {
return nil, fmt.Errorf("failed to create role policy %q: with permission policy %s: %v", ingressRoleName, policy, err)

// Cloud Controller Manager's (CCM) managed policy needs to be updated on ROSA to allow new permissions downstream controllers to work.
// The permissions are:
// - elasticloadbalancing:DescribeTargetGroupAttributes
// - elasticloadbalancing:ModifyTargetGroupAttributes
//
// https://issues.redhat.com/browse/OCPBUGS-65885
//
// This inline policy must be removed when the following issue is resolved:
// https://issues.redhat.com/browse/SREP-2895
// https://redhat-internal.slack.com/archives/C03SZLX3A10/p1765396356482459
ccmPolicyStatement := `{
"Effect": "Allow",
"Action": [
"elasticloadbalancing:DescribeTargetGroupAttributes",
"elasticloadbalancing:ModifyTargetGroupAttributes"
],
"Resource": "*"
}`
ccmRoleName := output.Roles.KubeCloudControllerARN[strings.LastIndex(output.Roles.KubeCloudControllerARN, "/")+1:]

// Create the inline policy optimizing the policy documents.
// If the roles are the same (shared role), create a merged policy document to prevent race condition when updating the roles.
if ingressRoleName == ccmRoleName {
if _, err := iamClient.PutRolePolicyWithContext(ctx, &iam.PutRolePolicyInput{
PolicyName: aws.String(ingressRoleName),
RoleName: aws.String(ingressRoleName),
PolicyDocument: aws.String(fmt.Sprintf(`{
"Version": "2012-10-17",
"Statement": [
%s,
%s
]
}`, ingressPolicyStatement, ccmPolicyStatement)),
}); err != nil {
return nil, fmt.Errorf("failed to create role policy %q: with permission policy %s: %v", ingressRoleName, ingressPolicyStatement, err)
}
logger.Info("Added inline shared policy to ROSA Managed Role", "role", ingressRoleName)
} else {
// Create the inline policy for the ingress role
if _, err := iamClient.PutRolePolicyWithContext(ctx, &iam.PutRolePolicyInput{
PolicyName: aws.String(ingressRoleName),
RoleName: aws.String(ingressRoleName),
PolicyDocument: aws.String(fmt.Sprintf(`{
"Version": "2012-10-17",
"Statement": [%s]
}`, ingressPolicyStatement)),
}); err != nil {
return nil, fmt.Errorf("failed to create role policy %q: with permission policy %s: %v", ingressRoleName, ingressPolicyStatement, err)
}
logger.Info("Added inline policy to ROSA Ingress Managed Role", "role", ingressRoleName)

// Create the inline policy for the Cloud Controller Manager role
if _, err := iamClient.PutRolePolicyWithContext(ctx, &iam.PutRolePolicyInput{
PolicyName: aws.String(ccmRoleName),
RoleName: aws.String(ccmRoleName),
PolicyDocument: aws.String(fmt.Sprintf(`{
"Version": "2012-10-17",
"Statement": [%s]
}`, ccmPolicyStatement)),
}); err != nil {
return nil, fmt.Errorf("failed to create role policy %q: with permission policy %s: %v", ccmRoleName, ccmPolicyStatement, err)
}
logger.Info("Added inline policy to ROSA Cloud Controller Manager Managed Role", "role", ccmRoleName)
}
}

Expand Down
2 changes: 2 additions & 0 deletions docs/content/reference/aggregated-docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41935,9 +41935,11 @@ And these are samples for each one of the roles Hypershift uses:
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
"elasticloadbalancing:DescribeTargetGroups",
"elasticloadbalancing:DescribeTargetGroupAttributes",
"elasticloadbalancing:DescribeTargetHealth",
"elasticloadbalancing:ModifyListener",
"elasticloadbalancing:ModifyTargetGroup",
"elasticloadbalancing:ModifyTargetGroupAttributes",
"elasticloadbalancing:RegisterTargets",
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
"iam:CreateServiceLinkedRole",
Expand Down
2 changes: 2 additions & 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 @@ -501,9 +501,11 @@ And these are samples for each one of the roles Hypershift uses:
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
"elasticloadbalancing:DescribeTargetGroups",
"elasticloadbalancing:DescribeTargetGroupAttributes",
"elasticloadbalancing:DescribeTargetHealth",
"elasticloadbalancing:ModifyListener",
"elasticloadbalancing:ModifyTargetGroup",
"elasticloadbalancing:ModifyTargetGroupAttributes",
"elasticloadbalancing:RegisterTargets",
"elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
"iam:CreateServiceLinkedRole",
Expand Down