Skip to content

Commit

Permalink
[auto] Update AMI IDs for 4.4.1 (gravitational#4625)
Browse files Browse the repository at this point in the history
  • Loading branch information
webvictim authored Oct 23, 2020
1 parent c949adf commit aaa2451
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 75 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 ?= 4.4.0
TELEPORT_VERSION ?= 4.4.1

# 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,21 +97,21 @@ Mappings:
t2.xlarge: {Arch: HVM64}

AWSRegionArch2AMI:
# All AMIs from AWS - gravitational-teleport-ami-ent-4.4.0
eu-west-1: {HVM64 : ami-09756993ec604f2c3}
eu-west-2: {HVM64 : ami-038fdbaeee78e3514}
us-east-1: {HVM64 : ami-0580f671472cf2716}
us-east-2: {HVM64 : ami-0e375ff3a0e30c28b}
us-west-2: {HVM64 : ami-0e2e3ba46ef1b0c45}
us-west-1: {HVM64 : ami-0dfc51bcac9ec961e}
ap-south-1: {HVM64 : ami-0043bfa9663bb1d33}
ap-northeast-2: {HVM64 : ami-089454824247f6cbf}
ap-southeast-1: {HVM64 : ami-0c2a4569e4ac51d5c}
ap-southeast-2: {HVM64 : ami-0a333bdf5d484390b}
ap-northeast-1: {HVM64 : ami-08c2d2357b5aaf7a2}
ca-central-1: {HVM64 : ami-09c08839f09472538}
eu-central-1: {HVM64 : ami-0aa3f139c61f1dac4}
sa-east-1: {HVM64 : ami-0c389dbe8b77eec5a}
# All AMIs from AWS - gravitational-teleport-ami-ent-4.4.1
eu-west-1: {HVM64 : ami-045ae9aa52f303a2e}
eu-west-2: {HVM64 : ami-08a63756ef0f64056}
us-east-1: {HVM64 : ami-040b359e8d0b7224f}
us-east-2: {HVM64 : ami-0c904064d40a94ff4}
us-west-2: {HVM64 : ami-02507c3024e4a5456}
us-west-1: {HVM64 : ami-0725f60aba0cb6253}
ap-south-1: {HVM64 : ami-09631b9feb2cafbb5}
ap-northeast-2: {HVM64 : ami-05cec66d0ce3fa4af}
ap-southeast-1: {HVM64 : ami-0b9c6b14859396077}
ap-southeast-2: {HVM64 : ami-0cdaa635e1d236518}
ap-northeast-1: {HVM64 : ami-0455ccaef7365431d}
ca-central-1: {HVM64 : ami-045bd78864bf97c86}
eu-central-1: {HVM64 : ami-0534a46b07ebb790f}
sa-east-1: {HVM64 : ami-022322bd9acdcf427}

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,21 +97,21 @@ Mappings:
t2.xlarge: {Arch: HVM64}

AWSRegionArch2AMI:
# All AMIs from AWS - gravitational-teleport-ami-oss-4.4.0
eu-west-1: {HVM64 : ami-0bc66a31a4ae06754}
eu-west-2: {HVM64 : ami-0b1a898df7fd43267}
us-east-1: {HVM64 : ami-0a23f88f3e841dcc2}
us-east-2: {HVM64 : ami-0c51354e9c1817344}
us-west-2: {HVM64 : ami-04ad5d133cdca8508}
us-west-1: {HVM64 : ami-093b83f855dd8cdf7}
ap-south-1: {HVM64 : ami-0d6e752196ef947ea}
ap-northeast-2: {HVM64 : ami-0a59e99f89272812d}
ap-southeast-1: {HVM64 : ami-0bc72f1536162c422}
ap-southeast-2: {HVM64 : ami-07e1c529ec00a2d56}
ap-northeast-1: {HVM64 : ami-08f145f1a393763c4}
ca-central-1: {HVM64 : ami-0569521d1e5a55b65}
eu-central-1: {HVM64 : ami-03512591f3d41979c}
sa-east-1: {HVM64 : ami-092ffebca9d89b699}
# All AMIs from AWS - gravitational-teleport-ami-oss-4.4.1
eu-west-1: {HVM64 : ami-0cada4faf47af601c}
eu-west-2: {HVM64 : ami-0cec0e35d3ad67181}
us-east-1: {HVM64 : ami-0f450a23056fdd77d}
us-east-2: {HVM64 : ami-0a5e58ad9700072ed}
us-west-2: {HVM64 : ami-02f1e26b9fc37ff7e}
us-west-1: {HVM64 : ami-0e2df7864a4dbfa86}
ap-south-1: {HVM64 : ami-0153f754efd62567b}
ap-northeast-2: {HVM64 : ami-0659b9ddf8b528283}
ap-southeast-1: {HVM64 : ami-07bbde75a9c45693e}
ap-southeast-2: {HVM64 : ami-04f53ea49dc7793b6}
ap-northeast-1: {HVM64 : ami-0cfb375348d1d3206}
ca-central-1: {HVM64 : ami-09cd17c5200891701}
eu-central-1: {HVM64 : ami-09f7d18828d123e5f}
sa-east-1: {HVM64 : ami-07305bda0271d8bdd}

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

```
# ap-south-1 v4.4.0 OSS: ami-0d6e752196ef947ea
# ap-northeast-2 v4.4.0 OSS: ami-0a59e99f89272812d
# ap-southeast-1 v4.4.0 OSS: ami-0bc72f1536162c422
# ap-southeast-2 v4.4.0 OSS: ami-07e1c529ec00a2d56
# ap-northeast-1 v4.4.0 OSS: ami-08f145f1a393763c4
# ca-central-1 v4.4.0 OSS: ami-0569521d1e5a55b65
# eu-central-1 v4.4.0 OSS: ami-03512591f3d41979c
# eu-west-1 v4.4.0 OSS: ami-0bc66a31a4ae06754
# eu-west-2 v4.4.0 OSS: ami-0b1a898df7fd43267
# sa-east-1 v4.4.0 OSS: ami-092ffebca9d89b699
# us-east-1 v4.4.0 OSS: ami-0a23f88f3e841dcc2
# us-east-2 v4.4.0 OSS: ami-0c51354e9c1817344
# us-west-1 v4.4.0 OSS: ami-093b83f855dd8cdf7
# us-west-2 v4.4.0 OSS: ami-04ad5d133cdca8508
# ap-south-1 v4.4.1 OSS: ami-0153f754efd62567b
# ap-northeast-2 v4.4.1 OSS: ami-0659b9ddf8b528283
# ap-southeast-1 v4.4.1 OSS: ami-07bbde75a9c45693e
# ap-southeast-2 v4.4.1 OSS: ami-04f53ea49dc7793b6
# ap-northeast-1 v4.4.1 OSS: ami-0cfb375348d1d3206
# ca-central-1 v4.4.1 OSS: ami-09cd17c5200891701
# eu-central-1 v4.4.1 OSS: ami-09f7d18828d123e5f
# eu-west-1 v4.4.1 OSS: ami-0cada4faf47af601c
# eu-west-2 v4.4.1 OSS: ami-0cec0e35d3ad67181
# sa-east-1 v4.4.1 OSS: ami-07305bda0271d8bdd
# us-east-1 v4.4.1 OSS: ami-0f450a23056fdd77d
# us-east-2 v4.4.1 OSS: ami-0a5e58ad9700072ed
# us-west-1 v4.4.1 OSS: ami-0e2df7864a4dbfa86
# us-west-2 v4.4.1 OSS: ami-02f1e26b9fc37ff7e
```

### Enterprise

```
# ap-south-1 v4.4.0 Enterprise: ami-0043bfa9663bb1d33
# ap-northeast-2 v4.4.0 Enterprise: ami-089454824247f6cbf
# ap-southeast-1 v4.4.0 Enterprise: ami-0c2a4569e4ac51d5c
# ap-southeast-2 v4.4.0 Enterprise: ami-0a333bdf5d484390b
# ap-northeast-1 v4.4.0 Enterprise: ami-08c2d2357b5aaf7a2
# ca-central-1 v4.4.0 Enterprise: ami-09c08839f09472538
# eu-central-1 v4.4.0 Enterprise: ami-0aa3f139c61f1dac4
# eu-west-1 v4.4.0 Enterprise: ami-09756993ec604f2c3
# eu-west-2 v4.4.0 Enterprise: ami-038fdbaeee78e3514
# sa-east-1 v4.4.0 Enterprise: ami-0c389dbe8b77eec5a
# us-east-1 v4.4.0 Enterprise: ami-0580f671472cf2716
# us-east-2 v4.4.0 Enterprise: ami-0e375ff3a0e30c28b
# us-west-1 v4.4.0 Enterprise: ami-0dfc51bcac9ec961e
# us-west-2 v4.4.0 Enterprise: ami-0e2e3ba46ef1b0c45
# ap-south-1 v4.4.1 Enterprise: ami-09631b9feb2cafbb5
# ap-northeast-2 v4.4.1 Enterprise: ami-05cec66d0ce3fa4af
# ap-southeast-1 v4.4.1 Enterprise: ami-0b9c6b14859396077
# ap-southeast-2 v4.4.1 Enterprise: ami-0cdaa635e1d236518
# ap-northeast-1 v4.4.1 Enterprise: ami-0455ccaef7365431d
# ca-central-1 v4.4.1 Enterprise: ami-045bd78864bf97c86
# eu-central-1 v4.4.1 Enterprise: ami-0534a46b07ebb790f
# eu-west-1 v4.4.1 Enterprise: ami-045ae9aa52f303a2e
# eu-west-2 v4.4.1 Enterprise: ami-08a63756ef0f64056
# sa-east-1 v4.4.1 Enterprise: ami-022322bd9acdcf427
# us-east-1 v4.4.1 Enterprise: ami-040b359e8d0b7224f
# us-east-2 v4.4.1 Enterprise: ami-0c904064d40a94ff4
# us-west-1 v4.4.1 Enterprise: ami-0725f60aba0cb6253
# us-west-2 v4.4.1 Enterprise: ami-02507c3024e4a5456
```

### Enterprise FIPS

```
# ap-south-1 v4.4.0 Enterprise FIPS: ami-0ac79ea28e69b2cca
# ap-northeast-2 v4.4.0 Enterprise FIPS: ami-09a552fa5fd69894b
# ap-southeast-1 v4.4.0 Enterprise FIPS: ami-07c07410ff2aa5e37
# ap-southeast-2 v4.4.0 Enterprise FIPS: ami-0ec514fd55fa6ddba
# ap-northeast-1 v4.4.0 Enterprise FIPS: ami-0b8cf0d14bfb3d1cf
# ca-central-1 v4.4.0 Enterprise FIPS: ami-0d43a1f328615af5d
# eu-central-1 v4.4.0 Enterprise FIPS: ami-0f7c7e35e95e70241
# eu-west-1 v4.4.0 Enterprise FIPS: ami-0d4e53f555a277689
# eu-west-2 v4.4.0 Enterprise FIPS: ami-0a4242b859f27cf13
# sa-east-1 v4.4.0 Enterprise FIPS: ami-0d928bf215e559f16
# us-east-1 v4.4.0 Enterprise FIPS: ami-058bca89f81badd71
# us-east-2 v4.4.0 Enterprise FIPS: ami-0263c7879ad82695c
# us-west-1 v4.4.0 Enterprise FIPS: ami-0d973ab419f44c46f
# us-west-2 v4.4.0 Enterprise FIPS: ami-09739075aa1c5956b
# ap-south-1 v4.4.1 Enterprise FIPS: ami-06ba588096ccd2960
# ap-northeast-2 v4.4.1 Enterprise FIPS: ami-062a4390d6ee5d6aa
# ap-southeast-1 v4.4.1 Enterprise FIPS: ami-00bb692d1b77264ff
# ap-southeast-2 v4.4.1 Enterprise FIPS: ami-06bd9934cb551298c
# ap-northeast-1 v4.4.1 Enterprise FIPS: ami-04c0f83ee24cd9ce4
# ca-central-1 v4.4.1 Enterprise FIPS: ami-06ecda25a90cc2df0
# eu-central-1 v4.4.1 Enterprise FIPS: ami-0fe8a51eab6907819
# eu-west-1 v4.4.1 Enterprise FIPS: ami-045e741f29463dd13
# eu-west-2 v4.4.1 Enterprise FIPS: ami-0458eb76ffd4f7d91
# sa-east-1 v4.4.1 Enterprise FIPS: ami-0ec46d64cf868cde9
# us-east-1 v4.4.1 Enterprise FIPS: ami-0477e1e01ab07b581
# us-east-2 v4.4.1 Enterprise FIPS: ami-0050d61f47d0dc2ac
# us-west-1 v4.4.1 Enterprise FIPS: ami-005c72487cd2ce3c2
# us-west-2 v4.4.1 Enterprise FIPS: ami-0259d340481768806
```
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 @@ -46,7 +46,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-4.4.0"
export TF_VAR_ami_name="gravitational-teleport-ami-ent-4.4.1"

# 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 @@ -82,7 +82,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-4.4.0"
TF_VAR_ami_name ?="gravitational-teleport-ami-ent-4.4.1"

# 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 aaa2451

Please sign in to comment.