Skip to content

Commit

Permalink
[auto] Update AMI IDs for 7.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
russjones committed Sep 29, 2021
1 parent 8c3fac8 commit e2412a7
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion assets/aws/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AWS_REGION ?= us-west-2
# This must be a _released_ version of Teleport, i.e. one which has binaries
# available for download on https://gravitational.com/teleport/download
# Unreleased versions will fail to build.
TELEPORT_VERSION ?= 7.1.3
TELEPORT_VERSION ?= 7.2.0

# Teleport UID is the UID of a non-privileged 'teleport' user
TELEPORT_UID ?= 1007
Expand Down
30 changes: 15 additions & 15 deletions examples/aws/cloudformation/ent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,24 @@ Mappings:
t2.xlarge: {Arch: HVM64}

AWSRegionArch2AMI:
# All AMIs from AWS - gravitational-teleport-ami-ent-7.1.3
# All AMIs from AWS - gravitational-teleport-ami-ent-7.2.0
eu-north-1: {HVM64: ami-05ff5c0be3d4b8da4}
ap-south-1: {HVM64 : ami-016148924dd0cfa25}
eu-west-1: {HVM64 : ami-07eb624af2fc83eff}
eu-west-2: {HVM64 : ami-095ff2909132319a9}
ap-south-1: {HVM64 : ami-073cbb22c1af06444}
eu-west-1: {HVM64 : ami-0a14556b3f0c71acc}
eu-west-2: {HVM64 : ami-0eb250171d3f26522}
eu-west-3: {HVM64: ami-087bdce4ab6a2964d}
ap-northeast-1: {HVM64 : ami-0b622e9e423bf5113}
ap-northeast-2: {HVM64 : ami-0a51759bc1b3c554a}
ap-northeast-1: {HVM64 : ami-064af1b67178425ed}
ap-northeast-2: {HVM64 : ami-09a76fdc400c37272}
ap-northeast-3: {HVM64: ami-0a36f2dfdca83ea7d}
sa-east-1: {HVM64 : ami-0a34c14bf626670d5}
ca-central-1: {HVM64 : ami-03c0af4f1eaf354e4}
ap-southeast-1: {HVM64 : ami-088bfa65fc9dbb71a}
ap-southeast-2: {HVM64 : ami-023aef85f4294147a}
eu-central-1: {HVM64 : ami-023fa05ba342f0d73}
us-east-1: {HVM64 : ami-007bc801a7ebdf1bb}
us-east-2: {HVM64 : ami-081f68479e6beaad1}
us-west-1: {HVM64 : ami-04b3b9f88c7053e25}
us-west-2: {HVM64 : ami-04ea8f7495186decc}
sa-east-1: {HVM64 : ami-0fcec228d5238541b}
ca-central-1: {HVM64 : ami-0fea79c9668d64062}
ap-southeast-1: {HVM64 : ami-0a34a0c7ee5e9cd69}
ap-southeast-2: {HVM64 : ami-0d71749519b158f33}
eu-central-1: {HVM64 : ami-00d05c0c4cf72e389}
us-east-1: {HVM64 : ami-02190cd13c48885a7}
us-east-2: {HVM64 : ami-087079db043e8370f}
us-west-1: {HVM64 : ami-0ff91e57a10611dc4}
us-west-2: {HVM64 : ami-0b3aac0080568f0ee}

Resources:
# Auth server setup
Expand Down
30 changes: 15 additions & 15 deletions examples/aws/cloudformation/oss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,24 @@ Mappings:
t2.xlarge: {Arch: HVM64}

AWSRegionArch2AMI:
# All AMIs from AWS - gravitational-teleport-ami-oss-7.1.3
# All AMIs from AWS - gravitational-teleport-ami-oss-7.2.0
eu-north-1: {HVM64: ami-0eef7480d85b07d78}
ap-south-1: {HVM64 : ami-030b474348ab2dcca}
eu-west-1: {HVM64 : ami-03ddb3f42a4df7d28}
eu-west-2: {HVM64 : ami-05fb005b1c1072596}
ap-south-1: {HVM64 : ami-069c34053a3ac04e9}
eu-west-1: {HVM64 : ami-00acdae3c10744134}
eu-west-2: {HVM64 : ami-0735070a9b5c8e094}
eu-west-3: {HVM64: ami-0211c6e2e821dd249}
ap-northeast-1: {HVM64 : ami-0fbc1a32424d570d9}
ap-northeast-2: {HVM64 : ami-0310f8837dc4b64d4}
ap-northeast-1: {HVM64 : ami-09ee42b13e18fe43a}
ap-northeast-2: {HVM64 : ami-0ccd0925d3a4c07fe}
ap-northeast-3: {HVM64: ami-02bb8618b75d025aa}
sa-east-1: {HVM64 : ami-02fbf445e4f914c0f}
ca-central-1: {HVM64 : ami-0b3d69318848bc341}
ap-southeast-1: {HVM64 : ami-0e3e0ff79eb63428a}
ap-southeast-2: {HVM64 : ami-0a46854af8a7286e1}
eu-central-1: {HVM64 : ami-0834314ebffb71f49}
us-east-1: {HVM64 : ami-0f5d2b2d5af77216d}
us-east-2: {HVM64 : ami-0fd2b651dde033135}
us-west-1: {HVM64 : ami-0f483fd73a9700ba3}
us-west-2: {HVM64 : ami-0221836a20e392331}
sa-east-1: {HVM64 : ami-0627d02d475c40e7d}
ca-central-1: {HVM64 : ami-04f5a1b4a86f2b1c6}
ap-southeast-1: {HVM64 : ami-0d09b20067d459f09}
ap-southeast-2: {HVM64 : ami-07ac2e6cf5c5cc0f7}
eu-central-1: {HVM64 : ami-0a4e0c9016bb7f623}
us-east-1: {HVM64 : ami-0e01a3c9376d022af}
us-east-2: {HVM64 : ami-0ff5b6ce680a6c026}
us-west-1: {HVM64 : ami-0308eeef933795ab7}
us-west-2: {HVM64 : ami-0f9f8143cc0e62790}

Resources:
# Auth server setup
Expand Down
102 changes: 51 additions & 51 deletions examples/aws/terraform/AMIS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,65 @@ is updated when new AMI versions are released.
### OSS

```
# eu-north-1 v7.1.3 OSS: ami-0752bf1677e9210d5
# ap-south-1 v7.1.3 OSS: ami-030b474348ab2dcca
# eu-west-1 v7.1.3 OSS: ami-03ddb3f42a4df7d28
# eu-west-2 v7.1.3 OSS: ami-05fb005b1c1072596
# eu-west-3 v7.1.3 OSS: ami-01905d5c65b2678ba
# ap-northeast-1 v7.1.3 OSS: ami-0fbc1a32424d570d9
# ap-northeast-2 v7.1.3 OSS: ami-0310f8837dc4b64d4
# ap-northeast-3 v7.1.3 OSS: ami-092d082517676381b
# sa-east-1 v7.1.3 OSS: ami-02fbf445e4f914c0f
# ca-central-1 v7.1.3 OSS: ami-0b3d69318848bc341
# ap-southeast-1 v7.1.3 OSS: ami-0e3e0ff79eb63428a
# ap-southeast-2 v7.1.3 OSS: ami-0a46854af8a7286e1
# eu-central-1 v7.1.3 OSS: ami-0834314ebffb71f49
# us-east-1 v7.1.3 OSS: ami-0f5d2b2d5af77216d
# us-east-2 v7.1.3 OSS: ami-0fd2b651dde033135
# us-west-1 v7.1.3 OSS: ami-0f483fd73a9700ba3
# us-west-2 v7.1.3 OSS: ami-0221836a20e392331
# eu-north-1 v7.2.0 OSS: ami-0bb0c88ff8fa576c1
# ap-south-1 v7.2.0 OSS: ami-069c34053a3ac04e9
# eu-west-1 v7.2.0 OSS: ami-00acdae3c10744134
# eu-west-2 v7.2.0 OSS: ami-0735070a9b5c8e094
# eu-west-3 v7.2.0 OSS: ami-0af0b01125a89e647
# ap-northeast-1 v7.2.0 OSS: ami-09ee42b13e18fe43a
# ap-northeast-2 v7.2.0 OSS: ami-0ccd0925d3a4c07fe
# ap-northeast-3 v7.2.0 OSS: ami-0b56053c4c190a961
# sa-east-1 v7.2.0 OSS: ami-0627d02d475c40e7d
# ca-central-1 v7.2.0 OSS: ami-04f5a1b4a86f2b1c6
# ap-southeast-1 v7.2.0 OSS: ami-0d09b20067d459f09
# ap-southeast-2 v7.2.0 OSS: ami-07ac2e6cf5c5cc0f7
# eu-central-1 v7.2.0 OSS: ami-0a4e0c9016bb7f623
# us-east-1 v7.2.0 OSS: ami-0e01a3c9376d022af
# us-east-2 v7.2.0 OSS: ami-0ff5b6ce680a6c026
# us-west-1 v7.2.0 OSS: ami-0308eeef933795ab7
# us-west-2 v7.2.0 OSS: ami-0f9f8143cc0e62790
```

### Enterprise

```
# eu-north-1 v7.1.3 Enterprise: ami-0ee74d3edef58b5f5
# ap-south-1 v7.1.3 Enterprise: ami-016148924dd0cfa25
# eu-west-1 v7.1.3 Enterprise: ami-07eb624af2fc83eff
# eu-west-2 v7.1.3 Enterprise: ami-095ff2909132319a9
# eu-west-3 v7.1.3 Enterprise: ami-029d6000a96e5bb7a
# ap-northeast-1 v7.1.3 Enterprise: ami-0b622e9e423bf5113
# ap-northeast-2 v7.1.3 Enterprise: ami-0a51759bc1b3c554a
# ap-northeast-3 v7.1.3 Enterprise: ami-0927ea5e493dc9957
# sa-east-1 v7.1.3 Enterprise: ami-0a34c14bf626670d5
# ca-central-1 v7.1.3 Enterprise: ami-03c0af4f1eaf354e4
# ap-southeast-1 v7.1.3 Enterprise: ami-088bfa65fc9dbb71a
# ap-southeast-2 v7.1.3 Enterprise: ami-023aef85f4294147a
# eu-central-1 v7.1.3 Enterprise: ami-023fa05ba342f0d73
# us-east-1 v7.1.3 Enterprise: ami-007bc801a7ebdf1bb
# us-east-2 v7.1.3 Enterprise: ami-081f68479e6beaad1
# us-west-1 v7.1.3 Enterprise: ami-04b3b9f88c7053e25
# us-west-2 v7.1.3 Enterprise: ami-04ea8f7495186decc
# eu-north-1 v7.2.0 Enterprise: ami-0d88e79a0ab991ce4
# ap-south-1 v7.2.0 Enterprise: ami-073cbb22c1af06444
# eu-west-1 v7.2.0 Enterprise: ami-0a14556b3f0c71acc
# eu-west-2 v7.2.0 Enterprise: ami-0eb250171d3f26522
# eu-west-3 v7.2.0 Enterprise: ami-0980886c3a711721b
# ap-northeast-1 v7.2.0 Enterprise: ami-064af1b67178425ed
# ap-northeast-2 v7.2.0 Enterprise: ami-09a76fdc400c37272
# ap-northeast-3 v7.2.0 Enterprise: ami-035f7aeb8a480657f
# sa-east-1 v7.2.0 Enterprise: ami-0fcec228d5238541b
# ca-central-1 v7.2.0 Enterprise: ami-0fea79c9668d64062
# ap-southeast-1 v7.2.0 Enterprise: ami-0a34a0c7ee5e9cd69
# ap-southeast-2 v7.2.0 Enterprise: ami-0d71749519b158f33
# eu-central-1 v7.2.0 Enterprise: ami-00d05c0c4cf72e389
# us-east-1 v7.2.0 Enterprise: ami-02190cd13c48885a7
# us-east-2 v7.2.0 Enterprise: ami-087079db043e8370f
# us-west-1 v7.2.0 Enterprise: ami-0ff91e57a10611dc4
# us-west-2 v7.2.0 Enterprise: ami-0b3aac0080568f0ee
```

### Enterprise FIPS

```
# eu-north-1 v7.1.3 Enterprise FIPS: ami-055d34de938f39a9c
# ap-south-1 v7.1.3 Enterprise FIPS: ami-0f41f54ea375f2b12
# eu-west-1 v7.1.3 Enterprise FIPS: ami-0ec8d9891499d3219
# eu-west-2 v7.1.3 Enterprise FIPS: ami-0e667fffb1e1dc726
# eu-west-3 v7.1.3 Enterprise FIPS: ami-0d4e1b441cc2aac2b
# ap-northeast-1 v7.1.3 Enterprise FIPS: ami-01e12e6bb03f71c08
# ap-northeast-2 v7.1.3 Enterprise FIPS: ami-075d9611ea7eef976
# ap-northeast-3 v7.1.3 Enterprise FIPS: ami-04ed5d3709d843b2e
# sa-east-1 v7.1.3 Enterprise FIPS: ami-0e4d42050d8197ba5
# ca-central-1 v7.1.3 Enterprise FIPS: ami-0387fc226ff5a6ec5
# ap-southeast-1 v7.1.3 Enterprise FIPS: ami-06bff05269130b82e
# ap-southeast-2 v7.1.3 Enterprise FIPS: ami-0d1622b213c42a2ce
# eu-central-1 v7.1.3 Enterprise FIPS: ami-03815f3b188da26ee
# us-east-1 v7.1.3 Enterprise FIPS: ami-090e1b63981e9c75e
# us-east-2 v7.1.3 Enterprise FIPS: ami-031e245fd85a5cbf6
# us-west-1 v7.1.3 Enterprise FIPS: ami-00263492824ca424b
# us-west-2 v7.1.3 Enterprise FIPS: ami-01c5f5caf7fd9b4f7
# eu-north-1 v7.2.0 Enterprise FIPS: ami-0a508f7ad0a95151b
# ap-south-1 v7.2.0 Enterprise FIPS: ami-0fd220355c0287927
# eu-west-1 v7.2.0 Enterprise FIPS: ami-0ef7c8a35872dc3a4
# eu-west-2 v7.2.0 Enterprise FIPS: ami-05f5dc8503c893ad0
# eu-west-3 v7.2.0 Enterprise FIPS: ami-047e20dd6b1ff2ee7
# ap-northeast-1 v7.2.0 Enterprise FIPS: ami-0a5e781bbdd9df71e
# ap-northeast-2 v7.2.0 Enterprise FIPS: ami-0edf728b0d8df72b6
# ap-northeast-3 v7.2.0 Enterprise FIPS: ami-083e81a12b024e0d1
# sa-east-1 v7.2.0 Enterprise FIPS: ami-08f27947360272426
# ca-central-1 v7.2.0 Enterprise FIPS: ami-01547ebcbe9b1ae8e
# ap-southeast-1 v7.2.0 Enterprise FIPS: ami-065b5ba0bfd09c2c4
# ap-southeast-2 v7.2.0 Enterprise FIPS: ami-0ca90483ba026369e
# eu-central-1 v7.2.0 Enterprise FIPS: ami-0becb446300747430
# us-east-1 v7.2.0 Enterprise FIPS: ami-0a8dcd61b05726de0
# us-east-2 v7.2.0 Enterprise FIPS: ami-0ec390f60124c5156
# us-west-1 v7.2.0 Enterprise FIPS: ami-0e980c983f90eafef
# us-west-2 v7.2.0 Enterprise FIPS: ami-089f6c869aaf72ce8
```
2 changes: 1 addition & 1 deletion examples/aws/terraform/ha-autoscale-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export TF_VAR_cluster_name="teleport.example.com"
# OSS: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-oss*'
# Enterprise: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-ent*'
# FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
export TF_VAR_ami_name="gravitational-teleport-ami-ent-7.1.3"
export TF_VAR_ami_name="gravitational-teleport-ami-ent-7.2.0"

# AWS SSH key name to provision in installed instances, should be available in the region
export TF_VAR_key_name="example"
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/terraform/starter-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ TF_VAR_license_path ?="/path/to/license"
# OSS: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-oss*'
# Enterprise: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-ent*'
# FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
TF_VAR_ami_name ?="gravitational-teleport-ami-ent-7.1.3"
TF_VAR_ami_name ?="gravitational-teleport-ami-ent-7.2.0"

# Route 53 hosted zone to use, must be a root zone registered in AWS, e.g. example.com
TF_VAR_route53_zone ?="example.com"
Expand Down

0 comments on commit e2412a7

Please sign in to comment.