Skip to content

Commit 3176fea

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4577 from vincepri/s3-endpoint
When using an s3 bucket, add a vpc endpoint
2 parents 07e91d2 + f39187f commit 3176fea

25 files changed

+331
-3
lines changed

‎api/v1beta2/conditions_consts.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ const (
8787
RouteTableReconciliationFailedReason = "RouteTableReconciliationFailed"
8888
)
8989

90+
const (
91+
// VpcEndpointsReadyCondition reports successful reconciliation of vpc endpoints.
92+
// Only applicable to managed clusters.
93+
VpcEndpointsReadyCondition clusterv1.ConditionType = "VpcEndpointsReadyCondition"
94+
// VpcEndpointsReconciliationFailedReason used when any errors occur during reconciliation of vpc endpoints.
95+
VpcEndpointsReconciliationFailedReason = "VpcEndpointsReconciliationFailed"
96+
)
97+
9098
const (
9199
// SecondaryCidrsReadyCondition reports successful reconciliation of secondary CIDR blocks.
92100
// Only applicable to managed clusters.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
102102
"ec2:CreateSubnet",
103103
"ec2:CreateTags",
104104
"ec2:CreateVpc",
105+
"ec2:CreateVpcEndpoint",
105106
"ec2:ModifyVpcAttribute",
107+
"ec2:ModifyVpcEndpoint",
106108
"ec2:DeleteInternetGateway",
107109
"ec2:DeleteEgressOnlyInternetGateway",
108110
"ec2:DeleteNatGateway",
@@ -112,6 +114,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
112114
"ec2:DeleteSubnet",
113115
"ec2:DeleteTags",
114116
"ec2:DeleteVpc",
117+
"ec2:DeleteVpcEndpoints",
115118
"ec2:DescribeAccountAttributes",
116119
"ec2:DescribeAddresses",
117120
"ec2:DescribeAvailabilityZones",
@@ -129,6 +132,7 @@ func (t Template) ControllersPolicy() *iamv1.PolicyDocument {
129132
"ec2:DescribeSubnets",
130133
"ec2:DescribeVpcs",
131134
"ec2:DescribeVpcAttribute",
135+
"ec2:DescribeVpcEndpoints",
132136
"ec2:DescribeVolumes",
133137
"ec2:DescribeTags",
134138
"ec2:DetachInternetGateway",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ Resources:
167167
- ec2:CreateSubnet
168168
- ec2:CreateTags
169169
- ec2:CreateVpc
170+
- ec2:CreateVpcEndpoint
170171
- ec2:ModifyVpcAttribute
172+
- ec2:ModifyVpcEndpoint
171173
- ec2:DeleteInternetGateway
172174
- ec2:DeleteEgressOnlyInternetGateway
173175
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DeleteSubnet
178180
- ec2:DeleteTags
179181
- ec2:DeleteVpc
182+
- ec2:DeleteVpcEndpoints
180183
- ec2:DescribeAccountAttributes
181184
- ec2:DescribeAddresses
182185
- ec2:DescribeAvailabilityZones
@@ -194,6 +197,7 @@ Resources:
194197
- ec2:DescribeSubnets
195198
- ec2:DescribeVpcs
196199
- ec2:DescribeVpcAttribute
200+
- ec2:DescribeVpcEndpoints
197201
- ec2:DescribeVolumes
198202
- ec2:DescribeTags
199203
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ Resources:
167167
- ec2:CreateSubnet
168168
- ec2:CreateTags
169169
- ec2:CreateVpc
170+
- ec2:CreateVpcEndpoint
170171
- ec2:ModifyVpcAttribute
172+
- ec2:ModifyVpcEndpoint
171173
- ec2:DeleteInternetGateway
172174
- ec2:DeleteEgressOnlyInternetGateway
173175
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DeleteSubnet
178180
- ec2:DeleteTags
179181
- ec2:DeleteVpc
182+
- ec2:DeleteVpcEndpoints
180183
- ec2:DescribeAccountAttributes
181184
- ec2:DescribeAddresses
182185
- ec2:DescribeAvailabilityZones
@@ -194,6 +197,7 @@ Resources:
194197
- ec2:DescribeSubnets
195198
- ec2:DescribeVpcs
196199
- ec2:DescribeVpcAttribute
200+
- ec2:DescribeVpcEndpoints
197201
- ec2:DescribeVolumes
198202
- ec2:DescribeTags
199203
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ Resources:
167167
- ec2:CreateSubnet
168168
- ec2:CreateTags
169169
- ec2:CreateVpc
170+
- ec2:CreateVpcEndpoint
170171
- ec2:ModifyVpcAttribute
172+
- ec2:ModifyVpcEndpoint
171173
- ec2:DeleteInternetGateway
172174
- ec2:DeleteEgressOnlyInternetGateway
173175
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DeleteSubnet
178180
- ec2:DeleteTags
179181
- ec2:DeleteVpc
182+
- ec2:DeleteVpcEndpoints
180183
- ec2:DescribeAccountAttributes
181184
- ec2:DescribeAddresses
182185
- ec2:DescribeAvailabilityZones
@@ -194,6 +197,7 @@ Resources:
194197
- ec2:DescribeSubnets
195198
- ec2:DescribeVpcs
196199
- ec2:DescribeVpcAttribute
200+
- ec2:DescribeVpcEndpoints
197201
- ec2:DescribeVolumes
198202
- ec2:DescribeTags
199203
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ Resources:
167167
- ec2:CreateSubnet
168168
- ec2:CreateTags
169169
- ec2:CreateVpc
170+
- ec2:CreateVpcEndpoint
170171
- ec2:ModifyVpcAttribute
172+
- ec2:ModifyVpcEndpoint
171173
- ec2:DeleteInternetGateway
172174
- ec2:DeleteEgressOnlyInternetGateway
173175
- ec2:DeleteNatGateway
@@ -177,6 +179,7 @@ Resources:
177179
- ec2:DeleteSubnet
178180
- ec2:DeleteTags
179181
- ec2:DeleteVpc
182+
- ec2:DeleteVpcEndpoints
180183
- ec2:DescribeAccountAttributes
181184
- ec2:DescribeAddresses
182185
- ec2:DescribeAvailabilityZones
@@ -194,6 +197,7 @@ Resources:
194197
- ec2:DescribeSubnets
195198
- ec2:DescribeVpcs
196199
- ec2:DescribeVpcAttribute
200+
- ec2:DescribeVpcEndpoints
197201
- ec2:DescribeVolumes
198202
- ec2:DescribeTags
199203
- ec2:DetachInternetGateway

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ Resources:
161161
- ec2:CreateSubnet
162162
- ec2:CreateTags
163163
- ec2:CreateVpc
164+
- ec2:CreateVpcEndpoint
164165
- ec2:ModifyVpcAttribute
166+
- ec2:ModifyVpcEndpoint
165167
- ec2:DeleteInternetGateway
166168
- ec2:DeleteEgressOnlyInternetGateway
167169
- ec2:DeleteNatGateway
@@ -171,6 +173,7 @@ Resources:
171173
- ec2:DeleteSubnet
172174
- ec2:DeleteTags
173175
- ec2:DeleteVpc
176+
- ec2:DeleteVpcEndpoints
174177
- ec2:DescribeAccountAttributes
175178
- ec2:DescribeAddresses
176179
- ec2:DescribeAvailabilityZones
@@ -188,6 +191,7 @@ Resources:
188191
- ec2:DescribeSubnets
189192
- ec2:DescribeVpcs
190193
- ec2:DescribeVpcAttribute
194+
- ec2:DescribeVpcEndpoints
191195
- ec2:DescribeVolumes
192196
- ec2:DescribeTags
193197
- ec2:DetachInternetGateway

0 commit comments

Comments
 (0)