Skip to content

upi/aws/cloudformation: Cap InfrastructureName at 27 chars #1706

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
May 3, 2019
Merged

upi/aws/cloudformation: Cap InfrastructureName at 27 chars #1706

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
16 changes: 8 additions & 8 deletions upi/aws/cloudformation/02_cluster_infra.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ Description: Template for Openshift Cluster UPI Network Elements (Route53 & LBs)

Parameters:
ClusterName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Cluster name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Cluster name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, representative cluster name to use for hostnames, etc.
Type: String
InfrastructureName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
Type: String
HostedZoneId:
Expand Down Expand Up @@ -72,15 +72,15 @@ Resources:
ExtApiElb:
Type: AWS::ElasticLoadBalancingV2::LoadBalancer
Properties:
Name: !Join ["-", ["api-ext", !Ref ClusterName, !Ref "AWS::Region"]]
Name: !Join ["-", [!Ref InfrastructureName, "ext"]]
IpAddressType: ipv4
Subnets: !Ref PublicSubnets
Type: network

IntApiElb:
Type: AWS::ElasticLoadBalancingV2::LoadBalancer
Properties:
Name: !Join ["-", ["api-int", !Ref ClusterName, !Ref "AWS::Region"]]
Name: !Join ["-", [!Ref InfrastructureName, "int"]]
Scheme: internal
IpAddressType: ipv4
Subnets: !Ref PrivateSubnets
Expand Down
6 changes: 3 additions & 3 deletions upi/aws/cloudformation/03_cluster_security.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Security Elements (Security Grou

Parameters:
InfrastructureName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
Type: String
VpcCidr:
Expand Down
6 changes: 3 additions & 3 deletions upi/aws/cloudformation/04_cluster_bootstrap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Bootstrap (EC2 Instance, Securit

Parameters:
InfrastructureName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, unique cluster ID used to tag cloud resources and identify items owned/used by the cluster.
Type: String
RhcosAmi:
Expand Down
6 changes: 3 additions & 3 deletions upi/aws/cloudformation/05_cluster_master_nodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Node Launch (EC2 master instance

Parameters:
InfrastructureName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, unique cluster ID used to tag nodes for the kubelet cloud provider.
Type: String
RhcosAmi:
Expand Down
6 changes: 3 additions & 3 deletions upi/aws/cloudformation/06_cluster_worker_node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Description: Template for Openshift Cluster UPI Node Launch (EC2 worker instance

Parameters:
InfrastructureName:
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,31})$
MaxLength: 32
AllowedPattern: ^([a-zA-Z][a-zA-Z0-9\-]{0,26})$
MaxLength: 27
MinLength: 1
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 32 characters
ConstraintDescription: Infrastructure name must be alphanumeric, start with a letter and a maximum of 27 characters
Description: A short, unique cluster ID used to tag nodes for the kubelet cloud provider.
Type: String
RhcosAmi:
Expand Down