diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 90e776cff74..58946a97340 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 ?= 12.1.0 +TELEPORT_VERSION ?= 12.2.1 # 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 f7e89e1e4d1..0fcfbe7344f 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 v12.1.0 OSS: ami-05e8ce6f180a34142 -# ap-south-1 v12.1.0 OSS: ami-0267f1c1bb6073f7c -# eu-west-1 v12.1.0 OSS: ami-041711a105c056fc7 -# eu-west-2 v12.1.0 OSS: ami-0e85a1291ca24c24b -# eu-west-3 v12.1.0 OSS: ami-0e6081d0cec7b9561 -# ap-northeast-1 v12.1.0 OSS: ami-02409b24429a424d6 -# ap-northeast-2 v12.1.0 OSS: ami-024ca0fde9eb4cb72 -# ap-northeast-3 v12.1.0 OSS: ami-0261862c297cd64d0 -# sa-east-1 v12.1.0 OSS: ami-01360e0a64856470d -# ca-central-1 v12.1.0 OSS: ami-02908544ba8d1d36c -# ap-southeast-1 v12.1.0 OSS: ami-0a9efdf96a4986c49 -# ap-southeast-2 v12.1.0 OSS: ami-0e071044ba85f5053 -# eu-central-1 v12.1.0 OSS: ami-0a922808b85876dc8 -# us-east-1 v12.1.0 OSS: ami-02e63902bcb7dc5df -# us-east-2 v12.1.0 OSS: ami-0f0657b3fb1631698 -# us-west-1 v12.1.0 OSS: ami-0bfc9ab51ee734d25 -# us-west-2 v12.1.0 OSS: ami-08b3505466f5f52ed +# eu-north-1 v12.2.1 OSS: ami-0af4eefda97b67599 +# ap-south-1 v12.2.1 OSS: ami-0f80b740fd3fe1ca4 +# eu-west-1 v12.2.1 OSS: ami-029df9c6bdeb5001b +# eu-west-2 v12.2.1 OSS: ami-0ba0c2aaeeed80dec +# eu-west-3 v12.2.1 OSS: ami-062cde6867ca9036f +# ap-northeast-1 v12.2.1 OSS: ami-002f7cea298d9e2cc +# ap-northeast-2 v12.2.1 OSS: ami-0abcb760ba65e1aef +# ap-northeast-3 v12.2.1 OSS: ami-0452375532e917ce4 +# sa-east-1 v12.2.1 OSS: ami-000a9e4c35465be47 +# ca-central-1 v12.2.1 OSS: ami-0b6c4c412e256b879 +# ap-southeast-1 v12.2.1 OSS: ami-0666de504524c3204 +# ap-southeast-2 v12.2.1 OSS: ami-084678ef1fa8c139b +# eu-central-1 v12.2.1 OSS: ami-0793dee5c078bca49 +# us-east-1 v12.2.1 OSS: ami-00df31ab117e6e0df +# us-east-2 v12.2.1 OSS: ami-0452de470e3e76e0f +# us-west-1 v12.2.1 OSS: ami-08a5675aaa5d8650c +# us-west-2 v12.2.1 OSS: ami-09bc32588d17a8a90 ``` ### Enterprise ``` -# eu-north-1 v12.1.0 Enterprise: ami-0e98af302ab7c87c2 -# ap-south-1 v12.1.0 Enterprise: ami-0afb34d46847c4302 -# eu-west-1 v12.1.0 Enterprise: ami-08e244594bd504d7b -# eu-west-2 v12.1.0 Enterprise: ami-05ea4cdaedf5c1a2d -# eu-west-3 v12.1.0 Enterprise: ami-0f696dd3645874598 -# ap-northeast-1 v12.1.0 Enterprise: ami-0ab52ce566fff879e -# ap-northeast-2 v12.1.0 Enterprise: ami-041b3e2d61dd10f6a -# ap-northeast-3 v12.1.0 Enterprise: ami-0ead47d9a9c83e9a5 -# sa-east-1 v12.1.0 Enterprise: ami-049210df7dd7f0dab -# ca-central-1 v12.1.0 Enterprise: ami-02b682854c24e885f -# ap-southeast-1 v12.1.0 Enterprise: ami-0340f2966435d65ca -# ap-southeast-2 v12.1.0 Enterprise: ami-0a1b25d5524896399 -# eu-central-1 v12.1.0 Enterprise: ami-092dcdec084e7bec4 -# us-east-1 v12.1.0 Enterprise: ami-0995fcb5ab53fb172 -# us-east-2 v12.1.0 Enterprise: ami-021f77f16ab35eed6 -# us-west-1 v12.1.0 Enterprise: ami-099cfa3054be3f2cf -# us-west-2 v12.1.0 Enterprise: ami-0d7044dad344fadd9 +# eu-north-1 v12.2.1 Enterprise: ami-0f4a1d8df233b1ab1 +# ap-south-1 v12.2.1 Enterprise: ami-00eee7327859d01cb +# eu-west-1 v12.2.1 Enterprise: ami-0cb7b048acb9729fa +# eu-west-2 v12.2.1 Enterprise: ami-01ba6910c965e1c32 +# eu-west-3 v12.2.1 Enterprise: ami-07ae6e637f9d95486 +# ap-northeast-1 v12.2.1 Enterprise: ami-0aaea3cbc9e82a437 +# ap-northeast-2 v12.2.1 Enterprise: ami-07979bdcf637f300f +# ap-northeast-3 v12.2.1 Enterprise: ami-0411d22bfceba2c5e +# sa-east-1 v12.2.1 Enterprise: ami-0bdd4d35e6bc03781 +# ca-central-1 v12.2.1 Enterprise: ami-06ce9a0891b732fc4 +# ap-southeast-1 v12.2.1 Enterprise: ami-0235f13d0712b876a +# ap-southeast-2 v12.2.1 Enterprise: ami-07a768dcddf07ebf0 +# eu-central-1 v12.2.1 Enterprise: ami-0828ae6b488febba0 +# us-east-1 v12.2.1 Enterprise: ami-087f9a520c2cd25ee +# us-east-2 v12.2.1 Enterprise: ami-05ae9b9acc1e86ca8 +# us-west-1 v12.2.1 Enterprise: ami-03acb8f1f32bf716a +# us-west-2 v12.2.1 Enterprise: ami-03a7aead004d57e4e ``` ### Enterprise FIPS ``` -# eu-north-1 v12.1.0 Enterprise FIPS: ami-0f1a2bcb06b95ca05 -# ap-south-1 v12.1.0 Enterprise FIPS: ami-00954b00e3c259ff5 -# eu-west-1 v12.1.0 Enterprise FIPS: ami-0a118d95d2b742fd6 -# eu-west-2 v12.1.0 Enterprise FIPS: ami-0d36dc61ef3459dca -# eu-west-3 v12.1.0 Enterprise FIPS: ami-0afa725d334d186d5 -# ap-northeast-1 v12.1.0 Enterprise FIPS: ami-08a092791941b614c -# ap-northeast-2 v12.1.0 Enterprise FIPS: ami-064b823be71294bbd -# ap-northeast-3 v12.1.0 Enterprise FIPS: ami-0e80dd63e435ace93 -# sa-east-1 v12.1.0 Enterprise FIPS: ami-0e325f78be5d1f15d -# ca-central-1 v12.1.0 Enterprise FIPS: ami-069147ec4bb646ffd -# ap-southeast-1 v12.1.0 Enterprise FIPS: ami-03ca0641b86a6fe80 -# ap-southeast-2 v12.1.0 Enterprise FIPS: ami-0063f944c6259dbad -# eu-central-1 v12.1.0 Enterprise FIPS: ami-015e4a09f0da703cf -# us-east-1 v12.1.0 Enterprise FIPS: ami-0834c33d4592698cd -# us-east-2 v12.1.0 Enterprise FIPS: ami-0b587df8854bd23d7 -# us-west-1 v12.1.0 Enterprise FIPS: ami-085dd3e36dbd6ed91 -# us-west-2 v12.1.0 Enterprise FIPS: ami-08b0e7f7b1bdceb96 +# eu-north-1 v12.2.1 Enterprise FIPS: ami-0e4d8591ccbe4a9aa +# ap-south-1 v12.2.1 Enterprise FIPS: ami-0f245d1be0b087709 +# eu-west-1 v12.2.1 Enterprise FIPS: ami-06d824bf6ce61a1ad +# eu-west-2 v12.2.1 Enterprise FIPS: ami-04f43f4b0b7212a09 +# eu-west-3 v12.2.1 Enterprise FIPS: ami-05f12739055a210c0 +# ap-northeast-1 v12.2.1 Enterprise FIPS: ami-01e7ef55b5a61db28 +# ap-northeast-2 v12.2.1 Enterprise FIPS: ami-03baf7f5d16b62c97 +# ap-northeast-3 v12.2.1 Enterprise FIPS: ami-0c6e4657d9c81de2b +# sa-east-1 v12.2.1 Enterprise FIPS: ami-0b921442d16dec334 +# ca-central-1 v12.2.1 Enterprise FIPS: ami-08daa5909c03d40ec +# ap-southeast-1 v12.2.1 Enterprise FIPS: ami-005d592c554af6610 +# ap-southeast-2 v12.2.1 Enterprise FIPS: ami-0c39aa2f43010aa37 +# eu-central-1 v12.2.1 Enterprise FIPS: ami-026e7bc8603d02dd0 +# us-east-1 v12.2.1 Enterprise FIPS: ami-08d28b442fa46668e +# us-east-2 v12.2.1 Enterprise FIPS: ami-016af5a43c11f8fb7 +# us-west-1 v12.2.1 Enterprise FIPS: ami-0c78103e3f2029b88 +# us-west-2 v12.2.1 Enterprise FIPS: ami-0c176ffeb5d06bdd0 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index cd1ad0c2c96..be571397d7b 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-12.1.0" +export TF_VAR_ami_name="gravitational-teleport-ami-ent-12.2.1" # 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 03058498e29..63115385bac 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-12.1.0" +TF_VAR_ami_name ?= "gravitational-teleport-ami-ent-12.2.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"