Skip to content

Bug 1882855: ci-operator/step-registry/ipi/conf/aws/blackholenetwork: Add ELB endpoint #12263

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-robot merged 1 commit into from
Sep 29, 2020
Merged

Bug 1882855: ci-operator/step-registry/ipi/conf/aws/blackholenetwork: Add ELB endpoint #12263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 29 additions & 3 deletions ci-operator/step-registry/ipi/conf/aws/blackholenetwork/blackhole_vpc_yaml.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ Resources:
Properties:
SubnetId: !Ref PrivateSubnet3
RouteTableId: !Ref PrivateRouteTable3
EC2EndpointSecurityGroup:
HTTPSSecurityGroup:
Type: AWS::EC2::SecurityGroup
Properties:
GroupDescription: EC2 Endpoint Security Group
GroupDescription: HTTPS Security Group
SecurityGroupIngress:
- IpProtocol: tcp
FromPort: 443
Expand All @@ -197,7 +197,7 @@ Resources:
- '*'
PrivateDnsEnabled: "true"
SecurityGroupIds:
- !Ref EC2EndpointSecurityGroup
- !Ref HTTPSSecurityGroup
ServiceName: !Join
- ''
- - com.amazonaws.
Expand All @@ -209,6 +209,32 @@ Resources:
- !If [DoAz3, !Ref PublicSubnet3, !Ref "AWS::NoValue"]
VpcEndpointType: Interface
VpcId: !Ref VPC
ELBEndpoint:
Type: AWS::EC2::VPCEndpoint
Properties:
PolicyDocument:
Version: 2012-10-17
Statement:
- Effect: Allow
Principal: '*'
Action:
- '*'
Resource:
- '*'
PrivateDnsEnabled: "true"
SecurityGroupIds:
- !Ref HTTPSSecurityGroup
ServiceName: !Join
- ''
- - com.amazonaws.
- !Ref 'AWS::Region'
- .elasticloadbalancing
SubnetIds:
- !Ref PublicSubnet
- !If [DoAz2, !Ref PublicSubnet2, !Ref "AWS::NoValue"]
- !If [DoAz3, !Ref PublicSubnet3, !Ref "AWS::NoValue"]
VpcEndpointType: Interface
VpcId: !Ref VPC
S3Endpoint:
Type: AWS::EC2::VPCEndpoint
Properties:
Expand Down
1 change: 0 additions & 1 deletion ci-operator/step-registry/openshift/e2e/aws/proxy/openshift-e2e-aws-proxy-workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ workflow:
Image append should create images by appending them\|
Image info should display information about images\|
Internal connectivity for TCP and UDP on ports 9000-9999 is allowed\|
Managed cluster should have machine resources\|
Managed cluster should should expose cluster services outside the cluster\|
Networking should provide Internet connection for containers\|
The HAProxy router should respond with 503 to unrecognized hosts\|
Expand Down