diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 278763f3076..6ea827f1e85 100644 --- a/assets/aws/Makefile +++ b/assets/aws/Makefile @@ -2,7 +2,7 @@ # This must be a _released_ version of Teleport, i.e. one which has binaries # available for download on https://goteleport.com/download # Unreleased versions will fail to build. -TELEPORT_VERSION ?= 18.7.6 +TELEPORT_VERSION ?= 18.8.0 # 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 b1d3e7d811b..b76ade741ca 100644 --- a/examples/aws/terraform/AMIS.md +++ b/examples/aws/terraform/AMIS.md @@ -6,116 +6,116 @@ This list is updated when new AMI versions are released. ### OSS ``` -# ap-northeast-1 v18.7.6 arm64 OSS: ami-0f8c07d15fb867222 -# ap-northeast-1 v18.7.6 x86_64 OSS: ami-02cacf989b0bee168 -# ap-northeast-2 v18.7.6 arm64 OSS: ami-089126b564ba42c42 -# ap-northeast-2 v18.7.6 x86_64 OSS: ami-0b18911aa6098bfa1 -# ap-northeast-3 v18.7.6 arm64 OSS: ami-0edd6f8f24e6acf78 -# ap-northeast-3 v18.7.6 x86_64 OSS: ami-0cb38195d3ef05b53 -# ap-south-1 v18.7.6 arm64 OSS: ami-080d811fd8d94c65c -# ap-south-1 v18.7.6 x86_64 OSS: ami-04bfda1fb2a6b9a25 -# ap-southeast-1 v18.7.6 arm64 OSS: ami-0c2aa7395ad1ec7f5 -# ap-southeast-1 v18.7.6 x86_64 OSS: ami-02eafc82bcb2005ab -# ap-southeast-2 v18.7.6 arm64 OSS: ami-05b3412234f0be83f -# ap-southeast-2 v18.7.6 x86_64 OSS: ami-021f9ec114bf6a3df -# ca-central-1 v18.7.6 arm64 OSS: ami-04cfcaac4ca8e0bcf -# ca-central-1 v18.7.6 x86_64 OSS: ami-02276b7e70e0ea48a -# eu-central-1 v18.7.6 arm64 OSS: ami-03e0078df512160ad -# eu-central-1 v18.7.6 x86_64 OSS: ami-0d31d441725e79332 -# eu-north-1 v18.7.6 arm64 OSS: ami-01b298d7fb39f2975 -# eu-north-1 v18.7.6 x86_64 OSS: ami-0d18008d945d68aeb -# eu-west-1 v18.7.6 arm64 OSS: ami-042864a09ca5b9767 -# eu-west-1 v18.7.6 x86_64 OSS: ami-07de5699378b874ba -# eu-west-2 v18.7.6 arm64 OSS: ami-00a84a853037a9b2b -# eu-west-2 v18.7.6 x86_64 OSS: ami-0869110f67728a917 -# eu-west-3 v18.7.6 arm64 OSS: ami-07b1b4e06d361e181 -# eu-west-3 v18.7.6 x86_64 OSS: ami-07dcb2fd8a9278759 -# sa-east-1 v18.7.6 arm64 OSS: ami-0a54a63c02088b817 -# sa-east-1 v18.7.6 x86_64 OSS: ami-0c5d2d3e50dbc2d4e -# us-east-1 v18.7.6 arm64 OSS: ami-03b314b7f8806034e -# us-east-1 v18.7.6 x86_64 OSS: ami-039bda843fb3dc855 -# us-east-2 v18.7.6 arm64 OSS: ami-0692937325c768a80 -# us-east-2 v18.7.6 x86_64 OSS: ami-04b4556802f60c572 -# us-west-1 v18.7.6 arm64 OSS: ami-0afa67d987e697df4 -# us-west-1 v18.7.6 x86_64 OSS: ami-00fd145f7f2164eda -# us-west-2 v18.7.6 arm64 OSS: ami-0b1d8837185b49f91 -# us-west-2 v18.7.6 x86_64 OSS: ami-0734fb5853259f63f +# ap-northeast-1 v18.8.0 arm64 OSS: ami-00f433b20255afff4 +# ap-northeast-1 v18.8.0 x86_64 OSS: ami-0af70580be5b088de +# ap-northeast-2 v18.8.0 arm64 OSS: ami-00f0b2cef6110c504 +# ap-northeast-2 v18.8.0 x86_64 OSS: ami-0a45592c91178a37f +# ap-northeast-3 v18.8.0 arm64 OSS: ami-0533034fcdb72cd30 +# ap-northeast-3 v18.8.0 x86_64 OSS: ami-0d1008f75e025fc1e +# ap-south-1 v18.8.0 arm64 OSS: ami-00f83cc97f0760013 +# ap-south-1 v18.8.0 x86_64 OSS: ami-00f16b916519c957e +# ap-southeast-1 v18.8.0 arm64 OSS: ami-0b68712fd34e49eac +# ap-southeast-1 v18.8.0 x86_64 OSS: ami-0e9c019f44def39f9 +# ap-southeast-2 v18.8.0 arm64 OSS: ami-0cddac1c26b6198bb +# ap-southeast-2 v18.8.0 x86_64 OSS: ami-02cacd4b3ccea187e +# ca-central-1 v18.8.0 arm64 OSS: ami-0d728e48356046428 +# ca-central-1 v18.8.0 x86_64 OSS: ami-078b5c2285123afee +# eu-central-1 v18.8.0 arm64 OSS: ami-0ac1985ccb95a5f93 +# eu-central-1 v18.8.0 x86_64 OSS: ami-0a8947633b5dd5acf +# eu-north-1 v18.8.0 arm64 OSS: ami-00242ecc8e52b8b02 +# eu-north-1 v18.8.0 x86_64 OSS: ami-0f7223a88ad15c04b +# eu-west-1 v18.8.0 arm64 OSS: ami-0d5a88f0d9f466922 +# eu-west-1 v18.8.0 x86_64 OSS: ami-0ab74e743962bab08 +# eu-west-2 v18.8.0 arm64 OSS: ami-09cbb8c941c7b3da7 +# eu-west-2 v18.8.0 x86_64 OSS: ami-0628b5610372964dc +# eu-west-3 v18.8.0 arm64 OSS: ami-073fa8c302a5d6592 +# eu-west-3 v18.8.0 x86_64 OSS: ami-0af4697edd4627b3b +# sa-east-1 v18.8.0 arm64 OSS: ami-0b68620fdca06c922 +# sa-east-1 v18.8.0 x86_64 OSS: ami-006da77fc3bdd135e +# us-east-1 v18.8.0 arm64 OSS: ami-021d4f7bd0572a066 +# us-east-1 v18.8.0 x86_64 OSS: ami-06398b2f6f22b83f2 +# us-east-2 v18.8.0 arm64 OSS: ami-0ef6c92f67d6a0c2c +# us-east-2 v18.8.0 x86_64 OSS: ami-0ba57f930b2f9e557 +# us-west-1 v18.8.0 arm64 OSS: ami-0fedd2f5d6f69762b +# us-west-1 v18.8.0 x86_64 OSS: ami-011d7a01fb11c8526 +# us-west-2 v18.8.0 arm64 OSS: ami-04a4fcb9b81985146 +# us-west-2 v18.8.0 x86_64 OSS: ami-0459178aa1ca43dc0 ``` ### Enterprise ``` -# ap-northeast-1 v18.7.6 arm64 Enterprise: ami-0ab664e689ba96ea5 -# ap-northeast-1 v18.7.6 x86_64 Enterprise: ami-0f5e681189d57ccf8 -# ap-northeast-2 v18.7.6 arm64 Enterprise: ami-0f65b46125598c482 -# ap-northeast-2 v18.7.6 x86_64 Enterprise: ami-0ec48c8d9d3d23947 -# ap-northeast-3 v18.7.6 arm64 Enterprise: ami-0d71bdea8da45aa33 -# ap-northeast-3 v18.7.6 x86_64 Enterprise: ami-0710591ba8e97b688 -# ap-south-1 v18.7.6 arm64 Enterprise: ami-08b964c37d6bf1c56 -# ap-south-1 v18.7.6 x86_64 Enterprise: ami-07110deecce8fe9cf -# ap-southeast-1 v18.7.6 arm64 Enterprise: ami-04455bf1b5f4b282b -# ap-southeast-1 v18.7.6 x86_64 Enterprise: ami-0e1ce84bff2d36966 -# ap-southeast-2 v18.7.6 arm64 Enterprise: ami-00c382c89ef8fb7a8 -# ap-southeast-2 v18.7.6 x86_64 Enterprise: ami-0a87b2d91fad50efd -# ca-central-1 v18.7.6 arm64 Enterprise: ami-0e38eb275aa1f83ec -# ca-central-1 v18.7.6 x86_64 Enterprise: ami-097fe5fc2bfded6c1 -# eu-central-1 v18.7.6 arm64 Enterprise: ami-045ae99c02f0b6295 -# eu-central-1 v18.7.6 x86_64 Enterprise: ami-085ce8e0857a86aba -# eu-north-1 v18.7.6 arm64 Enterprise: ami-0763918089c643ee4 -# eu-north-1 v18.7.6 x86_64 Enterprise: ami-016e6e291b78fb854 -# eu-west-1 v18.7.6 arm64 Enterprise: ami-023326c27e4880a40 -# eu-west-1 v18.7.6 x86_64 Enterprise: ami-0894b2aa27e3ff031 -# eu-west-2 v18.7.6 arm64 Enterprise: ami-08a9346fec6e616da -# eu-west-2 v18.7.6 x86_64 Enterprise: ami-0541c5776a1602fa3 -# eu-west-3 v18.7.6 arm64 Enterprise: ami-063b44c3388b5d5e2 -# eu-west-3 v18.7.6 x86_64 Enterprise: ami-0dea5910db6e862cf -# sa-east-1 v18.7.6 arm64 Enterprise: ami-00fe49bfe7d6a3f29 -# sa-east-1 v18.7.6 x86_64 Enterprise: ami-0d6d21c17ab252af2 -# us-east-1 v18.7.6 arm64 Enterprise: ami-062156e583e8f0c57 -# us-east-1 v18.7.6 x86_64 Enterprise: ami-087b078fc93c84200 -# us-east-2 v18.7.6 arm64 Enterprise: ami-0995c7a5ea0cd7940 -# us-east-2 v18.7.6 x86_64 Enterprise: ami-03ee229d2c5246c34 -# us-west-1 v18.7.6 arm64 Enterprise: ami-064e76fd3f617d821 -# us-west-1 v18.7.6 x86_64 Enterprise: ami-08be6fe1b71611cad -# us-west-2 v18.7.6 arm64 Enterprise: ami-0c756c842f4fb9da6 -# us-west-2 v18.7.6 x86_64 Enterprise: ami-0ac5cc0aa68f300d9 +# ap-northeast-1 v18.8.0 arm64 Enterprise: ami-0bed79c11f60f3942 +# ap-northeast-1 v18.8.0 x86_64 Enterprise: ami-0549c0ffd60358877 +# ap-northeast-2 v18.8.0 arm64 Enterprise: ami-0f2b710900a9de449 +# ap-northeast-2 v18.8.0 x86_64 Enterprise: ami-0354ccbb9cb1e9764 +# ap-northeast-3 v18.8.0 arm64 Enterprise: ami-0c08350a8e4aa4fb3 +# ap-northeast-3 v18.8.0 x86_64 Enterprise: ami-0ed8179e2495ac07c +# ap-south-1 v18.8.0 arm64 Enterprise: ami-076780b1cbf2a94ca +# ap-south-1 v18.8.0 x86_64 Enterprise: ami-039c16a898aae2106 +# ap-southeast-1 v18.8.0 arm64 Enterprise: ami-0a93f5b4c0592afdd +# ap-southeast-1 v18.8.0 x86_64 Enterprise: ami-0e80eef0f25abc11c +# ap-southeast-2 v18.8.0 arm64 Enterprise: ami-035a151a94a22c26b +# ap-southeast-2 v18.8.0 x86_64 Enterprise: ami-0b54464c1ac250e24 +# ca-central-1 v18.8.0 arm64 Enterprise: ami-0a5cbd18e8bca913a +# ca-central-1 v18.8.0 x86_64 Enterprise: ami-01a88b3ce37024ba3 +# eu-central-1 v18.8.0 arm64 Enterprise: ami-09e1552dc06faff0c +# eu-central-1 v18.8.0 x86_64 Enterprise: ami-0a9409d42a35d8a71 +# eu-north-1 v18.8.0 arm64 Enterprise: ami-0c3842ce66c956a99 +# eu-north-1 v18.8.0 x86_64 Enterprise: ami-020718b19da484e2f +# eu-west-1 v18.8.0 arm64 Enterprise: ami-0e57bb55e0cbc737f +# eu-west-1 v18.8.0 x86_64 Enterprise: ami-08f2c9b3b2632fd9d +# eu-west-2 v18.8.0 arm64 Enterprise: ami-091fed1f78054e517 +# eu-west-2 v18.8.0 x86_64 Enterprise: ami-0cfeb1119506dc200 +# eu-west-3 v18.8.0 arm64 Enterprise: ami-0a95f61433cadd298 +# eu-west-3 v18.8.0 x86_64 Enterprise: ami-0deb5256a642107aa +# sa-east-1 v18.8.0 arm64 Enterprise: ami-0b9260c9befc0a0e7 +# sa-east-1 v18.8.0 x86_64 Enterprise: ami-0fc961b2ecb5628a1 +# us-east-1 v18.8.0 arm64 Enterprise: ami-0d48404e37586ecc7 +# us-east-1 v18.8.0 x86_64 Enterprise: ami-0ad95c0257d07355c +# us-east-2 v18.8.0 arm64 Enterprise: ami-09de6b5f459a4b912 +# us-east-2 v18.8.0 x86_64 Enterprise: ami-0cb6aaf8ea082a702 +# us-west-1 v18.8.0 arm64 Enterprise: ami-084fd95c4edb9a2ad +# us-west-1 v18.8.0 x86_64 Enterprise: ami-08b215bb7a790ff39 +# us-west-2 v18.8.0 arm64 Enterprise: ami-049b9b9f0b306fdaa +# us-west-2 v18.8.0 x86_64 Enterprise: ami-09567d62e12183272 ``` ### Enterprise FIPS ``` -# ap-northeast-1 v18.7.6 arm64 Enterprise FIPS: ami-0e49a634e6900366b -# ap-northeast-1 v18.7.6 x86_64 Enterprise FIPS: ami-0fc110b24a8d31e0e -# ap-northeast-2 v18.7.6 arm64 Enterprise FIPS: ami-05f42d88933e1e93f -# ap-northeast-2 v18.7.6 x86_64 Enterprise FIPS: ami-0a2d09a2e46c2b06a -# ap-northeast-3 v18.7.6 arm64 Enterprise FIPS: ami-0f45da69512667b48 -# ap-northeast-3 v18.7.6 x86_64 Enterprise FIPS: ami-0591e03f5150076fb -# ap-south-1 v18.7.6 arm64 Enterprise FIPS: ami-0e499004cc4f10bf0 -# ap-south-1 v18.7.6 x86_64 Enterprise FIPS: ami-058d4c79c04fbe225 -# ap-southeast-1 v18.7.6 arm64 Enterprise FIPS: ami-017f26142ced10058 -# ap-southeast-1 v18.7.6 x86_64 Enterprise FIPS: ami-0570d53609fef68d6 -# ap-southeast-2 v18.7.6 arm64 Enterprise FIPS: ami-0dc7b824c3d1464b6 -# ap-southeast-2 v18.7.6 x86_64 Enterprise FIPS: ami-0645f259b181f2b79 -# ca-central-1 v18.7.6 arm64 Enterprise FIPS: ami-024054cd9bf9c153d -# ca-central-1 v18.7.6 x86_64 Enterprise FIPS: ami-08af9afaa06d52333 -# eu-central-1 v18.7.6 arm64 Enterprise FIPS: ami-0d4c8b5452aed582f -# eu-central-1 v18.7.6 x86_64 Enterprise FIPS: ami-080160f10a87977dd -# eu-north-1 v18.7.6 arm64 Enterprise FIPS: ami-0de55b2bca7894836 -# eu-north-1 v18.7.6 x86_64 Enterprise FIPS: ami-0196b7258ffd5560e -# eu-west-1 v18.7.6 arm64 Enterprise FIPS: ami-0ae1feaafecf5c324 -# eu-west-1 v18.7.6 x86_64 Enterprise FIPS: ami-0634e8a78bd6da8e9 -# eu-west-2 v18.7.6 arm64 Enterprise FIPS: ami-0d17627c77a3d66d4 -# eu-west-2 v18.7.6 x86_64 Enterprise FIPS: ami-0200930c8e09a4794 -# eu-west-3 v18.7.6 arm64 Enterprise FIPS: ami-05a503e56a03202f2 -# eu-west-3 v18.7.6 x86_64 Enterprise FIPS: ami-0cb1f9cfc8b2f5216 -# sa-east-1 v18.7.6 arm64 Enterprise FIPS: ami-05f45bd5d36b487a7 -# sa-east-1 v18.7.6 x86_64 Enterprise FIPS: ami-01fc8ef90497ff64e -# us-east-1 v18.7.6 arm64 Enterprise FIPS: ami-0abcc6d49cb892f48 -# us-east-1 v18.7.6 x86_64 Enterprise FIPS: ami-0b5f69b19aff64ca5 -# us-east-2 v18.7.6 arm64 Enterprise FIPS: ami-09667c68ea1cbd63b -# us-east-2 v18.7.6 x86_64 Enterprise FIPS: ami-06ae464571d64921d -# us-west-1 v18.7.6 arm64 Enterprise FIPS: ami-0dbba2aab7ec4eae0 -# us-west-1 v18.7.6 x86_64 Enterprise FIPS: ami-04c99e6f1ed53cd38 -# us-west-2 v18.7.6 arm64 Enterprise FIPS: ami-0b21b3730ea38946e -# us-west-2 v18.7.6 x86_64 Enterprise FIPS: ami-031f02d821ee78b65 +# ap-northeast-1 v18.8.0 arm64 Enterprise FIPS: ami-06722b4e3962ba74e +# ap-northeast-1 v18.8.0 x86_64 Enterprise FIPS: ami-05817ff9995d4f8b3 +# ap-northeast-2 v18.8.0 arm64 Enterprise FIPS: ami-0233ea654f30e3f0a +# ap-northeast-2 v18.8.0 x86_64 Enterprise FIPS: ami-059a660b415c3ecac +# ap-northeast-3 v18.8.0 arm64 Enterprise FIPS: ami-0b3d09a94aed95859 +# ap-northeast-3 v18.8.0 x86_64 Enterprise FIPS: ami-0bb879cd1926e26b9 +# ap-south-1 v18.8.0 arm64 Enterprise FIPS: ami-0365446561b6b5cb6 +# ap-south-1 v18.8.0 x86_64 Enterprise FIPS: ami-06fd58d2591ac71f0 +# ap-southeast-1 v18.8.0 arm64 Enterprise FIPS: ami-03954c2d8bc268128 +# ap-southeast-1 v18.8.0 x86_64 Enterprise FIPS: ami-0e9d443834f69c30e +# ap-southeast-2 v18.8.0 arm64 Enterprise FIPS: ami-0629f474a4d6e28cb +# ap-southeast-2 v18.8.0 x86_64 Enterprise FIPS: ami-0fc818073b5fc8085 +# ca-central-1 v18.8.0 arm64 Enterprise FIPS: ami-0cf10d83db8aead6d +# ca-central-1 v18.8.0 x86_64 Enterprise FIPS: ami-02bdf2b714e893244 +# eu-central-1 v18.8.0 arm64 Enterprise FIPS: ami-017a9fd869fe9506b +# eu-central-1 v18.8.0 x86_64 Enterprise FIPS: ami-0ed4de6a2467105b1 +# eu-north-1 v18.8.0 arm64 Enterprise FIPS: ami-0faeed2d7a7a6a3a0 +# eu-north-1 v18.8.0 x86_64 Enterprise FIPS: ami-04edc4572d0029071 +# eu-west-1 v18.8.0 arm64 Enterprise FIPS: ami-01ac152653a68a094 +# eu-west-1 v18.8.0 x86_64 Enterprise FIPS: ami-03cd08d2b075060cf +# eu-west-2 v18.8.0 arm64 Enterprise FIPS: ami-0d88f84d0fb5036db +# eu-west-2 v18.8.0 x86_64 Enterprise FIPS: ami-03ddba9356680f52c +# eu-west-3 v18.8.0 arm64 Enterprise FIPS: ami-0cd1be6bb6441bf4d +# eu-west-3 v18.8.0 x86_64 Enterprise FIPS: ami-0089e9148f72a9717 +# sa-east-1 v18.8.0 arm64 Enterprise FIPS: ami-0d0c1f87fec687df7 +# sa-east-1 v18.8.0 x86_64 Enterprise FIPS: ami-0e0ea1a8d15fde195 +# us-east-1 v18.8.0 arm64 Enterprise FIPS: ami-029aa468678991615 +# us-east-1 v18.8.0 x86_64 Enterprise FIPS: ami-0c731d36c70879630 +# us-east-2 v18.8.0 arm64 Enterprise FIPS: ami-0b1368c24ffbfe05a +# us-east-2 v18.8.0 x86_64 Enterprise FIPS: ami-08fc5d23b14a3a0b8 +# us-west-1 v18.8.0 arm64 Enterprise FIPS: ami-05c4045efb7994753 +# us-west-1 v18.8.0 x86_64 Enterprise FIPS: ami-04631313898b333e0 +# us-west-2 v18.8.0 arm64 Enterprise FIPS: ami-0c995411364ababdf +# us-west-2 v18.8.0 x86_64 Enterprise FIPS: ami-05689672c298c1b8b ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index 019dffbb2a6..24aa87516f6 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 146628656107 --filters 'Name=name,Values=teleport-oss-*' # Enterprise: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-ent-*' # FIPS images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name -export TF_VAR_ami_name="teleport-ent-18.7.6-arm64" +export TF_VAR_ami_name="teleport-ent-18.8.0-arm64" # Instance types used for authentication server auto scaling group # This should match to the AMI instance architecture type, ARM or x86 diff --git a/examples/aws/terraform/starter-cluster/README.md b/examples/aws/terraform/starter-cluster/README.md index 4582a0f82cc..b704ebd6563 100644 --- a/examples/aws/terraform/starter-cluster/README.md +++ b/examples/aws/terraform/starter-cluster/README.md @@ -98,7 +98,7 @@ TF_VAR_license_path ?= "/path/to/license" # OSS: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-oss-*' # Enterprise: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-ent-*' # FIPS images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name -TF_VAR_ami_name ?= "teleport-ent-18.7.6-arm64" +TF_VAR_ami_name ?= "teleport-ent-18.8.0-arm64" # Route 53 hosted zone to use, must be a root zone registered in AWS, e.g. example.com TF_VAR_route53_zone ?= "example.com"