diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 4900dd17ffd..538f7f69d4f 100644 --- a/assets/aws/Makefile +++ b/assets/aws/Makefile @@ -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 ?= 13.0.0 +TELEPORT_VERSION ?= 13.0.2 # Teleport UID is the UID of a non-privileged 'teleport' user TELEPORT_UID ?= 1007 diff --git a/examples/aws/terraform/AMIS.md b/examples/aws/terraform/AMIS.md index dd164f256f8..590ec3b0c10 100644 --- a/examples/aws/terraform/AMIS.md +++ b/examples/aws/terraform/AMIS.md @@ -6,65 +6,65 @@ is updated when new AMI versions are released. ### OSS ``` -# eu-north-1 v13.0.0 OSS: ami-00a5936bb688b6c44 -# ap-south-1 v13.0.0 OSS: ami-0d3333cf2cd07894e -# eu-west-1 v13.0.0 OSS: ami-002249a7c5d36577d -# eu-west-2 v13.0.0 OSS: ami-0f6b8cba4193eab3d -# eu-west-3 v13.0.0 OSS: ami-0d0d059b44931a4ad -# ap-northeast-1 v13.0.0 OSS: ami-04522c0995cecd72f -# ap-northeast-2 v13.0.0 OSS: ami-0225e19e66823af79 -# ap-northeast-3 v13.0.0 OSS: ami-042eb77b9152f2031 -# sa-east-1 v13.0.0 OSS: ami-027d8aab2e05f189b -# ca-central-1 v13.0.0 OSS: ami-06a8f1a39205efe22 -# ap-southeast-1 v13.0.0 OSS: ami-0b4712b9526619116 -# ap-southeast-2 v13.0.0 OSS: ami-0e3f2115af04ec379 -# eu-central-1 v13.0.0 OSS: ami-0dac9eb4633135b32 -# us-east-1 v13.0.0 OSS: ami-0428445c644de8e6e -# us-east-2 v13.0.0 OSS: ami-0f706e2f1949f7fe4 -# us-west-1 v13.0.0 OSS: ami-0f43b10e93efe1a0f -# us-west-2 v13.0.0 OSS: ami-0b05c5996434e5202 +# eu-north-1 v13.0.2 OSS: ami-047c5899894b0b043 +# ap-south-1 v13.0.2 OSS: ami-0d672b22e892b2182 +# eu-west-1 v13.0.2 OSS: ami-0900d827c2e73b7ff +# eu-west-2 v13.0.2 OSS: ami-0f6157e5bf7d63d32 +# eu-west-3 v13.0.2 OSS: ami-021ba06d830c30573 +# ap-northeast-1 v13.0.2 OSS: ami-06ef3ee7d4fb759c0 +# ap-northeast-2 v13.0.2 OSS: ami-0ed70c81e4588b438 +# ap-northeast-3 v13.0.2 OSS: ami-0bdbda00e37135c76 +# sa-east-1 v13.0.2 OSS: ami-0870432dbeb993e49 +# ca-central-1 v13.0.2 OSS: ami-099b367c78ab61dbc +# ap-southeast-1 v13.0.2 OSS: ami-07c5b691d08dfef7a +# ap-southeast-2 v13.0.2 OSS: ami-095bce95c58c1898b +# eu-central-1 v13.0.2 OSS: ami-06940c92b9f63413c +# us-east-1 v13.0.2 OSS: ami-098203eea0196544a +# us-east-2 v13.0.2 OSS: ami-04a1164c28d556496 +# us-west-1 v13.0.2 OSS: ami-01380db545b1aa1d0 +# us-west-2 v13.0.2 OSS: ami-0fda6b1641ea70b19 ``` ### Enterprise ``` -# eu-north-1 v13.0.0 Enterprise: ami-05e14fe66810a5ef2 -# ap-south-1 v13.0.0 Enterprise: ami-09fb06dc1874246bf -# eu-west-1 v13.0.0 Enterprise: ami-02bf83fd93cb84b62 -# eu-west-2 v13.0.0 Enterprise: ami-072b068eaf2a94e75 -# eu-west-3 v13.0.0 Enterprise: ami-00e5d0b4b50ae9379 -# ap-northeast-1 v13.0.0 Enterprise: ami-036e1ea9964bc0146 -# ap-northeast-2 v13.0.0 Enterprise: ami-0f0f1976f0b0909c7 -# ap-northeast-3 v13.0.0 Enterprise: ami-0fd2928243a539f34 -# sa-east-1 v13.0.0 Enterprise: ami-01e1d17c9cef5c30d -# ca-central-1 v13.0.0 Enterprise: ami-00be12be84456569f -# ap-southeast-1 v13.0.0 Enterprise: ami-0a47612795a81153a -# ap-southeast-2 v13.0.0 Enterprise: ami-0e9c710168c4a0c37 -# eu-central-1 v13.0.0 Enterprise: ami-04ce3309402280e86 -# us-east-1 v13.0.0 Enterprise: ami-068b3f9a1e097f493 -# us-east-2 v13.0.0 Enterprise: ami-0d909dae311aea41f -# us-west-1 v13.0.0 Enterprise: ami-0b676705fdcd2feda -# us-west-2 v13.0.0 Enterprise: ami-03b5de80c76bc1a54 +# eu-north-1 v13.0.2 Enterprise: ami-0229e1e3ee1f29400 +# ap-south-1 v13.0.2 Enterprise: ami-0e8f42e0982a32af2 +# eu-west-1 v13.0.2 Enterprise: ami-0145ca39fa8697047 +# eu-west-2 v13.0.2 Enterprise: ami-006d59e49b6c81d97 +# eu-west-3 v13.0.2 Enterprise: ami-019817265419a859e +# ap-northeast-1 v13.0.2 Enterprise: ami-0d0955466ade06305 +# ap-northeast-2 v13.0.2 Enterprise: ami-0e70c8123f2cdcb2a +# ap-northeast-3 v13.0.2 Enterprise: ami-0c6500e34f4906d80 +# sa-east-1 v13.0.2 Enterprise: ami-0eae7939b04ab98f5 +# ca-central-1 v13.0.2 Enterprise: ami-0293c796b583d1a3c +# ap-southeast-1 v13.0.2 Enterprise: ami-03b10a45a1a174317 +# ap-southeast-2 v13.0.2 Enterprise: ami-047481ffd7dd0cc88 +# eu-central-1 v13.0.2 Enterprise: ami-0dc902c57cd59e434 +# us-east-1 v13.0.2 Enterprise: ami-095c2dcd35cb568a1 +# us-east-2 v13.0.2 Enterprise: ami-0bc8ab0492fbe2792 +# us-west-1 v13.0.2 Enterprise: ami-0a35a0462cfe64d9e +# us-west-2 v13.0.2 Enterprise: ami-09fb02b1a0ab2bd33 ``` ### Enterprise FIPS ``` -# eu-north-1 v13.0.0 Enterprise FIPS: ami-0772f1df34177656c -# ap-south-1 v13.0.0 Enterprise FIPS: ami-03d91464ff46b6d18 -# eu-west-1 v13.0.0 Enterprise FIPS: ami-08552730613133261 -# eu-west-2 v13.0.0 Enterprise FIPS: ami-076efba2f1a3f0dce -# eu-west-3 v13.0.0 Enterprise FIPS: ami-05f954d06ae150a98 -# ap-northeast-1 v13.0.0 Enterprise FIPS: ami-09e5d3690e1f095f7 -# ap-northeast-2 v13.0.0 Enterprise FIPS: ami-01d1466765265ed3a -# ap-northeast-3 v13.0.0 Enterprise FIPS: ami-020ad47e2c727e82a -# sa-east-1 v13.0.0 Enterprise FIPS: ami-09a42bc9aead2616a -# ca-central-1 v13.0.0 Enterprise FIPS: ami-0f9042a1ed1366e75 -# ap-southeast-1 v13.0.0 Enterprise FIPS: ami-0c7c51f17d69f8e87 -# ap-southeast-2 v13.0.0 Enterprise FIPS: ami-0233db45538933eba -# eu-central-1 v13.0.0 Enterprise FIPS: ami-0a28aeb2777de1721 -# us-east-1 v13.0.0 Enterprise FIPS: ami-00372c4dfd73178b7 -# us-east-2 v13.0.0 Enterprise FIPS: ami-057c000bb7202f874 -# us-west-1 v13.0.0 Enterprise FIPS: ami-05d243b9a54fa6856 -# us-west-2 v13.0.0 Enterprise FIPS: ami-07b91d3c5d4057861 +# eu-north-1 v13.0.2 Enterprise FIPS: ami-04613ede46248135c +# ap-south-1 v13.0.2 Enterprise FIPS: ami-0e3493bcbbd9d751d +# eu-west-1 v13.0.2 Enterprise FIPS: ami-08b91acf23531c8d9 +# eu-west-2 v13.0.2 Enterprise FIPS: ami-0daefe41af2426e2c +# eu-west-3 v13.0.2 Enterprise FIPS: ami-063635e4360b81541 +# ap-northeast-1 v13.0.2 Enterprise FIPS: ami-05916f592023309f9 +# ap-northeast-2 v13.0.2 Enterprise FIPS: ami-0b0655e1918a4fd7c +# ap-northeast-3 v13.0.2 Enterprise FIPS: ami-013a57c60d2a4f907 +# sa-east-1 v13.0.2 Enterprise FIPS: ami-03444eb03e6142ec0 +# ca-central-1 v13.0.2 Enterprise FIPS: ami-010bdb8270a9321c1 +# ap-southeast-1 v13.0.2 Enterprise FIPS: ami-0bc4b14ca5a13660a +# ap-southeast-2 v13.0.2 Enterprise FIPS: ami-09f11516b8323312d +# eu-central-1 v13.0.2 Enterprise FIPS: ami-08f2f61633e8a7af8 +# us-east-1 v13.0.2 Enterprise FIPS: ami-0f72ee390c330c00d +# us-east-2 v13.0.2 Enterprise FIPS: ami-0f609469c922e6caa +# us-west-1 v13.0.2 Enterprise FIPS: ami-088f45fca7599a0d9 +# us-west-2 v13.0.2 Enterprise FIPS: ami-0fd54f0fce399fda3 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index 91670d6f67f..b6c3c3843a6 100644 --- a/examples/aws/terraform/ha-autoscale-cluster/README.md +++ b/examples/aws/terraform/ha-autoscale-cluster/README.md @@ -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-13.0.0" +export TF_VAR_ami_name="gravitational-teleport-ami-ent-13.0.2" # AWS SSH key name to provision in installed instances, should be available in the region export TF_VAR_key_name="example" diff --git a/examples/aws/terraform/starter-cluster/README.md b/examples/aws/terraform/starter-cluster/README.md index 4dee9eacd4d..f3795354564 100644 --- a/examples/aws/terraform/starter-cluster/README.md +++ b/examples/aws/terraform/starter-cluster/README.md @@ -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-13.0.0" +TF_VAR_ami_name ?= "gravitational-teleport-ami-ent-13.0.2" # Route 53 hosted zone to use, must be a root zone registered in AWS, e.g. example.com TF_VAR_route53_zone ?= "example.com"