diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 76c3c641f10..7ebcb009f7a 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.3 +TELEPORT_VERSION ?= 15.1.4 # 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 3aff5b89488..d3da0c608c4 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.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 +# ap-northeast-1 v15.1.4 arm64 OSS: ami-0e594178ebbe37a2c +# ap-northeast-1 v15.1.4 x86_64 OSS: ami-090a50f0c17933db9 +# ap-northeast-2 v15.1.4 arm64 OSS: ami-0f26bec1d7c55c086 +# ap-northeast-2 v15.1.4 x86_64 OSS: ami-09069a9e8086eb6cc +# ap-northeast-3 v15.1.4 arm64 OSS: ami-0febda2ce1b06e6e9 +# ap-northeast-3 v15.1.4 x86_64 OSS: ami-08c88b71f33c92715 +# ap-south-1 v15.1.4 arm64 OSS: ami-067bf3e87174d755d +# ap-south-1 v15.1.4 x86_64 OSS: ami-0f609ab91698d3f2d +# ap-southeast-1 v15.1.4 arm64 OSS: ami-0256bf7fd5700f388 +# ap-southeast-1 v15.1.4 x86_64 OSS: ami-0f3c4b747e48e48d4 +# ap-southeast-2 v15.1.4 arm64 OSS: ami-0c1a8c51d682b76c7 +# ap-southeast-2 v15.1.4 x86_64 OSS: ami-0181f6c272005f96d +# ca-central-1 v15.1.4 arm64 OSS: ami-074ddce88269392c8 +# ca-central-1 v15.1.4 x86_64 OSS: ami-0b56b882fee098ba3 +# eu-central-1 v15.1.4 arm64 OSS: ami-0ff3de624a2addbf1 +# eu-central-1 v15.1.4 x86_64 OSS: ami-0dee33e2b16a20c46 +# eu-north-1 v15.1.4 arm64 OSS: ami-0a30a1cafac76133b +# eu-north-1 v15.1.4 x86_64 OSS: ami-031a624dcbffa9fbb +# eu-west-1 v15.1.4 arm64 OSS: ami-07626a7c675ebd2f8 +# eu-west-1 v15.1.4 x86_64 OSS: ami-0cafa3bec68b27357 +# eu-west-2 v15.1.4 arm64 OSS: ami-03968245aab9f1fc6 +# eu-west-2 v15.1.4 x86_64 OSS: ami-0c9366697804f4beb +# eu-west-3 v15.1.4 arm64 OSS: ami-05e88b077cd5c469d +# eu-west-3 v15.1.4 x86_64 OSS: ami-008ab033f4325bbc2 +# sa-east-1 v15.1.4 arm64 OSS: ami-04cb986c26cb1b02a +# sa-east-1 v15.1.4 x86_64 OSS: ami-08c842f9d0b7c2535 +# us-east-1 v15.1.4 arm64 OSS: ami-04bd257e413f9a229 +# us-east-1 v15.1.4 x86_64 OSS: ami-02a0e345a73a934f0 +# us-east-2 v15.1.4 arm64 OSS: ami-028e6adef15fb613a +# us-east-2 v15.1.4 x86_64 OSS: ami-09f90da681c956fd2 +# us-west-1 v15.1.4 arm64 OSS: ami-0b69c1bad54a45836 +# us-west-1 v15.1.4 x86_64 OSS: ami-0aa9c094a61547b12 +# us-west-2 v15.1.4 arm64 OSS: ami-0589a67936b79ca46 +# us-west-2 v15.1.4 x86_64 OSS: ami-058180661c996c6ad ``` ### Enterprise ``` -# 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 +# ap-northeast-1 v15.1.4 arm64 Enterprise: ami-0adaedfaa26b6559c +# ap-northeast-1 v15.1.4 x86_64 Enterprise: ami-0d68ee5852b9e66cc +# ap-northeast-2 v15.1.4 arm64 Enterprise: ami-0ed1c5907f38b4ebf +# ap-northeast-2 v15.1.4 x86_64 Enterprise: ami-0f9b40e498dc96427 +# ap-northeast-3 v15.1.4 arm64 Enterprise: ami-06a17e888a36631ad +# ap-northeast-3 v15.1.4 x86_64 Enterprise: ami-0a98808fb3eaa891b +# ap-south-1 v15.1.4 arm64 Enterprise: ami-0aaa557ee308e8f56 +# ap-south-1 v15.1.4 x86_64 Enterprise: ami-0b1b6cea804cf3aea +# ap-southeast-1 v15.1.4 arm64 Enterprise: ami-023ad47cdf01b3476 +# ap-southeast-1 v15.1.4 x86_64 Enterprise: ami-0d3fbde78dd43289a +# ap-southeast-2 v15.1.4 arm64 Enterprise: ami-07eeeb93145922e1d +# ap-southeast-2 v15.1.4 x86_64 Enterprise: ami-0e5eb575aaefa4af1 +# ca-central-1 v15.1.4 arm64 Enterprise: ami-038f2e7c8ceb80baf +# ca-central-1 v15.1.4 x86_64 Enterprise: ami-0335d1c0f6bd5dbe2 +# eu-central-1 v15.1.4 arm64 Enterprise: ami-044f4f7e0c10834e2 +# eu-central-1 v15.1.4 x86_64 Enterprise: ami-08d208110a1f1c0ad +# eu-north-1 v15.1.4 arm64 Enterprise: ami-0f7a3444133b6195a +# eu-north-1 v15.1.4 x86_64 Enterprise: ami-0b9dcd80b011f36af +# eu-west-1 v15.1.4 arm64 Enterprise: ami-0943c8b611c2cbac9 +# eu-west-1 v15.1.4 x86_64 Enterprise: ami-03343826d69350eac +# eu-west-2 v15.1.4 arm64 Enterprise: ami-0e840f2896072bf32 +# eu-west-2 v15.1.4 x86_64 Enterprise: ami-026a41cd17f3b65a5 +# eu-west-3 v15.1.4 arm64 Enterprise: ami-0a8aefbe156c57cef +# eu-west-3 v15.1.4 x86_64 Enterprise: ami-0f53dacf5536fc6d4 +# sa-east-1 v15.1.4 arm64 Enterprise: ami-0c1cd556c4ba92586 +# sa-east-1 v15.1.4 x86_64 Enterprise: ami-071f2b4fde655620b +# us-east-1 v15.1.4 arm64 Enterprise: ami-0aaf4c238dd286595 +# us-east-1 v15.1.4 x86_64 Enterprise: ami-016e991e0784b7421 +# us-east-2 v15.1.4 arm64 Enterprise: ami-0a2558d97f8883d2a +# us-east-2 v15.1.4 x86_64 Enterprise: ami-004970acc92d25d6a +# us-west-1 v15.1.4 arm64 Enterprise: ami-0ffbab78b443f4bbf +# us-west-1 v15.1.4 x86_64 Enterprise: ami-0638b7c9e7e259e74 +# us-west-2 v15.1.4 arm64 Enterprise: ami-07a649f067881e96a +# us-west-2 v15.1.4 x86_64 Enterprise: ami-0b950d8aa2f448dd4 ``` ### Enterprise FIPS ``` -# 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 +# ap-northeast-1 v15.1.4 arm64 Enterprise FIPS: ami-0bccff358afde460d +# ap-northeast-1 v15.1.4 x86_64 Enterprise FIPS: ami-061c65f8b4235896e +# ap-northeast-2 v15.1.4 arm64 Enterprise FIPS: ami-0c0b2e262d70da725 +# ap-northeast-2 v15.1.4 x86_64 Enterprise FIPS: ami-03927720ba52f978c +# ap-northeast-3 v15.1.4 arm64 Enterprise FIPS: ami-0c4ca61101bc55dbc +# ap-northeast-3 v15.1.4 x86_64 Enterprise FIPS: ami-0b2d61be64671a155 +# ap-south-1 v15.1.4 arm64 Enterprise FIPS: ami-0b6a5b5561a0695eb +# ap-south-1 v15.1.4 x86_64 Enterprise FIPS: ami-0c0d365d90c17a2eb +# ap-southeast-1 v15.1.4 arm64 Enterprise FIPS: ami-0a0c6c2efa2b061c7 +# ap-southeast-1 v15.1.4 x86_64 Enterprise FIPS: ami-022645e5a668199d7 +# ap-southeast-2 v15.1.4 arm64 Enterprise FIPS: ami-06cd28abcf4f3d912 +# ap-southeast-2 v15.1.4 x86_64 Enterprise FIPS: ami-0eccad451f962da77 +# ca-central-1 v15.1.4 arm64 Enterprise FIPS: ami-040aac6ba1b6c4d41 +# ca-central-1 v15.1.4 x86_64 Enterprise FIPS: ami-08e0798740300e9f3 +# eu-central-1 v15.1.4 arm64 Enterprise FIPS: ami-062ff4459280b8c2a +# eu-central-1 v15.1.4 x86_64 Enterprise FIPS: ami-095419b4d750b3f16 +# eu-north-1 v15.1.4 arm64 Enterprise FIPS: ami-0b357ae0163247c33 +# eu-north-1 v15.1.4 x86_64 Enterprise FIPS: ami-0ce74cff8efa7d4e8 +# eu-west-1 v15.1.4 arm64 Enterprise FIPS: ami-0bce7fb85932827c5 +# eu-west-1 v15.1.4 x86_64 Enterprise FIPS: ami-0535e44fea6e9aecf +# eu-west-2 v15.1.4 arm64 Enterprise FIPS: ami-0627a458f311b6a88 +# eu-west-2 v15.1.4 x86_64 Enterprise FIPS: ami-045a87bdce0961570 +# eu-west-3 v15.1.4 arm64 Enterprise FIPS: ami-04b2769a3e0bf222c +# eu-west-3 v15.1.4 x86_64 Enterprise FIPS: ami-05dee9f5fbd496917 +# sa-east-1 v15.1.4 arm64 Enterprise FIPS: ami-0ce7bf70b67bd4999 +# sa-east-1 v15.1.4 x86_64 Enterprise FIPS: ami-0e5af0e04e7c3ebb1 +# us-east-1 v15.1.4 arm64 Enterprise FIPS: ami-028f688b2d71a9edf +# us-east-1 v15.1.4 x86_64 Enterprise FIPS: ami-0e68054b5fe9c482d +# us-east-2 v15.1.4 arm64 Enterprise FIPS: ami-0402cc16f00fd4914 +# us-east-2 v15.1.4 x86_64 Enterprise FIPS: ami-0f4bffd684b725e66 +# us-west-1 v15.1.4 arm64 Enterprise FIPS: ami-0a2c75960d6855adf +# us-west-1 v15.1.4 x86_64 Enterprise FIPS: ami-037f70c972ecf7a4a +# us-west-2 v15.1.4 arm64 Enterprise FIPS: ami-0a7cfa1e37fe785d8 +# us-west-2 v15.1.4 x86_64 Enterprise FIPS: ami-0b0022e15e4a3189f ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index de026139a13..8636c8fc752 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.3-arm64" +export TF_VAR_ami_name="teleport-ent-15.1.4-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 80b18768fcb..353ecdfab4e 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.3-arm64" +TF_VAR_ami_name ?= "teleport-ent-15.1.4-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"