Skip to content

Commit ffbfbf9

Browse files
committed
removed inline from policy table descriptions
1 parent 660f224 commit ffbfbf9

4 files changed

+47
-16
lines changed

modules/rosa-deleting-account-wide-iam-roles-and-policies.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ endif::[]
1111
[id="rosa-deleting-account-wide-iam-roles-and-policies_{context}"]
1212
= Deleting the account-wide IAM roles and policies
1313

14-
This section provides steps to delete the account-wide IAM roles and inline policies that you created for ROSA with STS deployments, along with the account-wide Operator policies. You can delete the account-wide AWS Identity and Access Management (IAM) roles and policies only after deleting all of the {product-title} (ROSA) with AWS Security Token Services (STS) clusters that depend on them.
14+
This section provides steps to delete the account-wide IAM roles and policies that you created for ROSA with STS deployments, along with the account-wide Operator policies. You can delete the account-wide AWS Identity and Access Management (IAM) roles and policies only after deleting all of the {product-title} (ROSA) with AWS Security Token Services (STS) clusters that depend on them.
1515

1616
[IMPORTANT]
1717
====

modules/rosa-sts-account-wide-roles-and-policies.adoc

Lines changed: 44 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
4545
|An IAM role used by the ROSA installer.
4646

4747
|`ManagedOpenShift-Installer-Role-Policy`
48-
|An inline IAM policy that provides the ROSA installer with the permissions required to complete cluster installation tasks.
48+
|An IAM policy that provides the ROSA installer with the permissions required to complete cluster installation tasks.
4949

5050
|===
5151

@@ -150,6 +150,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
150150
"ec2:DescribeVpcs",
151151
"ec2:DetachInternetGateway",
152152
"ec2:DisassociateRouteTable",
153+
"ec2:GetConsoleOutput",
153154
"ec2:GetEbsDefaultKmsKeyId",
154155
"ec2:ModifyInstanceAttribute",
155156
"ec2:ModifyNetworkInterfaceAttribute",
@@ -228,6 +229,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
228229
"s3:GetBucketLocation",
229230
"s3:GetBucketLogging",
230231
"s3:GetBucketObjectLockConfiguration",
232+
"s3:GetBucketReplication",
231233
"s3:GetBucketRequestPayment",
232234
"s3:GetBucketTagging",
233235
"s3:GetBucketVersioning",
@@ -247,6 +249,8 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
247249
"s3:PutObject",
248250
"s3:PutObjectAcl",
249251
"s3:PutObjectTagging",
252+
"servicequotas:GetServiceQuota",
253+
"servicequotas:ListAWSDefaultServiceQuotas",
250254
"sts:AssumeRole",
251255
"sts:AssumeRoleWithWebIdentity",
252256
"sts:GetCallerIdentity",
@@ -258,6 +262,8 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
258262
"ec2:DescribeVpcEndpointServicePermissions",
259263
"ec2:DescribeVpcEndpointServices",
260264
"ec2:ModifyVpcEndpointServicePermissions"
265+
"kms:DescribeKey",
266+
"cloudwatch:GetMetricData"
261267
],
262268
"Resource": "*"
263269
}
@@ -276,7 +282,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
276282
|An IAM role used by the ROSA control plane.
277283

278284
|`ManagedOpenShift-ControlPlane-Role-Policy`
279-
|An inline IAM policy that provides the ROSA control plane with the permissions required to manage its components.
285+
|An IAM policy that provides the ROSA control plane with the permissions required to manage its components.
280286

281287
|===
282288

@@ -371,7 +377,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
371377
|An IAM role used by the ROSA compute instances.
372378

373379
|`ManagedOpenShift-Worker-Role-Policy`
374-
|An inline IAM policy that provides the ROSA compute instances with the permissions required to manage their components.
380+
|An IAM policy that provides the ROSA compute instances with the permissions required to manage their components.
375381

376382
|===
377383

@@ -411,6 +417,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
411417
"Effect": "Allow",
412418
"Action": [
413419
"ec2:DescribeInstances"
420+
"ec2:DescribeRegions"
414421
],
415422
"Resource": "*"
416423
}
@@ -429,7 +436,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
429436
|An IAM role used by the Red Hat Site Reliability Engineering (SRE) support team.
430437

431438
|`ManagedOpenShift-Support-Role-Policy`
432-
|An inline IAM policy that provides the Red Hat SRE support team with the permissions required to support ROSA clusters.
439+
|An IAM policy that provides the Red Hat SRE support team with the permissions required to support ROSA clusters.
433440

434441
|===
435442

@@ -473,9 +480,15 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
473480
"cloudwatch:GetMetricData",
474481
"cloudwatch:GetMetricStatistics",
475482
"cloudwatch:ListMetrics",
483+
"ec2-instance-connect:SendSerialConsoleSSHPublicKey",
476484
"ec2:CopySnapshot",
485+
"ec2:CreateNetworkInsightsPath",
477486
"ec2:CreateSnapshot",
478487
"ec2:CreateSnapshots",
488+
"ec2:CreateTags",
489+
"ec2:DeleteNetworkInsightsAnalysis",
490+
"ec2:DeleteNetworkInsightsPath",
491+
"ec2:DeleteTags",
479492
"ec2:DescribeAccountAttributes",
480493
"ec2:DescribeAddresses",
481494
"ec2:DescribeAddressesAttribute",
@@ -495,27 +508,30 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
495508
"ec2:DescribeDhcpOptions",
496509
"ec2:DescribeEgressOnlyInternetGateways",
497510
"ec2:DescribeIamInstanceProfileAssociations",
498-
"ec2:DescribeIdFormat",
499511
"ec2:DescribeIdentityIdFormat",
512+
"ec2:DescribeIdFormat",
500513
"ec2:DescribeImageAttribute",
501514
"ec2:DescribeImages",
502515
"ec2:DescribeInstanceAttribute",
516+
"ec2:DescribeInstances",
503517
"ec2:DescribeInstanceStatus",
504518
"ec2:DescribeInstanceTypeOfferings",
505519
"ec2:DescribeInstanceTypes",
506-
"ec2:DescribeInstances",
507520
"ec2:DescribeInternetGateways",
508521
"ec2:DescribeIpv6Pools",
509522
"ec2:DescribeKeyPairs",
510523
"ec2:DescribeLaunchTemplates",
524+
"ec2:DescribeLocalGatewayRouteTables",
511525
"ec2:DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociations",
512526
"ec2:DescribeLocalGatewayRouteTableVpcAssociations",
513-
"ec2:DescribeLocalGatewayRouteTables",
527+
"ec2:DescribeLocalGateways",
514528
"ec2:DescribeLocalGatewayVirtualInterfaceGroups",
515529
"ec2:DescribeLocalGatewayVirtualInterfaces",
516-
"ec2:DescribeLocalGateways",
530+
"ec2:DescribeManagedPrefixLists",
517531
"ec2:DescribeNatGateways",
518532
"ec2:DescribeNetworkAcls",
533+
"ec2:DescribeNetworkInsightsAnalyses",
534+
"ec2:DescribeNetworkInsightsPaths",
519535
"ec2:DescribeNetworkInterfaces",
520536
"ec2:DescribePlacementGroups",
521537
"ec2:DescribePrefixLists",
@@ -526,6 +542,7 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
526542
"ec2:DescribeRouteTables",
527543
"ec2:DescribeScheduledInstances",
528544
"ec2:DescribeSecurityGroupReferences",
545+
"ec2:DescribeSecurityGroupRules",
529546
"ec2:DescribeSecurityGroups",
530547
"ec2:DescribeSnapshotAttribute",
531548
"ec2:DescribeSnapshots",
@@ -539,8 +556,8 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
539556
"ec2:DescribeTransitGatewayMulticastDomains",
540557
"ec2:DescribeTransitGatewayPeeringAttachments",
541558
"ec2:DescribeTransitGatewayRouteTables",
542-
"ec2:DescribeTransitGatewayVpcAttachments",
543559
"ec2:DescribeTransitGateways",
560+
"ec2:DescribeTransitGatewayVpcAttachments",
544561
"ec2:DescribeVolumeAttribute",
545562
"ec2:DescribeVolumeStatus",
546563
"ec2:DescribeVolumes",
@@ -559,17 +576,22 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
559576
"ec2:DescribeVpnConnections",
560577
"ec2:DescribeVpnGateways",
561578
"ec2:GetAssociatedIpv6PoolCidrs",
579+
"ec2:GetConsoleOutput",
580+
"ec2:GetManagedPrefixListEntries",
581+
"ec2:GetSerialConsoleAccessStatus",
562582
"ec2:GetTransitGatewayAttachmentPropagations",
563583
"ec2:GetTransitGatewayMulticastDomainAssociations",
564584
"ec2:GetTransitGatewayPrefixListReferences",
565585
"ec2:GetTransitGatewayRouteTableAssociations",
566586
"ec2:GetTransitGatewayRouteTablePropagations",
587+
"ec2:ModifyInstanceAttribute",
567588
"ec2:RebootInstances",
589+
"ec2:RunInstances",
568590
"ec2:SearchLocalGatewayRoutes",
569591
"ec2:SearchTransitGatewayMulticastGroups",
570592
"ec2:SearchTransitGatewayRoutes",
571-
"ec2:RunInstances",
572593
"ec2:StartInstances",
594+
"ec2:StartNetworkInsightsAnalysis",
573595
"ec2:StopInstances",
574596
"ec2:TerminateInstances",
575597
"elasticloadbalancing:ConfigureHealthCheck",
@@ -578,18 +600,18 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
578600
"elasticloadbalancing:DescribeListenerCertificates",
579601
"elasticloadbalancing:DescribeListeners",
580602
"elasticloadbalancing:DescribeLoadBalancerAttributes",
581-
"elasticloadbalancing:DescribeLoadBalancerAttributes",
582603
"elasticloadbalancing:DescribeLoadBalancerPolicies",
583604
"elasticloadbalancing:DescribeLoadBalancerPolicyTypes",
584605
"elasticloadbalancing:DescribeLoadBalancers",
585-
"elasticloadbalancing:DescribeLoadBalancers",
586606
"elasticloadbalancing:DescribeRules",
587607
"elasticloadbalancing:DescribeSSLPolicies",
588608
"elasticloadbalancing:DescribeTags",
589-
"elasticloadbalancing:DescribeTags",
590609
"elasticloadbalancing:DescribeTargetGroupAttributes",
591610
"elasticloadbalancing:DescribeTargetGroups",
592611
"elasticloadbalancing:DescribeTargetHealth",
612+
"iam:GetRole",
613+
"iam:ListRoles",
614+
"kms:CreateGrant",
593615
"route53:GetHostedZone",
594616
"route53:GetHostedZoneCount",
595617
"route53:ListHostedZones",
@@ -599,6 +621,10 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
599621
"s3:GetObjectAcl",
600622
"s3:GetObjectTagging",
601623
"s3:ListAllMyBuckets"
624+
"sts:DecodeAuthorizationMessage",
625+
"tiros:CreateQuery",
626+
"tiros:GetQueryAnswer",
627+
"tiros:GetQueryExplanation"
602628
],
603629
"Resource": "*"
604630
},
@@ -825,14 +851,19 @@ The account number present in the `sts_installer_trust_policy.json` and `sts_sup
825851
"s3:CreateBucket",
826852
"s3:DeleteBucket",
827853
"s3:PutBucketTagging",
854+
"s3:GetBucketTagging",
828855
"s3:PutBucketPublicAccessBlock",
856+
"s3:GetBucketPublicAccessBlock",
829857
"s3:PutEncryptionConfiguration",
858+
"s3:GetEncryptionConfiguration",
830859
"s3:PutLifecycleConfiguration",
860+
"s3:GetLifecycleConfiguration",
831861
"s3:GetBucketLocation",
832862
"s3:ListBucket",
833863
"s3:GetObject",
834864
"s3:PutObject",
835865
"s3:DeleteObject",
866+
"s3:ListBucketMultipartUploads",
836867
"s3:AbortMultipartUpload",
837868
"s3:ListMultipartUploadParts"
838869
],

modules/rosa-sts-creating-a-cluster-quickly-ocm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ rosa create cluster --sts
155155
<1> Specifies the prefix to include in the account-wide role and policy names. The default is `ManagedOpenShift`.
156156
<2> Optional: Specifies a permissions boundary Amazon Resource Name (ARN) for the roles. For more information, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html[Permissions boundaries for IAM entities] in the AWS documentation.
157157
<3> Selects the role creation mode. You can use `auto` mode to automatically create the account wide roles and policies.
158-
<4> Creates the account-wide installer, control plane, worker and support roles and corresponding inline IAM policies. For more information, see _Account-wide IAM role and policy reference_.
158+
<4> Creates the account-wide installer, control plane, worker and support roles and corresponding IAM policies. For more information, see _Account-wide IAM role and policy reference_.
159159
<5> Creates the cluster-specific Operator IAM roles that permit the ROSA cluster Operators to carry out core OpenShift functionality. For more information, see _Account-wide IAM role and policy reference_.
160160
.. On the *Accounts and roles* page, click *Refresh ARNs* and verify that the installer, support, worker, and control plane account roles are detected.
161161

modules/rosa-sts-creating-a-cluster-with-customizations-ocm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ rosa create cluster --sts
181181
<1> Specifies the prefix to include in the {cluster-manager} IAM role name. The default is `ManagedOpenShift`.
182182
<2> Optional: Specifies a permissions boundary Amazon Resource Name (ARN) for the role. For more information, see link:https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html[Permissions boundaries for IAM entities] in the AWS documentation.
183183
<3> Selects the role creation mode. You can use `auto` mode to automatically create the account wide roles and policies. In `manual` mode, the `rosa` CLI generates the `aws` commands needed to create the roles and policies. In `manual` mode, the corresponding policy JSON files are also saved to the current directory. `manual` mode enables you to review the details before running the `aws` commands manually.
184-
<4> Creates the account-wide installer, control plane, worker and support roles and corresponding inline IAM policies. For more information, see _Account-wide IAM role and policy reference_.
184+
<4> Creates the account-wide installer, control plane, worker and support roles and corresponding IAM policies. For more information, see _Account-wide IAM role and policy reference_.
185185
<5> Creates the cluster-specific Operator IAM roles that permit the ROSA cluster Operators to carry out core OpenShift functionality. For more information, see _Account-wide IAM role and policy reference_.
186186
.. On the *Accounts and roles* page, click *Refresh ARNs* and verify that the installer, support, worker, and control plane account roles are detected.
187187

0 commit comments

Comments
 (0)