diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 8feb618b22c7f..76c3c641f10f9 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 ?= 15.1.1 +TELEPORT_VERSION ?= 15.1.3 # 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 eca2c0b9f0fb7..3aff5b89488b3 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 v15.1.1 arm64 OSS: ami-07cb9632251c57d48 -# ap-northeast-1 v15.1.1 x86_64 OSS: ami-06d569312fe507d0a -# ap-northeast-2 v15.1.1 arm64 OSS: ami-08606ddb4b0076969 -# ap-northeast-2 v15.1.1 x86_64 OSS: ami-0522fc6df7942e2f3 -# ap-northeast-3 v15.1.1 arm64 OSS: ami-0db378e5518c5d5a3 -# ap-northeast-3 v15.1.1 x86_64 OSS: ami-067d8042ce30d5fc0 -# ap-south-1 v15.1.1 arm64 OSS: ami-0dce58bd07e5b0ef3 -# ap-south-1 v15.1.1 x86_64 OSS: ami-057598bcaaca16e05 -# ap-southeast-1 v15.1.1 arm64 OSS: ami-0214f9a1e46c5a7b3 -# ap-southeast-1 v15.1.1 x86_64 OSS: ami-097caeae94731742c -# ap-southeast-2 v15.1.1 arm64 OSS: ami-0d03de9b3473ff263 -# ap-southeast-2 v15.1.1 x86_64 OSS: ami-0e5524326baa32e95 -# ca-central-1 v15.1.1 arm64 OSS: ami-078eef0eb07e166e9 -# ca-central-1 v15.1.1 x86_64 OSS: ami-04e58644c2def3f64 -# eu-central-1 v15.1.1 arm64 OSS: ami-0f4e473df307f7809 -# eu-central-1 v15.1.1 x86_64 OSS: ami-01f546857e66ebad6 -# eu-north-1 v15.1.1 arm64 OSS: ami-0e5181808e2a8e70c -# eu-north-1 v15.1.1 x86_64 OSS: ami-063fdd209bd569ed9 -# eu-west-1 v15.1.1 arm64 OSS: ami-075cb7e8ba0fd2b39 -# eu-west-1 v15.1.1 x86_64 OSS: ami-0aee2f094cf489843 -# eu-west-2 v15.1.1 arm64 OSS: ami-0e61907eafb2732bf -# eu-west-2 v15.1.1 x86_64 OSS: ami-0deba5a5aca4714a0 -# eu-west-3 v15.1.1 arm64 OSS: ami-04eeffb5c4fb0a6c1 -# eu-west-3 v15.1.1 x86_64 OSS: ami-0bb294445e0384f6f -# sa-east-1 v15.1.1 arm64 OSS: ami-07e050b2e5dd4ab2e -# sa-east-1 v15.1.1 x86_64 OSS: ami-040ed033fe31c76b1 -# us-east-1 v15.1.1 arm64 OSS: ami-0203780ba1beb26b0 -# us-east-1 v15.1.1 x86_64 OSS: ami-035942ba4b880410a -# us-east-2 v15.1.1 arm64 OSS: ami-03bdbdcbe8626b97c -# us-east-2 v15.1.1 x86_64 OSS: ami-03e17f1e25435cf67 -# us-west-1 v15.1.1 arm64 OSS: ami-03653bd87407af40b -# us-west-1 v15.1.1 x86_64 OSS: ami-0713d1045793f4913 -# us-west-2 v15.1.1 arm64 OSS: ami-0dbd904d85e36cb99 -# us-west-2 v15.1.1 x86_64 OSS: ami-00e2f52e269076594 +# ap-northeast-1 v15.1.3 arm64 OSS: ami-0b8e82944f1eb5eaf +# ap-northeast-1 v15.1.3 x86_64 OSS: ami-0205a0061288fbc9b +# ap-northeast-2 v15.1.3 arm64 OSS: ami-06f32c5a404ffbcd1 +# ap-northeast-2 v15.1.3 x86_64 OSS: ami-05b5020bc22404d73 +# ap-northeast-3 v15.1.3 arm64 OSS: ami-008aa983413411de5 +# ap-northeast-3 v15.1.3 x86_64 OSS: ami-05789908f0f058946 +# ap-south-1 v15.1.3 arm64 OSS: ami-04ee9667ce6b5f17e +# ap-south-1 v15.1.3 x86_64 OSS: ami-056978398122710f6 +# ap-southeast-1 v15.1.3 arm64 OSS: ami-06274c2e60eb2982d +# ap-southeast-1 v15.1.3 x86_64 OSS: ami-09b3b9b6a2a4b4403 +# ap-southeast-2 v15.1.3 arm64 OSS: ami-0e009a09952107262 +# ap-southeast-2 v15.1.3 x86_64 OSS: ami-0f35ca672c8056504 +# ca-central-1 v15.1.3 arm64 OSS: ami-071cc16056a442492 +# ca-central-1 v15.1.3 x86_64 OSS: ami-064f476effd8f7c9e +# eu-central-1 v15.1.3 arm64 OSS: ami-029b5ea14fbfee265 +# eu-central-1 v15.1.3 x86_64 OSS: ami-0c6095983c84a9027 +# eu-north-1 v15.1.3 arm64 OSS: ami-01d3481c19ce09c34 +# eu-north-1 v15.1.3 x86_64 OSS: ami-0a7bc3bc82228808c +# eu-west-1 v15.1.3 arm64 OSS: ami-0623d82d9d636c3d7 +# eu-west-1 v15.1.3 x86_64 OSS: ami-0c11f7e4abf353165 +# eu-west-2 v15.1.3 arm64 OSS: ami-0bb363e60efe3b848 +# eu-west-2 v15.1.3 x86_64 OSS: ami-0c32979e94551c056 +# eu-west-3 v15.1.3 arm64 OSS: ami-060a05b89be16997b +# eu-west-3 v15.1.3 x86_64 OSS: ami-04b451dac28b82fd4 +# sa-east-1 v15.1.3 arm64 OSS: ami-024a6fbcb382a4bcb +# sa-east-1 v15.1.3 x86_64 OSS: ami-035be67c87854ab5b +# us-east-1 v15.1.3 arm64 OSS: ami-0de24b7c3bb73b376 +# us-east-1 v15.1.3 x86_64 OSS: ami-0fb4abda5549982fb +# us-east-2 v15.1.3 arm64 OSS: ami-010cd6e1a603608b1 +# us-east-2 v15.1.3 x86_64 OSS: ami-0022f26b9f47f9193 +# us-west-1 v15.1.3 arm64 OSS: ami-06c743aa353d8fd0d +# us-west-1 v15.1.3 x86_64 OSS: ami-0012d0b9a7c535396 +# us-west-2 v15.1.3 arm64 OSS: ami-0e56ac677f15a94d0 +# us-west-2 v15.1.3 x86_64 OSS: ami-0ffb54b22ae6e04f0 ``` ### Enterprise ``` -# ap-northeast-1 v15.1.1 arm64 Enterprise: ami-09c727fa450f49a1d -# ap-northeast-1 v15.1.1 x86_64 Enterprise: ami-04363283d2245301d -# ap-northeast-2 v15.1.1 arm64 Enterprise: ami-06d9d783916ff6861 -# ap-northeast-2 v15.1.1 x86_64 Enterprise: ami-0c5a0c39ba7e2701e -# ap-northeast-3 v15.1.1 arm64 Enterprise: ami-04d960438c8f9a750 -# ap-northeast-3 v15.1.1 x86_64 Enterprise: ami-0fef964e5f9313f45 -# ap-south-1 v15.1.1 arm64 Enterprise: ami-0da51006f51d78cf9 -# ap-south-1 v15.1.1 x86_64 Enterprise: ami-06bd38d09a07f9562 -# ap-southeast-1 v15.1.1 arm64 Enterprise: ami-0052d5238e06af77b -# ap-southeast-1 v15.1.1 x86_64 Enterprise: ami-05e5132c7a005df52 -# ap-southeast-2 v15.1.1 arm64 Enterprise: ami-08b26bdc5476586db -# ap-southeast-2 v15.1.1 x86_64 Enterprise: ami-01556163d36bc2a71 -# ca-central-1 v15.1.1 arm64 Enterprise: ami-0626c1d71febe853c -# ca-central-1 v15.1.1 x86_64 Enterprise: ami-09b7c536ca2ddc09a -# eu-central-1 v15.1.1 arm64 Enterprise: ami-0ad3020b904679f8a -# eu-central-1 v15.1.1 x86_64 Enterprise: ami-046f6033e7f319245 -# eu-north-1 v15.1.1 arm64 Enterprise: ami-09cae8c4fcac7bcc8 -# eu-north-1 v15.1.1 x86_64 Enterprise: ami-0c174a98cd7e46b9a -# eu-west-1 v15.1.1 arm64 Enterprise: ami-05b70fc1249538b63 -# eu-west-1 v15.1.1 x86_64 Enterprise: ami-00e43cda4ae42c351 -# eu-west-2 v15.1.1 arm64 Enterprise: ami-0d9e86c0dff31df19 -# eu-west-2 v15.1.1 x86_64 Enterprise: ami-03a56f72a480774a6 -# eu-west-3 v15.1.1 arm64 Enterprise: ami-037ce3afe8a1def35 -# eu-west-3 v15.1.1 x86_64 Enterprise: ami-0e1cbf79ed0354051 -# sa-east-1 v15.1.1 arm64 Enterprise: ami-0072988a0d5d7d223 -# sa-east-1 v15.1.1 x86_64 Enterprise: ami-01244c99e397122f6 -# us-east-1 v15.1.1 arm64 Enterprise: ami-05c4e70d6fa9af17e -# us-east-1 v15.1.1 x86_64 Enterprise: ami-0387fdde721687510 -# us-east-2 v15.1.1 arm64 Enterprise: ami-045cd7c36f966a47e -# us-east-2 v15.1.1 x86_64 Enterprise: ami-0ce6ab51fc5ed539f -# us-west-1 v15.1.1 arm64 Enterprise: ami-02b43641db02c2bd7 -# us-west-1 v15.1.1 x86_64 Enterprise: ami-0d72ac40cbd9492c8 -# us-west-2 v15.1.1 arm64 Enterprise: ami-01cca01115620d67e -# us-west-2 v15.1.1 x86_64 Enterprise: ami-00c63954db799fce5 +# ap-northeast-1 v15.1.3 arm64 Enterprise: ami-076291a6df5f4e355 +# ap-northeast-1 v15.1.3 x86_64 Enterprise: ami-00ad4686e1b362f8b +# ap-northeast-2 v15.1.3 arm64 Enterprise: ami-082903b118964500c +# ap-northeast-2 v15.1.3 x86_64 Enterprise: ami-0ffcab1afc76d6972 +# ap-northeast-3 v15.1.3 arm64 Enterprise: ami-0c70d261c8347be06 +# ap-northeast-3 v15.1.3 x86_64 Enterprise: ami-02562e6f91f91fe20 +# ap-south-1 v15.1.3 arm64 Enterprise: ami-033d8ba9c5170fec7 +# ap-south-1 v15.1.3 x86_64 Enterprise: ami-0063ac735379adcca +# ap-southeast-1 v15.1.3 arm64 Enterprise: ami-001078c30f678d864 +# ap-southeast-1 v15.1.3 x86_64 Enterprise: ami-03006f1ddb0599548 +# ap-southeast-2 v15.1.3 arm64 Enterprise: ami-0d72df1bc48022af1 +# ap-southeast-2 v15.1.3 x86_64 Enterprise: ami-00407d8db94ceaf8e +# ca-central-1 v15.1.3 arm64 Enterprise: ami-065519fac53d0e11e +# ca-central-1 v15.1.3 x86_64 Enterprise: ami-043862752794d1eef +# eu-central-1 v15.1.3 arm64 Enterprise: ami-012a7079565f908c6 +# eu-central-1 v15.1.3 x86_64 Enterprise: ami-0b0749d615195f721 +# eu-north-1 v15.1.3 arm64 Enterprise: ami-0acd0e97e76a36e05 +# eu-north-1 v15.1.3 x86_64 Enterprise: ami-0e9e85c1501541058 +# eu-west-1 v15.1.3 arm64 Enterprise: ami-0ec8fc24792110dd5 +# eu-west-1 v15.1.3 x86_64 Enterprise: ami-0c472335a6464835c +# eu-west-2 v15.1.3 arm64 Enterprise: ami-068de96cfefc586ea +# eu-west-2 v15.1.3 x86_64 Enterprise: ami-016fd7543f20643fb +# eu-west-3 v15.1.3 arm64 Enterprise: ami-0e3e12bec7ca43c3e +# eu-west-3 v15.1.3 x86_64 Enterprise: ami-0cd67618ca0792031 +# sa-east-1 v15.1.3 arm64 Enterprise: ami-027fe77c85ce966e5 +# sa-east-1 v15.1.3 x86_64 Enterprise: ami-0a3c583d6e0fe007d +# us-east-1 v15.1.3 arm64 Enterprise: ami-03ecfc127bf58e377 +# us-east-1 v15.1.3 x86_64 Enterprise: ami-070a7a7f56cf8ce9c +# us-east-2 v15.1.3 arm64 Enterprise: ami-0f26648c644390a96 +# us-east-2 v15.1.3 x86_64 Enterprise: ami-04a3a19ab8d237b73 +# us-west-1 v15.1.3 arm64 Enterprise: ami-0b713d11a46f799bc +# us-west-1 v15.1.3 x86_64 Enterprise: ami-0246bec0d42266d3e +# us-west-2 v15.1.3 arm64 Enterprise: ami-075024765604af76e +# us-west-2 v15.1.3 x86_64 Enterprise: ami-0c78dd77fa763a6ae ``` ### Enterprise FIPS ``` -# ap-northeast-1 v15.1.1 arm64 Enterprise FIPS: ami-0c48a56892639327e -# ap-northeast-1 v15.1.1 x86_64 Enterprise FIPS: ami-06f6362a5c4a9ba60 -# ap-northeast-2 v15.1.1 arm64 Enterprise FIPS: ami-01847c915b89d563c -# ap-northeast-2 v15.1.1 x86_64 Enterprise FIPS: ami-02b375fe7aa8d5b4d -# ap-northeast-3 v15.1.1 arm64 Enterprise FIPS: ami-0e3d3480f1f67bdac -# ap-northeast-3 v15.1.1 x86_64 Enterprise FIPS: ami-0b7c9db258a83e4c1 -# ap-south-1 v15.1.1 arm64 Enterprise FIPS: ami-0c457c2276b897aaa -# ap-south-1 v15.1.1 x86_64 Enterprise FIPS: ami-021c3dad32d2fdbf6 -# ap-southeast-1 v15.1.1 arm64 Enterprise FIPS: ami-0fc5a963f2e436161 -# ap-southeast-1 v15.1.1 x86_64 Enterprise FIPS: ami-0090393b985d4cecb -# ap-southeast-2 v15.1.1 arm64 Enterprise FIPS: ami-09b22ad134ac96c2b -# ap-southeast-2 v15.1.1 x86_64 Enterprise FIPS: ami-0138f99a2507f4191 -# ca-central-1 v15.1.1 arm64 Enterprise FIPS: ami-06489ba9d066e721f -# ca-central-1 v15.1.1 x86_64 Enterprise FIPS: ami-09f501e4fc4b447d3 -# eu-central-1 v15.1.1 arm64 Enterprise FIPS: ami-04276de0e56218d17 -# eu-central-1 v15.1.1 x86_64 Enterprise FIPS: ami-02b01f9e8050f01f1 -# eu-north-1 v15.1.1 arm64 Enterprise FIPS: ami-0a81e2ec016390453 -# eu-north-1 v15.1.1 x86_64 Enterprise FIPS: ami-0eda01e100347f341 -# eu-west-1 v15.1.1 arm64 Enterprise FIPS: ami-0e33fc181ff0288ca -# eu-west-1 v15.1.1 x86_64 Enterprise FIPS: ami-03e9b09d07ae54e6f -# eu-west-2 v15.1.1 arm64 Enterprise FIPS: ami-063644afe7d5c0283 -# eu-west-2 v15.1.1 x86_64 Enterprise FIPS: ami-0f4d80a54e73378ff -# eu-west-3 v15.1.1 arm64 Enterprise FIPS: ami-0a5a4aa02aff15f44 -# eu-west-3 v15.1.1 x86_64 Enterprise FIPS: ami-03d73ecdfd8e65ad3 -# sa-east-1 v15.1.1 arm64 Enterprise FIPS: ami-0a59a787a6b1cd8d2 -# sa-east-1 v15.1.1 x86_64 Enterprise FIPS: ami-06c18bfa2af070e95 -# us-east-1 v15.1.1 arm64 Enterprise FIPS: ami-06fa2fcfc357e475a -# us-east-1 v15.1.1 x86_64 Enterprise FIPS: ami-069e38f2bad3ddd71 -# us-east-2 v15.1.1 arm64 Enterprise FIPS: ami-05bc7e96b66d7488a -# us-east-2 v15.1.1 x86_64 Enterprise FIPS: ami-049f61f0c7554f3ea -# us-west-1 v15.1.1 arm64 Enterprise FIPS: ami-0967d9d21dcb14441 -# us-west-1 v15.1.1 x86_64 Enterprise FIPS: ami-0aeff69ffd62862ca -# us-west-2 v15.1.1 arm64 Enterprise FIPS: ami-003a020c5b2c62052 -# us-west-2 v15.1.1 x86_64 Enterprise FIPS: ami-0a812b847ba2c2835 +# ap-northeast-1 v15.1.3 arm64 Enterprise FIPS: ami-094025fde0bfacf44 +# ap-northeast-1 v15.1.3 x86_64 Enterprise FIPS: ami-070a982e3b1277f5c +# ap-northeast-2 v15.1.3 arm64 Enterprise FIPS: ami-070d5328d53bdcdbd +# ap-northeast-2 v15.1.3 x86_64 Enterprise FIPS: ami-0cdfb33a233731c96 +# ap-northeast-3 v15.1.3 arm64 Enterprise FIPS: ami-0dcfa67fc6ef2e838 +# ap-northeast-3 v15.1.3 x86_64 Enterprise FIPS: ami-05512d07390aae28e +# ap-south-1 v15.1.3 arm64 Enterprise FIPS: ami-0b71860aafbb68a4a +# ap-south-1 v15.1.3 x86_64 Enterprise FIPS: ami-099d124f1a08d354a +# ap-southeast-1 v15.1.3 arm64 Enterprise FIPS: ami-06bd50c009c9e3348 +# ap-southeast-1 v15.1.3 x86_64 Enterprise FIPS: ami-04bed723a67223e39 +# ap-southeast-2 v15.1.3 arm64 Enterprise FIPS: ami-0fa7f303e1f85d1e0 +# ap-southeast-2 v15.1.3 x86_64 Enterprise FIPS: ami-006813dad80660235 +# ca-central-1 v15.1.3 arm64 Enterprise FIPS: ami-046b2a6fa9cb815e9 +# ca-central-1 v15.1.3 x86_64 Enterprise FIPS: ami-02a019b3d17c1cfe6 +# eu-central-1 v15.1.3 arm64 Enterprise FIPS: ami-0f28d5d5bae66e589 +# eu-central-1 v15.1.3 x86_64 Enterprise FIPS: ami-093988bd5fe4e923c +# eu-north-1 v15.1.3 arm64 Enterprise FIPS: ami-06a0a3753ce6b0113 +# eu-north-1 v15.1.3 x86_64 Enterprise FIPS: ami-07a7b3b2070fcbd66 +# eu-west-1 v15.1.3 arm64 Enterprise FIPS: ami-06a30361443f2e573 +# eu-west-1 v15.1.3 x86_64 Enterprise FIPS: ami-02072d848ed2d529b +# eu-west-2 v15.1.3 arm64 Enterprise FIPS: ami-0a7ca5049e72158fe +# eu-west-2 v15.1.3 x86_64 Enterprise FIPS: ami-0af1fde7c8249f0c8 +# eu-west-3 v15.1.3 arm64 Enterprise FIPS: ami-0228509268788ad7e +# eu-west-3 v15.1.3 x86_64 Enterprise FIPS: ami-0f75259be92c97e3a +# sa-east-1 v15.1.3 arm64 Enterprise FIPS: ami-085e06f14ad662ec9 +# sa-east-1 v15.1.3 x86_64 Enterprise FIPS: ami-0e720799bf5eb272f +# us-east-1 v15.1.3 arm64 Enterprise FIPS: ami-002753efdfa738287 +# us-east-1 v15.1.3 x86_64 Enterprise FIPS: ami-0ea48740e61741b7a +# us-east-2 v15.1.3 arm64 Enterprise FIPS: ami-064f2e94629d00fae +# us-east-2 v15.1.3 x86_64 Enterprise FIPS: ami-014d42d0747bc2ea4 +# us-west-1 v15.1.3 arm64 Enterprise FIPS: ami-0a41ccd478746d25c +# us-west-1 v15.1.3 x86_64 Enterprise FIPS: ami-004f0fa5c2d67a6ea +# us-west-2 v15.1.3 arm64 Enterprise FIPS: ami-0c33a5cce2b47f7e3 +# us-west-2 v15.1.3 x86_64 Enterprise FIPS: ami-06ffdd3dda3992577 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index 0b16a9e007a5c..de026139a137f 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 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="teleport-ent-15.1.1-arm64" +export TF_VAR_ami_name="teleport-ent-15.1.3-arm64" # 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 0e07232cfd512..80b18768fcb44 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 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name -TF_VAR_ami_name ?= "teleport-ent-15.1.1-arm64" +TF_VAR_ami_name ?= "teleport-ent-15.1.3-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"