Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions data/data/aws/vpc/vpc.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ resource "aws_vpc" "new_vpc" {
)
}

resource "aws_vpc_endpoint" "elasticloadbalancing" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So i don't think we should be creating these endpoints in IPI as they don't provide great value to the cluster.

If they do, let's start a general discussion about these elsewhere, github issue / enhacements.

count = var.vpc == null ? 1 : 0

vpc_id = data.aws_vpc.cluster_vpc.id
service_name = "com.amazonaws.${var.region}.elasticloadbalancing"
route_table_ids = concat(
aws_route_table.private_routes.*.id,
aws_route_table.default.*.id,
)
}

resource "aws_vpc_endpoint" "s3" {
count = var.vpc == null ? 1 : 0

Expand Down
Binary file modified docs/user/aws/images/install_upi.dia
Binary file not shown.
18 changes: 15 additions & 3 deletions docs/user/aws/images/install_upi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions docs/user/aws/images/install_upi_vpc.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions upi/aws/cloudformation/01_vpc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,29 @@ Resources:
DestinationCidrBlock: 0.0.0.0/0
NatGatewayId:
Ref: NAT3
LoadBalancingEndpoint:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again this UPI templates are reference only. And I don't think we allow special env setup to handle these and not add these for all.

This is not required for openshift clusters and don't provide value.

Type: AWS::EC2::VPCEndpoint
Properties:
PolicyDocument:
Version: 2012-10-17
Statement:
- Effect: Allow
Principal: '*'
Action:
- '*'
Resource:
- '*'
RouteTableIds:
- !Ref PublicRouteTable
- !Ref PrivateRouteTable
- !If [DoAz2, !Ref PrivateRouteTable2, !Ref "AWS::NoValue"]
- !If [DoAz3, !Ref PrivateRouteTable3, !Ref "AWS::NoValue"]
ServiceName: !Join
- ''
- - com.amazonaws.
- !Ref 'AWS::Region'
- .elasticloadbalancing
VpcId: !Ref VPC
S3Endpoint:
Type: AWS::EC2::VPCEndpoint
Properties:
Expand Down