Skip to content

Commit

Permalink
[Security] * - Update Amazon Linux 2 to 2.0.20190508 and ECS optimize…
Browse files Browse the repository at this point in the history 
…d Amazon Linux 2 to 2.0.20190618 (widdix#334)
  • Loading branch information
@michaelwittig
michaelwittig authored Jul 18, 2019
1 parent 7e67047 commit 4494093
Show file tree
Hide file tree
Showing 15 changed files with 168 additions and 150 deletions.
2 changes: 1 addition & 1 deletion ec2/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ To update the region map execute the following lines in your terminal:

```
$ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190508-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
34 changes: 18 additions & 16 deletions ec2/ec2-auto-recovery.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,37 +142,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-1fb13961'
AMI: 'ami-3f36be41'
'ap-south-1':
AMI: 'ami-00e782930f1c3dbc7'
AMI: 'ami-0d2692b6acea72ee6'
'eu-west-3':
AMI: 'ami-0ebb3a801d5fb8b9b'
AMI: 'ami-0adcddd3324248c4c'
'eu-west-2':
AMI: 'ami-0009a33f033d8b7b6'
AMI: 'ami-0d8e27447ec2c8410'
'eu-west-1':
AMI: 'ami-030dbca661d402413'
AMI: 'ami-0bbc25e23a7640b9b'
'ap-northeast-2':
AMI: 'ami-08ab3f7e72215fe91'
AMI: 'ami-095ca789e0549777d'
'ap-northeast-1':
AMI: 'ami-00d101850e971728d'
AMI: 'ami-0c3fd0f5d33134a76'
'sa-east-1':
AMI: 'ami-058141e091292ecf0'
AMI: 'ami-058943e7d9b9cabfb'
'ca-central-1':
AMI: 'ami-08a9b721ecc5b0a53'
AMI: 'ami-0d4ae09ec9361d8ac'
'ap-east-1':
AMI: 'ami-570c7726'
'ap-southeast-1':
AMI: 'ami-0b5a47f8865280111'
AMI: 'ami-01f7527546b557442'
'ap-southeast-2':
AMI: 'ami-0fb7513bcdc525c3b'
AMI: 'ami-0dc96254d5535925f'
'eu-central-1':
AMI: 'ami-0ebe657bc328d4e82'
AMI: 'ami-0cc293023f983ed53'
'us-east-1':
AMI: 'ami-0c6b1d09930fac512'
AMI: 'ami-0b898040803850657'
'us-east-2':
AMI: 'ami-0ebbf2179e615c338'
AMI: 'ami-0d8f6eb4f641ef691'
'us-west-1':
AMI: 'ami-015954d5e5548d13b'
AMI: 'ami-056ee704806822732'
'us-west-2':
AMI: 'ami-0cb72367e98845d43'
AMI: 'ami-082b5a644766e0e6f'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion ecs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ To update the region map execute the following lines in your terminal:

```
$ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20190510-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-ecs-hvm-2.0.20190709-x86_64-ebs" --query "Images[0].ImageId" --output "text"); printf "'$region':\n ECSAMI: '$ami'\n"; done
```
34 changes: 18 additions & 16 deletions ecs/cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,37 +201,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
ECSAMI: 'ami-0dddc4daca44e6e99'
ECSAMI: 'ami-059aa04f0c253ad6b'
'ap-south-1':
ECSAMI: 'ami-04322e867758d97a8'
ECSAMI: 'ami-0a8bf4e187339e2c1'
'eu-west-3':
ECSAMI: 'ami-07273195833e4f20c'
ECSAMI: 'ami-0d260f3e5ccd06043'
'eu-west-2':
ECSAMI: 'ami-0204aa6a92a54561e'
ECSAMI: 'ami-0de1dc478496a9e9b'
'eu-west-1':
ECSAMI: 'ami-0c5abd45f676aab4f'
ECSAMI: 'ami-0ae254c8a2d3346a7'
'ap-northeast-2':
ECSAMI: 'ami-08834c8c57e502d6d'
ECSAMI: 'ami-0accbb5aa909be7bf'
'ap-northeast-1':
ECSAMI: 'ami-0e52aad6ac7733a6a'
ECSAMI: 'ami-04a735b489d2a0320'
'sa-east-1':
ECSAMI: 'ami-00d851648873aaabc'
ECSAMI: 'ami-038707d64e5b8e7ba'
'ca-central-1':
ECSAMI: 'ami-0498c464ec4d2ba83'
ECSAMI: 'ami-01c07ee95e77abba8'
'ap-east-1':
ECSAMI: 'ami-02252d984c7e3595d'
'ap-southeast-1':
ECSAMI: 'ami-0047bfdb16f1f6781'
ECSAMI: 'ami-05c6d22d98f97471c'
'ap-southeast-2':
ECSAMI: 'ami-09475847322e5566f'
ECSAMI: 'ami-039bb4c3a7946ce19'
'eu-central-1':
ECSAMI: 'ami-096a38c97b80cd8ec'
ECSAMI: 'ami-0650e7d86452db33b'
'us-east-1':
ECSAMI: 'ami-00cf4737e238866a3'
ECSAMI: 'ami-0fac5486e4cff37f4'
'us-east-2':
ECSAMI: 'ami-012ca23958772cf72'
ECSAMI: 'ami-0dca97e7cde7be3d5'
'us-west-1':
ECSAMI: 'ami-06d87f0156b1d4407'
ECSAMI: 'ami-0c6e63b58aac1048e'
'us-west-2':
ECSAMI: 'ami-0a9f5be2a016dccad'
ECSAMI: 'ami-0e5e051fd0b505db6'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion jenkins/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ To update the region map execute the following lines in your terminal:

```
$ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190508-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
34 changes: 18 additions & 16 deletions jenkins/jenkins2-ha-agents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,37 +206,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-1fb13961'
AMI: 'ami-3f36be41'
'ap-south-1':
AMI: 'ami-00e782930f1c3dbc7'
AMI: 'ami-0d2692b6acea72ee6'
'eu-west-3':
AMI: 'ami-0ebb3a801d5fb8b9b'
AMI: 'ami-0adcddd3324248c4c'
'eu-west-2':
AMI: 'ami-0009a33f033d8b7b6'
AMI: 'ami-0d8e27447ec2c8410'
'eu-west-1':
AMI: 'ami-030dbca661d402413'
AMI: 'ami-0bbc25e23a7640b9b'
'ap-northeast-2':
AMI: 'ami-08ab3f7e72215fe91'
AMI: 'ami-095ca789e0549777d'
'ap-northeast-1':
AMI: 'ami-00d101850e971728d'
AMI: 'ami-0c3fd0f5d33134a76'
'sa-east-1':
AMI: 'ami-058141e091292ecf0'
AMI: 'ami-058943e7d9b9cabfb'
'ca-central-1':
AMI: 'ami-08a9b721ecc5b0a53'
AMI: 'ami-0d4ae09ec9361d8ac'
'ap-east-1':
AMI: 'ami-570c7726'
'ap-southeast-1':
AMI: 'ami-0b5a47f8865280111'
AMI: 'ami-01f7527546b557442'
'ap-southeast-2':
AMI: 'ami-0fb7513bcdc525c3b'
AMI: 'ami-0dc96254d5535925f'
'eu-central-1':
AMI: 'ami-0ebe657bc328d4e82'
AMI: 'ami-0cc293023f983ed53'
'us-east-1':
AMI: 'ami-0c6b1d09930fac512'
AMI: 'ami-0b898040803850657'
'us-east-2':
AMI: 'ami-0ebbf2179e615c338'
AMI: 'ami-0d8f6eb4f641ef691'
'us-west-1':
AMI: 'ami-015954d5e5548d13b'
AMI: 'ami-056ee704806822732'
'us-west-2':
AMI: 'ami-0cb72367e98845d43'
AMI: 'ami-082b5a644766e0e6f'
Conditions:
HasZeroAgents: !Equals [!Ref AgentMinSize, '0']
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
Expand Down
34 changes: 18 additions & 16 deletions jenkins/jenkins2-ha.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,37 +146,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-1fb13961'
AMI: 'ami-3f36be41'
'ap-south-1':
AMI: 'ami-00e782930f1c3dbc7'
AMI: 'ami-0d2692b6acea72ee6'
'eu-west-3':
AMI: 'ami-0ebb3a801d5fb8b9b'
AMI: 'ami-0adcddd3324248c4c'
'eu-west-2':
AMI: 'ami-0009a33f033d8b7b6'
AMI: 'ami-0d8e27447ec2c8410'
'eu-west-1':
AMI: 'ami-030dbca661d402413'
AMI: 'ami-0bbc25e23a7640b9b'
'ap-northeast-2':
AMI: 'ami-08ab3f7e72215fe91'
AMI: 'ami-095ca789e0549777d'
'ap-northeast-1':
AMI: 'ami-00d101850e971728d'
AMI: 'ami-0c3fd0f5d33134a76'
'sa-east-1':
AMI: 'ami-058141e091292ecf0'
AMI: 'ami-058943e7d9b9cabfb'
'ca-central-1':
AMI: 'ami-08a9b721ecc5b0a53'
AMI: 'ami-0d4ae09ec9361d8ac'
'ap-east-1':
AMI: 'ami-570c7726'
'ap-southeast-1':
AMI: 'ami-0b5a47f8865280111'
AMI: 'ami-01f7527546b557442'
'ap-southeast-2':
AMI: 'ami-0fb7513bcdc525c3b'
AMI: 'ami-0dc96254d5535925f'
'eu-central-1':
AMI: 'ami-0ebe657bc328d4e82'
AMI: 'ami-0cc293023f983ed53'
'us-east-1':
AMI: 'ami-0c6b1d09930fac512'
AMI: 'ami-0b898040803850657'
'us-east-2':
AMI: 'ami-0ebbf2179e615c338'
AMI: 'ami-0d8f6eb4f641ef691'
'us-west-1':
AMI: 'ami-015954d5e5548d13b'
AMI: 'ami-056ee704806822732'
'us-west-2':
AMI: 'ami-0cb72367e98845d43'
AMI: 'ami-082b5a644766e0e6f'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion security/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ To update the region map execute the following lines in your terminal:

```
$ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output text)
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190508-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```
34 changes: 18 additions & 16 deletions security/auth-proxy-ha-github-orga.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,37 +132,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-1fb13961'
AMI: 'ami-3f36be41'
'ap-south-1':
AMI: 'ami-00e782930f1c3dbc7'
AMI: 'ami-0d2692b6acea72ee6'
'eu-west-3':
AMI: 'ami-0ebb3a801d5fb8b9b'
AMI: 'ami-0adcddd3324248c4c'
'eu-west-2':
AMI: 'ami-0009a33f033d8b7b6'
AMI: 'ami-0d8e27447ec2c8410'
'eu-west-1':
AMI: 'ami-030dbca661d402413'
AMI: 'ami-0bbc25e23a7640b9b'
'ap-northeast-2':
AMI: 'ami-08ab3f7e72215fe91'
AMI: 'ami-095ca789e0549777d'
'ap-northeast-1':
AMI: 'ami-00d101850e971728d'
AMI: 'ami-0c3fd0f5d33134a76'
'sa-east-1':
AMI: 'ami-058141e091292ecf0'
AMI: 'ami-058943e7d9b9cabfb'
'ca-central-1':
AMI: 'ami-08a9b721ecc5b0a53'
AMI: 'ami-0d4ae09ec9361d8ac'
'ap-east-1':
AMI: 'ami-570c7726'
'ap-southeast-1':
AMI: 'ami-0b5a47f8865280111'
AMI: 'ami-01f7527546b557442'
'ap-southeast-2':
AMI: 'ami-0fb7513bcdc525c3b'
AMI: 'ami-0dc96254d5535925f'
'eu-central-1':
AMI: 'ami-0ebe657bc328d4e82'
AMI: 'ami-0cc293023f983ed53'
'us-east-1':
AMI: 'ami-0c6b1d09930fac512'
AMI: 'ami-0b898040803850657'
'us-east-2':
AMI: 'ami-0ebbf2179e615c338'
AMI: 'ami-0d8f6eb4f641ef691'
'us-west-1':
AMI: 'ami-015954d5e5548d13b'
AMI: 'ami-056ee704806822732'
'us-west-2':
AMI: 'ami-0cb72367e98845d43'
AMI: 'ami-082b5a644766e0e6f'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
2 changes: 1 addition & 1 deletion vpc/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $ regions=$(aws ec2 describe-regions --query "Regions[].RegionName" --output tex

#### AMI
```
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190508-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
$ for region in $regions; do ami=$(aws --region $region ec2 describe-images --filters "Name=name,Values=amzn2-ami-hvm-2.0.20190618-x86_64-gp2" --query "Images[0].ImageId" --output "text"); printf "'$region':\n AMI: '$ami'\n"; done
```

#### NATAMI
Expand Down
34 changes: 18 additions & 16 deletions vpc/vpc-ssh-bastion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,37 +83,39 @@ Parameters:
Mappings:
RegionMap:
'eu-north-1':
AMI: 'ami-1fb13961'
AMI: 'ami-3f36be41'
'ap-south-1':
AMI: 'ami-00e782930f1c3dbc7'
AMI: 'ami-0d2692b6acea72ee6'
'eu-west-3':
AMI: 'ami-0ebb3a801d5fb8b9b'
AMI: 'ami-0adcddd3324248c4c'
'eu-west-2':
AMI: 'ami-0009a33f033d8b7b6'
AMI: 'ami-0d8e27447ec2c8410'
'eu-west-1':
AMI: 'ami-030dbca661d402413'
AMI: 'ami-0bbc25e23a7640b9b'
'ap-northeast-2':
AMI: 'ami-08ab3f7e72215fe91'
AMI: 'ami-095ca789e0549777d'
'ap-northeast-1':
AMI: 'ami-00d101850e971728d'
AMI: 'ami-0c3fd0f5d33134a76'
'sa-east-1':
AMI: 'ami-058141e091292ecf0'
AMI: 'ami-058943e7d9b9cabfb'
'ca-central-1':
AMI: 'ami-08a9b721ecc5b0a53'
AMI: 'ami-0d4ae09ec9361d8ac'
'ap-east-1':
AMI: 'ami-570c7726'
'ap-southeast-1':
AMI: 'ami-0b5a47f8865280111'
AMI: 'ami-01f7527546b557442'
'ap-southeast-2':
AMI: 'ami-0fb7513bcdc525c3b'
AMI: 'ami-0dc96254d5535925f'
'eu-central-1':
AMI: 'ami-0ebe657bc328d4e82'
AMI: 'ami-0cc293023f983ed53'
'us-east-1':
AMI: 'ami-0c6b1d09930fac512'
AMI: 'ami-0b898040803850657'
'us-east-2':
AMI: 'ami-0ebbf2179e615c338'
AMI: 'ami-0d8f6eb4f641ef691'
'us-west-1':
AMI: 'ami-015954d5e5548d13b'
AMI: 'ami-056ee704806822732'
'us-west-2':
AMI: 'ami-0cb72367e98845d43'
AMI: 'ami-082b5a644766e0e6f'
Conditions:
HasKeyName: !Not [!Equals [!Ref KeyName, '']]
HasIAMUserSSHAccess: !Equals [!Ref IAMUserSSHAccess, 'true']
Expand Down
Loading

0 comments on commit 4494093

Please sign in to comment.