From 253a36a96e891526bbd92fcbcbe1771ecfe89c39 Mon Sep 17 00:00:00 2001 From: "backport-bot-workflows[bot]" <201175770+backport-bot-workflows[bot]@users.noreply.github.com> Date: Fri, 21 Mar 2025 08:50:06 +1100 Subject: [PATCH] [auto] Update AMI IDs for 17.3.4 (#53235) Co-authored-by: teleport-post-release-automation[bot] <128860004+teleport-post-release-automation[bot]@users.noreply.github.com> --- assets/aws/Makefile | 2 +- examples/aws/terraform/AMIS.md | 204 +++++++++--------- .../terraform/ha-autoscale-cluster/README.md | 2 +- .../aws/terraform/starter-cluster/README.md | 2 +- 4 files changed, 105 insertions(+), 105 deletions(-) diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 639ff75f582..de8daf9eb7f 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 ?= 17.3.3 +TELEPORT_VERSION ?= 17.3.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 52b41e99480..478c4abde87 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 v17.3.3 arm64 OSS: ami-00eed44c0d5820218 -# ap-northeast-1 v17.3.3 x86_64 OSS: ami-0fecd1572fd34da61 -# ap-northeast-2 v17.3.3 arm64 OSS: ami-0f2a3e48e90cd81d1 -# ap-northeast-2 v17.3.3 x86_64 OSS: ami-086976b68222f95d7 -# ap-northeast-3 v17.3.3 arm64 OSS: ami-086a3955e688cdc86 -# ap-northeast-3 v17.3.3 x86_64 OSS: ami-00700cf5f0c61aeec -# ap-south-1 v17.3.3 arm64 OSS: ami-02f3fd9ad7b1f6545 -# ap-south-1 v17.3.3 x86_64 OSS: ami-0a929f479fb41f544 -# ap-southeast-1 v17.3.3 arm64 OSS: ami-0688fb7763c1e9491 -# ap-southeast-1 v17.3.3 x86_64 OSS: ami-08708d9f095398dc9 -# ap-southeast-2 v17.3.3 arm64 OSS: ami-0df1bd8f6816f6d5b -# ap-southeast-2 v17.3.3 x86_64 OSS: ami-02476eeb1e6a02f8b -# ca-central-1 v17.3.3 arm64 OSS: ami-05d2d593386643762 -# ca-central-1 v17.3.3 x86_64 OSS: ami-0632cb8fe88ac234e -# eu-central-1 v17.3.3 arm64 OSS: ami-01a0b2531b529beaf -# eu-central-1 v17.3.3 x86_64 OSS: ami-08ca75005368ff4bf -# eu-north-1 v17.3.3 arm64 OSS: ami-0101281bc75382525 -# eu-north-1 v17.3.3 x86_64 OSS: ami-0332d773fb8e6a190 -# eu-west-1 v17.3.3 arm64 OSS: ami-05401f1b80a541fe8 -# eu-west-1 v17.3.3 x86_64 OSS: ami-00ca47961d96df0c4 -# eu-west-2 v17.3.3 arm64 OSS: ami-0bd5704d7de6a505a -# eu-west-2 v17.3.3 x86_64 OSS: ami-00b0e66b0a5094c26 -# eu-west-3 v17.3.3 arm64 OSS: ami-03dd67027be88b7c8 -# eu-west-3 v17.3.3 x86_64 OSS: ami-065e684e244df3967 -# sa-east-1 v17.3.3 arm64 OSS: ami-07cc79a5eb3f2acca -# sa-east-1 v17.3.3 x86_64 OSS: ami-0898486d2617a8a14 -# us-east-1 v17.3.3 arm64 OSS: ami-0a7b4ad18b19f396c -# us-east-1 v17.3.3 x86_64 OSS: ami-01c440d78db5f93c1 -# us-east-2 v17.3.3 arm64 OSS: ami-0f4711f2ddf052851 -# us-east-2 v17.3.3 x86_64 OSS: ami-0c7e99956a19a75c6 -# us-west-1 v17.3.3 arm64 OSS: ami-03dda837bf9451198 -# us-west-1 v17.3.3 x86_64 OSS: ami-00724c5c8478fd5e2 -# us-west-2 v17.3.3 arm64 OSS: ami-05fc5b1cb07f0ab07 -# us-west-2 v17.3.3 x86_64 OSS: ami-0793e70cd3b8bcb94 +# ap-northeast-1 v17.3.4 arm64 OSS: ami-0258c63f1a6d4c23a +# ap-northeast-1 v17.3.4 x86_64 OSS: ami-054d5f093f560b7f9 +# ap-northeast-2 v17.3.4 arm64 OSS: ami-03ce191a80bcc5baf +# ap-northeast-2 v17.3.4 x86_64 OSS: ami-0e51c5dc7ebab2901 +# ap-northeast-3 v17.3.4 arm64 OSS: ami-09d58bd4036ee8abe +# ap-northeast-3 v17.3.4 x86_64 OSS: ami-0528b5f1fb693c6dd +# ap-south-1 v17.3.4 arm64 OSS: ami-04e3662cc7594fc69 +# ap-south-1 v17.3.4 x86_64 OSS: ami-0a91fe9584a78f5fd +# ap-southeast-1 v17.3.4 arm64 OSS: ami-0bebdb0c0a5eb0bee +# ap-southeast-1 v17.3.4 x86_64 OSS: ami-0198a7d214b7e6090 +# ap-southeast-2 v17.3.4 arm64 OSS: ami-059b7ce48d905a48a +# ap-southeast-2 v17.3.4 x86_64 OSS: ami-0923926c7fdfa50fe +# ca-central-1 v17.3.4 arm64 OSS: ami-09aaec4ac2753bc31 +# ca-central-1 v17.3.4 x86_64 OSS: ami-0a58071cf48f25b49 +# eu-central-1 v17.3.4 arm64 OSS: ami-0fbc96bdff26d441a +# eu-central-1 v17.3.4 x86_64 OSS: ami-049436568b60b679b +# eu-north-1 v17.3.4 arm64 OSS: ami-0a63784c417b6b94e +# eu-north-1 v17.3.4 x86_64 OSS: ami-081a17e3766931eae +# eu-west-1 v17.3.4 arm64 OSS: ami-0d4f0d2ea511de7ac +# eu-west-1 v17.3.4 x86_64 OSS: ami-09b4ce56331496725 +# eu-west-2 v17.3.4 arm64 OSS: ami-0f0c1feaea84f326e +# eu-west-2 v17.3.4 x86_64 OSS: ami-0982d435c94cdb113 +# eu-west-3 v17.3.4 arm64 OSS: ami-032156c80280d9787 +# eu-west-3 v17.3.4 x86_64 OSS: ami-0b9e458b3786ced07 +# sa-east-1 v17.3.4 arm64 OSS: ami-0c1ae0897b19abd1d +# sa-east-1 v17.3.4 x86_64 OSS: ami-02c6f56406d47dc40 +# us-east-1 v17.3.4 arm64 OSS: ami-06dc2a7fb0194dbac +# us-east-1 v17.3.4 x86_64 OSS: ami-059cc39a29df82f3a +# us-east-2 v17.3.4 arm64 OSS: ami-03a4e84c02d2baea0 +# us-east-2 v17.3.4 x86_64 OSS: ami-04ab2a3935d3b800d +# us-west-1 v17.3.4 arm64 OSS: ami-0ebdd9a325a7b5831 +# us-west-1 v17.3.4 x86_64 OSS: ami-096982a2af7bf75d5 +# us-west-2 v17.3.4 arm64 OSS: ami-096fe8a14705508e0 +# us-west-2 v17.3.4 x86_64 OSS: ami-035e0c91397a3da06 ``` ### Enterprise ``` -# ap-northeast-1 v17.3.3 arm64 Enterprise: ami-0f407f7e958ac7bce -# ap-northeast-1 v17.3.3 x86_64 Enterprise: ami-0a2291d85b0faa8fd -# ap-northeast-2 v17.3.3 arm64 Enterprise: ami-0d59e10fd680d2e25 -# ap-northeast-2 v17.3.3 x86_64 Enterprise: ami-0d6c010adf794478c -# ap-northeast-3 v17.3.3 arm64 Enterprise: ami-00b5bcb97cf96253e -# ap-northeast-3 v17.3.3 x86_64 Enterprise: ami-0b186204942f310ca -# ap-south-1 v17.3.3 arm64 Enterprise: ami-092c1f0a08deaa55b -# ap-south-1 v17.3.3 x86_64 Enterprise: ami-04ceecad8b5c9a0da -# ap-southeast-1 v17.3.3 arm64 Enterprise: ami-03cdf0f69dd2f39a0 -# ap-southeast-1 v17.3.3 x86_64 Enterprise: ami-01f5cd3d6c0d82780 -# ap-southeast-2 v17.3.3 arm64 Enterprise: ami-0ad83f3aba4dfc24b -# ap-southeast-2 v17.3.3 x86_64 Enterprise: ami-0cd7bd043b464109a -# ca-central-1 v17.3.3 arm64 Enterprise: ami-001c3ec8970242dcc -# ca-central-1 v17.3.3 x86_64 Enterprise: ami-0da9567193db98912 -# eu-central-1 v17.3.3 arm64 Enterprise: ami-0f9998b03dfd94234 -# eu-central-1 v17.3.3 x86_64 Enterprise: ami-0c880ef03e9810554 -# eu-north-1 v17.3.3 arm64 Enterprise: ami-09a9d217395a039d0 -# eu-north-1 v17.3.3 x86_64 Enterprise: ami-04547516689d47779 -# eu-west-1 v17.3.3 arm64 Enterprise: ami-071d4266c666dc0cb -# eu-west-1 v17.3.3 x86_64 Enterprise: ami-09274fe8813b7bc19 -# eu-west-2 v17.3.3 arm64 Enterprise: ami-0a6f071a61b6a675c -# eu-west-2 v17.3.3 x86_64 Enterprise: ami-03a1b3aef42a5d9cc -# eu-west-3 v17.3.3 arm64 Enterprise: ami-03a64df5ac49deae5 -# eu-west-3 v17.3.3 x86_64 Enterprise: ami-0371cd520f9856455 -# sa-east-1 v17.3.3 arm64 Enterprise: ami-03f0ee56f5563646d -# sa-east-1 v17.3.3 x86_64 Enterprise: ami-0c94ad1f1977a325e -# us-east-1 v17.3.3 arm64 Enterprise: ami-0fb4e14ad973e1b8f -# us-east-1 v17.3.3 x86_64 Enterprise: ami-0f318c47cf31b21ee -# us-east-2 v17.3.3 arm64 Enterprise: ami-024794df672fc7a34 -# us-east-2 v17.3.3 x86_64 Enterprise: ami-039ce451889704d1a -# us-west-1 v17.3.3 arm64 Enterprise: ami-0d5c1bbe63ffea819 -# us-west-1 v17.3.3 x86_64 Enterprise: ami-01fbe7166b8a28bfe -# us-west-2 v17.3.3 arm64 Enterprise: ami-091ae76a3af4f1661 -# us-west-2 v17.3.3 x86_64 Enterprise: ami-0d23369d5b7d3932d +# ap-northeast-1 v17.3.4 arm64 Enterprise: ami-0f3ce02b8476683b0 +# ap-northeast-1 v17.3.4 x86_64 Enterprise: ami-0eeddb6a988c1ff5f +# ap-northeast-2 v17.3.4 arm64 Enterprise: ami-04ef89d959fc3f828 +# ap-northeast-2 v17.3.4 x86_64 Enterprise: ami-08f10974d74e80f6f +# ap-northeast-3 v17.3.4 arm64 Enterprise: ami-045d333ef4d4111bc +# ap-northeast-3 v17.3.4 x86_64 Enterprise: ami-06daa0096cd4eb15d +# ap-south-1 v17.3.4 arm64 Enterprise: ami-0220484ed02b4545b +# ap-south-1 v17.3.4 x86_64 Enterprise: ami-017484369bf101b5d +# ap-southeast-1 v17.3.4 arm64 Enterprise: ami-085f9437ba53b38e7 +# ap-southeast-1 v17.3.4 x86_64 Enterprise: ami-00d287637d88d053f +# ap-southeast-2 v17.3.4 arm64 Enterprise: ami-04cd911b8fd4181db +# ap-southeast-2 v17.3.4 x86_64 Enterprise: ami-06500341a8ed58b08 +# ca-central-1 v17.3.4 arm64 Enterprise: ami-0935ac0c93f04649e +# ca-central-1 v17.3.4 x86_64 Enterprise: ami-03bacffc876abc928 +# eu-central-1 v17.3.4 arm64 Enterprise: ami-05765d7f5e6de883d +# eu-central-1 v17.3.4 x86_64 Enterprise: ami-00f506fcc49753fbe +# eu-north-1 v17.3.4 arm64 Enterprise: ami-0f750d8898df1f345 +# eu-north-1 v17.3.4 x86_64 Enterprise: ami-0c7eb2660b4bfa8c4 +# eu-west-1 v17.3.4 arm64 Enterprise: ami-08c4a48b54f8f1448 +# eu-west-1 v17.3.4 x86_64 Enterprise: ami-09595419afa2f902a +# eu-west-2 v17.3.4 arm64 Enterprise: ami-014f1be82b8b10b16 +# eu-west-2 v17.3.4 x86_64 Enterprise: ami-0fe6cc7ebf412850d +# eu-west-3 v17.3.4 arm64 Enterprise: ami-0fbe10f2a89581562 +# eu-west-3 v17.3.4 x86_64 Enterprise: ami-0452a2bffb9049c6e +# sa-east-1 v17.3.4 arm64 Enterprise: ami-0a70eca11aa086bb5 +# sa-east-1 v17.3.4 x86_64 Enterprise: ami-0f98741822fdb7fc5 +# us-east-1 v17.3.4 arm64 Enterprise: ami-0410aa3f9fca4292c +# us-east-1 v17.3.4 x86_64 Enterprise: ami-0b4ba24168fa906b9 +# us-east-2 v17.3.4 arm64 Enterprise: ami-07aed1ee8e29177dd +# us-east-2 v17.3.4 x86_64 Enterprise: ami-0c4d53c46bf278fc9 +# us-west-1 v17.3.4 arm64 Enterprise: ami-0f904e8d295a3bce2 +# us-west-1 v17.3.4 x86_64 Enterprise: ami-0826c08c67daf57fb +# us-west-2 v17.3.4 arm64 Enterprise: ami-00754796f77437fec +# us-west-2 v17.3.4 x86_64 Enterprise: ami-00336fd126826e9c0 ``` ### Enterprise FIPS ``` -# ap-northeast-1 v17.3.3 arm64 Enterprise FIPS: ami-0e7c9ac20026b719f -# ap-northeast-1 v17.3.3 x86_64 Enterprise FIPS: ami-09a5e2e06890c4a01 -# ap-northeast-2 v17.3.3 arm64 Enterprise FIPS: ami-057327306468ad653 -# ap-northeast-2 v17.3.3 x86_64 Enterprise FIPS: ami-007374bbe44634697 -# ap-northeast-3 v17.3.3 arm64 Enterprise FIPS: ami-061a737a118fd5603 -# ap-northeast-3 v17.3.3 x86_64 Enterprise FIPS: ami-0e13d89aa26ba311d -# ap-south-1 v17.3.3 arm64 Enterprise FIPS: ami-010b8abbef89d2c4a -# ap-south-1 v17.3.3 x86_64 Enterprise FIPS: ami-059bbbcb8bd6d5d9d -# ap-southeast-1 v17.3.3 arm64 Enterprise FIPS: ami-009eef9e758b3cae2 -# ap-southeast-1 v17.3.3 x86_64 Enterprise FIPS: ami-066f47d58daba67db -# ap-southeast-2 v17.3.3 arm64 Enterprise FIPS: ami-0dc0cbdeb06c28d90 -# ap-southeast-2 v17.3.3 x86_64 Enterprise FIPS: ami-0c62a0be0ab89a86a -# ca-central-1 v17.3.3 arm64 Enterprise FIPS: ami-08e12fb4463ad6483 -# ca-central-1 v17.3.3 x86_64 Enterprise FIPS: ami-071691a9e4546f7d1 -# eu-central-1 v17.3.3 arm64 Enterprise FIPS: ami-01a59632ee8f43257 -# eu-central-1 v17.3.3 x86_64 Enterprise FIPS: ami-0582e1ca42fb8e258 -# eu-north-1 v17.3.3 arm64 Enterprise FIPS: ami-0ecbc1116e7486854 -# eu-north-1 v17.3.3 x86_64 Enterprise FIPS: ami-0fe594447db73ddf4 -# eu-west-1 v17.3.3 arm64 Enterprise FIPS: ami-0938326e6c6daeca5 -# eu-west-1 v17.3.3 x86_64 Enterprise FIPS: ami-0038e8852c1a49a2b -# eu-west-2 v17.3.3 arm64 Enterprise FIPS: ami-0316c9c3684313695 -# eu-west-2 v17.3.3 x86_64 Enterprise FIPS: ami-07e5b864b2669c73e -# eu-west-3 v17.3.3 arm64 Enterprise FIPS: ami-03aaf5f22168e0fa4 -# eu-west-3 v17.3.3 x86_64 Enterprise FIPS: ami-0c1ae5471d62e935c -# sa-east-1 v17.3.3 arm64 Enterprise FIPS: ami-069eb39fe4a1be86b -# sa-east-1 v17.3.3 x86_64 Enterprise FIPS: ami-0be7d8b2fdf3e2492 -# us-east-1 v17.3.3 arm64 Enterprise FIPS: ami-0793131e00cbdc69c -# us-east-1 v17.3.3 x86_64 Enterprise FIPS: ami-08d1d486472eed39d -# us-east-2 v17.3.3 arm64 Enterprise FIPS: ami-08d391b280a29a830 -# us-east-2 v17.3.3 x86_64 Enterprise FIPS: ami-018da280f9f5584d7 -# us-west-1 v17.3.3 arm64 Enterprise FIPS: ami-0db40f92039254ee5 -# us-west-1 v17.3.3 x86_64 Enterprise FIPS: ami-09ed8c12aaa58806e -# us-west-2 v17.3.3 arm64 Enterprise FIPS: ami-018c973a71c72bc4e -# us-west-2 v17.3.3 x86_64 Enterprise FIPS: ami-0082dfca9949786f8 +# ap-northeast-1 v17.3.4 arm64 Enterprise FIPS: ami-059aed6d5c0a7ec06 +# ap-northeast-1 v17.3.4 x86_64 Enterprise FIPS: ami-08853c78f14629939 +# ap-northeast-2 v17.3.4 arm64 Enterprise FIPS: ami-0630dad4fde5b05dc +# ap-northeast-2 v17.3.4 x86_64 Enterprise FIPS: ami-08241e081e49813d7 +# ap-northeast-3 v17.3.4 arm64 Enterprise FIPS: ami-00cb9d8c36007ab5f +# ap-northeast-3 v17.3.4 x86_64 Enterprise FIPS: ami-020dfbc16dc0101e4 +# ap-south-1 v17.3.4 arm64 Enterprise FIPS: ami-03f7171d3d74bfeb3 +# ap-south-1 v17.3.4 x86_64 Enterprise FIPS: ami-07dc3dc65b1d05b73 +# ap-southeast-1 v17.3.4 arm64 Enterprise FIPS: ami-06e5694362280a860 +# ap-southeast-1 v17.3.4 x86_64 Enterprise FIPS: ami-0415fe13ef1afca1e +# ap-southeast-2 v17.3.4 arm64 Enterprise FIPS: ami-06b273b2fcf7737a3 +# ap-southeast-2 v17.3.4 x86_64 Enterprise FIPS: ami-02484d3c9370e0eaf +# ca-central-1 v17.3.4 arm64 Enterprise FIPS: ami-0658b0399728ba105 +# ca-central-1 v17.3.4 x86_64 Enterprise FIPS: ami-0d4a5bb0b2b2e8ed4 +# eu-central-1 v17.3.4 arm64 Enterprise FIPS: ami-0ae2687b5ef832d4c +# eu-central-1 v17.3.4 x86_64 Enterprise FIPS: ami-04c9d33126627e06a +# eu-north-1 v17.3.4 arm64 Enterprise FIPS: ami-092172c09eca6d00a +# eu-north-1 v17.3.4 x86_64 Enterprise FIPS: ami-04ae2b4fb550e5c83 +# eu-west-1 v17.3.4 arm64 Enterprise FIPS: ami-0b7cda44191a437d1 +# eu-west-1 v17.3.4 x86_64 Enterprise FIPS: ami-05b0fb52f5ee2328c +# eu-west-2 v17.3.4 arm64 Enterprise FIPS: ami-0e0ed6bdc3a684aa9 +# eu-west-2 v17.3.4 x86_64 Enterprise FIPS: ami-0ec81c404eb9fa53d +# eu-west-3 v17.3.4 arm64 Enterprise FIPS: ami-0b41ec45ab7ff8cae +# eu-west-3 v17.3.4 x86_64 Enterprise FIPS: ami-0fe3a62a123b268bd +# sa-east-1 v17.3.4 arm64 Enterprise FIPS: ami-09ce00832c852ec2a +# sa-east-1 v17.3.4 x86_64 Enterprise FIPS: ami-0bb4fd500cce615eb +# us-east-1 v17.3.4 arm64 Enterprise FIPS: ami-020c463cceecb699f +# us-east-1 v17.3.4 x86_64 Enterprise FIPS: ami-05cfda4db05af545d +# us-east-2 v17.3.4 arm64 Enterprise FIPS: ami-0e51b881b81355a5f +# us-east-2 v17.3.4 x86_64 Enterprise FIPS: ami-0b71f0d5450ca8782 +# us-west-1 v17.3.4 arm64 Enterprise FIPS: ami-05fd43ace4d803c40 +# us-west-1 v17.3.4 x86_64 Enterprise FIPS: ami-05efb2b95ad251a5d +# us-west-2 v17.3.4 arm64 Enterprise FIPS: ami-064c669db6994b2b1 +# us-west-2 v17.3.4 x86_64 Enterprise FIPS: ami-04953efb8c149e9f4 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index dfc45e3c260..461885d7792 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-17.3.3-arm64" +export TF_VAR_ami_name="teleport-ent-17.3.4-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 896ae785fc3..74f91de0172 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-17.3.3-arm64" +TF_VAR_ami_name ?= "teleport-ent-17.3.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"