Skip to content

Commit 2270604

Browse files
mtuliomtulio
committed
✨ edge subnets/clusteradm/policy: add Carrier Gateway operations
Add IAM policy on cloudformation templates for clusterawsadm to manipulate gateways in Wavelength zone: carrier gateway.
1 parent a2c8ae7 commit 2270604

15 files changed

+45
-0
lines changed

‎cmd/clusterawsadm/cloudformation/bootstrap/cluster_api_controller.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
9292
"ec2:AssociateRouteTable",
9393
"ec2:AttachInternetGateway",
9494
"ec2:AuthorizeSecurityGroupIngress",
95+
"ec2:CreateCarrierGateway",
9596
"ec2:CreateInternetGateway",
9697
"ec2:CreateEgressOnlyInternetGateway",
9798
"ec2:CreateNatGateway",
@@ -105,6 +106,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
105106
"ec2:CreateVpcEndpoint",
106107
"ec2:ModifyVpcAttribute",
107108
"ec2:ModifyVpcEndpoint",
109+
"ec2:DeleteCarrierGateway",
108110
"ec2:DeleteInternetGateway",
109111
"ec2:DeleteEgressOnlyInternetGateway",
110112
"ec2:DeleteNatGateway",
@@ -118,6 +120,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
118120
"ec2:DescribeAccountAttributes",
119121
"ec2:DescribeAddresses",
120122
"ec2:DescribeAvailabilityZones",
123+
"ec2:DescribeCarrierGateways",
121124
"ec2:DescribeInstances",
122125
"ec2:DescribeInstanceTypes",
123126
"ec2:DescribeInternetGateways",

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/customsuffix.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/default.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_all_secret_backends.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Resources:
157157
- ec2:AssociateRouteTable
158158
- ec2:AttachInternetGateway
159159
- ec2:AuthorizeSecurityGroupIngress
160+
- ec2:CreateCarrierGateway
160161
- ec2:CreateInternetGateway
161162
- ec2:CreateEgressOnlyInternetGateway
162163
- ec2:CreateNatGateway
@@ -170,6 +171,7 @@ Resources:
170171
- ec2:CreateVpcEndpoint
171172
- ec2:ModifyVpcAttribute
172173
- ec2:ModifyVpcEndpoint
174+
- ec2:DeleteCarrierGateway
173175
- ec2:DeleteInternetGateway
174176
- ec2:DeleteEgressOnlyInternetGateway
175177
- ec2:DeleteNatGateway
@@ -183,6 +185,7 @@ Resources:
183185
- ec2:DescribeAccountAttributes
184186
- ec2:DescribeAddresses
185187
- ec2:DescribeAvailabilityZones
188+
- ec2:DescribeCarrierGateways
186189
- ec2:DescribeInstances
187190
- ec2:DescribeInstanceTypes
188191
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_allow_assume_role.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_bootstrap_user.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Resources:
157157
- ec2:AssociateRouteTable
158158
- ec2:AttachInternetGateway
159159
- ec2:AuthorizeSecurityGroupIngress
160+
- ec2:CreateCarrierGateway
160161
- ec2:CreateInternetGateway
161162
- ec2:CreateEgressOnlyInternetGateway
162163
- ec2:CreateNatGateway
@@ -170,6 +171,7 @@ Resources:
170171
- ec2:CreateVpcEndpoint
171172
- ec2:ModifyVpcAttribute
172173
- ec2:ModifyVpcEndpoint
174+
- ec2:DeleteCarrierGateway
173175
- ec2:DeleteInternetGateway
174176
- ec2:DeleteEgressOnlyInternetGateway
175177
- ec2:DeleteNatGateway
@@ -183,6 +185,7 @@ Resources:
183185
- ec2:DescribeAccountAttributes
184186
- ec2:DescribeAddresses
185187
- ec2:DescribeAvailabilityZones
188+
- ec2:DescribeCarrierGateways
186189
- ec2:DescribeInstances
187190
- ec2:DescribeInstanceTypes
188191
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_custom_bootstrap_user.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ Resources:
157157
- ec2:AssociateRouteTable
158158
- ec2:AttachInternetGateway
159159
- ec2:AuthorizeSecurityGroupIngress
160+
- ec2:CreateCarrierGateway
160161
- ec2:CreateInternetGateway
161162
- ec2:CreateEgressOnlyInternetGateway
162163
- ec2:CreateNatGateway
@@ -170,6 +171,7 @@ Resources:
170171
- ec2:CreateVpcEndpoint
171172
- ec2:ModifyVpcAttribute
172173
- ec2:ModifyVpcEndpoint
174+
- ec2:DeleteCarrierGateway
173175
- ec2:DeleteInternetGateway
174176
- ec2:DeleteEgressOnlyInternetGateway
175177
- ec2:DeleteNatGateway
@@ -183,6 +185,7 @@ Resources:
183185
- ec2:DescribeAccountAttributes
184186
- ec2:DescribeAddresses
185187
- ec2:DescribeAvailabilityZones
188+
- ec2:DescribeCarrierGateways
186189
- ec2:DescribeInstances
187190
- ec2:DescribeInstanceTypes
188191
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_different_instance_profiles.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_console.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

‎cmd/clusterawsadm/cloudformation/bootstrap/fixtures/with_eks_default_roles.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ Resources:
151151
- ec2:AssociateRouteTable
152152
- ec2:AttachInternetGateway
153153
- ec2:AuthorizeSecurityGroupIngress
154+
- ec2:CreateCarrierGateway
154155
- ec2:CreateInternetGateway
155156
- ec2:CreateEgressOnlyInternetGateway
156157
- ec2:CreateNatGateway
@@ -164,6 +165,7 @@ Resources:
164165
- ec2:CreateVpcEndpoint
165166
- ec2:ModifyVpcAttribute
166167
- ec2:ModifyVpcEndpoint
168+
- ec2:DeleteCarrierGateway
167169
- ec2:DeleteInternetGateway
168170
- ec2:DeleteEgressOnlyInternetGateway
169171
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DescribeAccountAttributes
178180
- ec2:DescribeAddresses
179181
- ec2:DescribeAvailabilityZones
182+
- ec2:DescribeCarrierGateways
180183
- ec2:DescribeInstances
181184
- ec2:DescribeInstanceTypes
182185
- ec2:DescribeInternetGateways

0 commit comments

Comments
 (0)