From 9c1ea8bec35df88ac5d02625ecfe3f5fd65ba123 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 6 Dec 2024 02:56:57 +0000 Subject: [PATCH] [auto] Update AMI IDs for 17.0.4 --- 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 1b59633ceebb4..ba2ece47b2a23 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.0.2 +TELEPORT_VERSION ?= 17.0.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 7bb200a5f021d..31eddc672bbaa 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.0.2 arm64 OSS: ami-0651a84d0a527ef0f -# ap-northeast-1 v17.0.2 x86_64 OSS: ami-00d4b4bb545e2b342 -# ap-northeast-2 v17.0.2 arm64 OSS: ami-0dfc3a3f078e3db84 -# ap-northeast-2 v17.0.2 x86_64 OSS: ami-0293d3d170a2d63ba -# ap-northeast-3 v17.0.2 arm64 OSS: ami-00ea2f58dd7f89c41 -# ap-northeast-3 v17.0.2 x86_64 OSS: ami-063cb231632542895 -# ap-south-1 v17.0.2 arm64 OSS: ami-0967cf88f79e9bd27 -# ap-south-1 v17.0.2 x86_64 OSS: ami-02f3fac6f58ae24cf -# ap-southeast-1 v17.0.2 arm64 OSS: ami-01b55da57aae1e8bc -# ap-southeast-1 v17.0.2 x86_64 OSS: ami-00888b14e51ee9046 -# ap-southeast-2 v17.0.2 arm64 OSS: ami-063f8f86cce8447bc -# ap-southeast-2 v17.0.2 x86_64 OSS: ami-02eb89ce7aa6eb2ed -# ca-central-1 v17.0.2 arm64 OSS: ami-0aeba985b252877a1 -# ca-central-1 v17.0.2 x86_64 OSS: ami-0d3f7bd39dbc0cc60 -# eu-central-1 v17.0.2 arm64 OSS: ami-05b6fd943c7054491 -# eu-central-1 v17.0.2 x86_64 OSS: ami-015f6040080b7c417 -# eu-north-1 v17.0.2 arm64 OSS: ami-02efbdb4e9775754f -# eu-north-1 v17.0.2 x86_64 OSS: ami-001975763784c856c -# eu-west-1 v17.0.2 arm64 OSS: ami-0395075ac080586c1 -# eu-west-1 v17.0.2 x86_64 OSS: ami-09ed23c827b3075b5 -# eu-west-2 v17.0.2 arm64 OSS: ami-0cd782d93a62984ac -# eu-west-2 v17.0.2 x86_64 OSS: ami-07099797b8d6a4328 -# eu-west-3 v17.0.2 arm64 OSS: ami-0dc0fc100545b926a -# eu-west-3 v17.0.2 x86_64 OSS: ami-0f7fe153e45c805bb -# sa-east-1 v17.0.2 arm64 OSS: ami-01e8ff9e97fadb388 -# sa-east-1 v17.0.2 x86_64 OSS: ami-0a06114dd69d7a3c4 -# us-east-1 v17.0.2 arm64 OSS: ami-0c0f56eb8c513d338 -# us-east-1 v17.0.2 x86_64 OSS: ami-0b0ff4946cc8da664 -# us-east-2 v17.0.2 arm64 OSS: ami-05ea7ec59dc23664f -# us-east-2 v17.0.2 x86_64 OSS: ami-01c597ec5f5418d55 -# us-west-1 v17.0.2 arm64 OSS: ami-04edc343baca623b1 -# us-west-1 v17.0.2 x86_64 OSS: ami-0de051b685a15b7fe -# us-west-2 v17.0.2 arm64 OSS: ami-0106b94e745188c71 -# us-west-2 v17.0.2 x86_64 OSS: ami-0c64aab47d260978c +# ap-northeast-1 v17.0.4 arm64 OSS: ami-01716a041218b7583 +# ap-northeast-1 v17.0.4 x86_64 OSS: ami-06a0bce35c7d65bf6 +# ap-northeast-2 v17.0.4 arm64 OSS: ami-02742215c192f5bef +# ap-northeast-2 v17.0.4 x86_64 OSS: ami-0a5e52dbdb5eaa650 +# ap-northeast-3 v17.0.4 arm64 OSS: ami-0160778bf23cf0643 +# ap-northeast-3 v17.0.4 x86_64 OSS: ami-0a7a3595539ec2167 +# ap-south-1 v17.0.4 arm64 OSS: ami-09632d32d2cba70c3 +# ap-south-1 v17.0.4 x86_64 OSS: ami-0ab4d472fa9f1b290 +# ap-southeast-1 v17.0.4 arm64 OSS: ami-0bccbfe98fa25f3d0 +# ap-southeast-1 v17.0.4 x86_64 OSS: ami-01ab2d0af845cd0a7 +# ap-southeast-2 v17.0.4 arm64 OSS: ami-022f9be11a0c74479 +# ap-southeast-2 v17.0.4 x86_64 OSS: ami-04db11a0a7eb447f9 +# ca-central-1 v17.0.4 arm64 OSS: ami-09c09ef2b04cdc0bd +# ca-central-1 v17.0.4 x86_64 OSS: ami-09c4ed011317bd4fc +# eu-central-1 v17.0.4 arm64 OSS: ami-066511d9d4a4b6e37 +# eu-central-1 v17.0.4 x86_64 OSS: ami-004a4d77b5b1dacc2 +# eu-north-1 v17.0.4 arm64 OSS: ami-05cdb6f461101593a +# eu-north-1 v17.0.4 x86_64 OSS: ami-0af9705b2af84685a +# eu-west-1 v17.0.4 arm64 OSS: ami-0e5295d6c18225338 +# eu-west-1 v17.0.4 x86_64 OSS: ami-09f90453fcb9d65e7 +# eu-west-2 v17.0.4 arm64 OSS: ami-070763cd4a0edfc01 +# eu-west-2 v17.0.4 x86_64 OSS: ami-00f9fe423c08672a5 +# eu-west-3 v17.0.4 arm64 OSS: ami-065e2413a3d90fde7 +# eu-west-3 v17.0.4 x86_64 OSS: ami-05809768420d06e55 +# sa-east-1 v17.0.4 arm64 OSS: ami-0d3cc91be3e224009 +# sa-east-1 v17.0.4 x86_64 OSS: ami-0e937294d10077f31 +# us-east-1 v17.0.4 arm64 OSS: ami-0af34c1d6e3070279 +# us-east-1 v17.0.4 x86_64 OSS: ami-05ac65c09e4c769bb +# us-east-2 v17.0.4 arm64 OSS: ami-0404817145aa2b1c5 +# us-east-2 v17.0.4 x86_64 OSS: ami-06e28394d0b853fdc +# us-west-1 v17.0.4 arm64 OSS: ami-03054d783cbd721da +# us-west-1 v17.0.4 x86_64 OSS: ami-038de85609360f42a +# us-west-2 v17.0.4 arm64 OSS: ami-0ead7a03ac47a4aca +# us-west-2 v17.0.4 x86_64 OSS: ami-009e6a010be394578 ``` ### Enterprise ``` -# ap-northeast-1 v17.0.2 arm64 Enterprise: ami-0b2b089edcb0e091d -# ap-northeast-1 v17.0.2 x86_64 Enterprise: ami-071f692bf1a8f693b -# ap-northeast-2 v17.0.2 arm64 Enterprise: ami-09260418d00f66b42 -# ap-northeast-2 v17.0.2 x86_64 Enterprise: ami-08972a90cd326e0f1 -# ap-northeast-3 v17.0.2 arm64 Enterprise: ami-019b60812bcad387e -# ap-northeast-3 v17.0.2 x86_64 Enterprise: ami-0451c76613f37affc -# ap-south-1 v17.0.2 arm64 Enterprise: ami-0457976d97f552465 -# ap-south-1 v17.0.2 x86_64 Enterprise: ami-07c68f0edb4f6147c -# ap-southeast-1 v17.0.2 arm64 Enterprise: ami-086797009a7cd9070 -# ap-southeast-1 v17.0.2 x86_64 Enterprise: ami-0d1f49e08978e1744 -# ap-southeast-2 v17.0.2 arm64 Enterprise: ami-03e118ba99ac6da36 -# ap-southeast-2 v17.0.2 x86_64 Enterprise: ami-0aad5874717e64138 -# ca-central-1 v17.0.2 arm64 Enterprise: ami-0a4934d732147b11a -# ca-central-1 v17.0.2 x86_64 Enterprise: ami-0c1e580f8624edeb7 -# eu-central-1 v17.0.2 arm64 Enterprise: ami-04b7050c1205ad49a -# eu-central-1 v17.0.2 x86_64 Enterprise: ami-0296ce6617c2fd2d7 -# eu-north-1 v17.0.2 arm64 Enterprise: ami-06acc73b3762e4983 -# eu-north-1 v17.0.2 x86_64 Enterprise: ami-032a490e6ec85f7c5 -# eu-west-1 v17.0.2 arm64 Enterprise: ami-021cbd1015aadf200 -# eu-west-1 v17.0.2 x86_64 Enterprise: ami-052cb8c9368bacf3a -# eu-west-2 v17.0.2 arm64 Enterprise: ami-07a35baf7a51fae64 -# eu-west-2 v17.0.2 x86_64 Enterprise: ami-02a676775ca87ba35 -# eu-west-3 v17.0.2 arm64 Enterprise: ami-0a38e33f80d1b3705 -# eu-west-3 v17.0.2 x86_64 Enterprise: ami-0def0cd786b10b669 -# sa-east-1 v17.0.2 arm64 Enterprise: ami-0c8159976ac638fe5 -# sa-east-1 v17.0.2 x86_64 Enterprise: ami-0e98d87e1079ab5f0 -# us-east-1 v17.0.2 arm64 Enterprise: ami-0cade96d8ade0b98e -# us-east-1 v17.0.2 x86_64 Enterprise: ami-01110b682d25201d0 -# us-east-2 v17.0.2 arm64 Enterprise: ami-00f5dfc9a3b3b4df1 -# us-east-2 v17.0.2 x86_64 Enterprise: ami-028485a7096bb7b2b -# us-west-1 v17.0.2 arm64 Enterprise: ami-072583e0a855d7dd6 -# us-west-1 v17.0.2 x86_64 Enterprise: ami-0f7084aeef839aa20 -# us-west-2 v17.0.2 arm64 Enterprise: ami-08122983b2e46c826 -# us-west-2 v17.0.2 x86_64 Enterprise: ami-0ccc7f36d4f5be75f +# ap-northeast-1 v17.0.4 arm64 Enterprise: ami-073c7d1f9f700ad5f +# ap-northeast-1 v17.0.4 x86_64 Enterprise: ami-080f2379b5915b568 +# ap-northeast-2 v17.0.4 arm64 Enterprise: ami-0fe045659a23cff48 +# ap-northeast-2 v17.0.4 x86_64 Enterprise: ami-04ce28140625e2dee +# ap-northeast-3 v17.0.4 arm64 Enterprise: ami-04c911f34da45d0b4 +# ap-northeast-3 v17.0.4 x86_64 Enterprise: ami-029ad395b820c9d13 +# ap-south-1 v17.0.4 arm64 Enterprise: ami-02e80813715c2edce +# ap-south-1 v17.0.4 x86_64 Enterprise: ami-0ff485dc38ba524ee +# ap-southeast-1 v17.0.4 arm64 Enterprise: ami-0ef089f8e3c8b2948 +# ap-southeast-1 v17.0.4 x86_64 Enterprise: ami-0304c1638e8896047 +# ap-southeast-2 v17.0.4 arm64 Enterprise: ami-051c847519cd353b5 +# ap-southeast-2 v17.0.4 x86_64 Enterprise: ami-01a4cb81d27479b71 +# ca-central-1 v17.0.4 arm64 Enterprise: ami-0e7ff49b010ef7510 +# ca-central-1 v17.0.4 x86_64 Enterprise: ami-070729ca8a3cd52d4 +# eu-central-1 v17.0.4 arm64 Enterprise: ami-065ac13475462188a +# eu-central-1 v17.0.4 x86_64 Enterprise: ami-09ba3a9085883f7c5 +# eu-north-1 v17.0.4 arm64 Enterprise: ami-0871621387aea29c0 +# eu-north-1 v17.0.4 x86_64 Enterprise: ami-018bd329b835264ee +# eu-west-1 v17.0.4 arm64 Enterprise: ami-0ad04ae06926ca8a6 +# eu-west-1 v17.0.4 x86_64 Enterprise: ami-0e291eeaac1af9b96 +# eu-west-2 v17.0.4 arm64 Enterprise: ami-0147ea5263de3ff82 +# eu-west-2 v17.0.4 x86_64 Enterprise: ami-0712aa8f4d45d7f63 +# eu-west-3 v17.0.4 arm64 Enterprise: ami-0836ab80362bb163a +# eu-west-3 v17.0.4 x86_64 Enterprise: ami-00e63b301d64501bd +# sa-east-1 v17.0.4 arm64 Enterprise: ami-05c4af22838178da8 +# sa-east-1 v17.0.4 x86_64 Enterprise: ami-0653dc7e72358fdf4 +# us-east-1 v17.0.4 arm64 Enterprise: ami-094bdb3b5c7462211 +# us-east-1 v17.0.4 x86_64 Enterprise: ami-06fa756239fba1686 +# us-east-2 v17.0.4 arm64 Enterprise: ami-0d0799739729e9282 +# us-east-2 v17.0.4 x86_64 Enterprise: ami-01a960de052a65ced +# us-west-1 v17.0.4 arm64 Enterprise: ami-0d8ea901cc1172268 +# us-west-1 v17.0.4 x86_64 Enterprise: ami-041d4d9e8258802a2 +# us-west-2 v17.0.4 arm64 Enterprise: ami-0917840ac9f9e0683 +# us-west-2 v17.0.4 x86_64 Enterprise: ami-0dfdb666a13565a1e ``` ### Enterprise FIPS ``` -# ap-northeast-1 v17.0.2 arm64 Enterprise FIPS: ami-08099fd3e61fa6286 -# ap-northeast-1 v17.0.2 x86_64 Enterprise FIPS: ami-097a049f5fcdf7c54 -# ap-northeast-2 v17.0.2 arm64 Enterprise FIPS: ami-0b8a4a34743330eca -# ap-northeast-2 v17.0.2 x86_64 Enterprise FIPS: ami-0ad3e01835bfbf4b4 -# ap-northeast-3 v17.0.2 arm64 Enterprise FIPS: ami-0b170f805f3eeafd1 -# ap-northeast-3 v17.0.2 x86_64 Enterprise FIPS: ami-05a6a19a1389850d1 -# ap-south-1 v17.0.2 arm64 Enterprise FIPS: ami-059f49abd14460311 -# ap-south-1 v17.0.2 x86_64 Enterprise FIPS: ami-00dd953fa115c9bfa -# ap-southeast-1 v17.0.2 arm64 Enterprise FIPS: ami-041ca54d4a98732c1 -# ap-southeast-1 v17.0.2 x86_64 Enterprise FIPS: ami-0fb51dbbf5ee200be -# ap-southeast-2 v17.0.2 arm64 Enterprise FIPS: ami-02edf718acede03a5 -# ap-southeast-2 v17.0.2 x86_64 Enterprise FIPS: ami-0b791112346c8958c -# ca-central-1 v17.0.2 arm64 Enterprise FIPS: ami-036a937ecdc153ee0 -# ca-central-1 v17.0.2 x86_64 Enterprise FIPS: ami-0629827536aed5367 -# eu-central-1 v17.0.2 arm64 Enterprise FIPS: ami-0a266bf0bd6f63a6a -# eu-central-1 v17.0.2 x86_64 Enterprise FIPS: ami-09797fadb0ceb22cf -# eu-north-1 v17.0.2 arm64 Enterprise FIPS: ami-01dfac7697112e40e -# eu-north-1 v17.0.2 x86_64 Enterprise FIPS: ami-0201fbe0e86ae4275 -# eu-west-1 v17.0.2 arm64 Enterprise FIPS: ami-006649abd910a6c4e -# eu-west-1 v17.0.2 x86_64 Enterprise FIPS: ami-057fe93bdb3a28abc -# eu-west-2 v17.0.2 arm64 Enterprise FIPS: ami-05761b3feb8a6de5f -# eu-west-2 v17.0.2 x86_64 Enterprise FIPS: ami-0d05029a8f4b5ea5f -# eu-west-3 v17.0.2 arm64 Enterprise FIPS: ami-0dc765e00daa4b68d -# eu-west-3 v17.0.2 x86_64 Enterprise FIPS: ami-033b17625614eb6e5 -# sa-east-1 v17.0.2 arm64 Enterprise FIPS: ami-0280b02be588e488d -# sa-east-1 v17.0.2 x86_64 Enterprise FIPS: ami-01f71b7de23ff9d75 -# us-east-1 v17.0.2 arm64 Enterprise FIPS: ami-0d48757d7e4ea2ef7 -# us-east-1 v17.0.2 x86_64 Enterprise FIPS: ami-08a7cb0cdb82f132b -# us-east-2 v17.0.2 arm64 Enterprise FIPS: ami-0967cf7fe5074c2b6 -# us-east-2 v17.0.2 x86_64 Enterprise FIPS: ami-077b0c052d311df40 -# us-west-1 v17.0.2 arm64 Enterprise FIPS: ami-016959b0fb71d90ac -# us-west-1 v17.0.2 x86_64 Enterprise FIPS: ami-042492b1cd5a4cdb5 -# us-west-2 v17.0.2 arm64 Enterprise FIPS: ami-084f7a1cb30e804b5 -# us-west-2 v17.0.2 x86_64 Enterprise FIPS: ami-02aef84b71ce25194 +# ap-northeast-1 v17.0.4 arm64 Enterprise FIPS: ami-09e383034b7defdaf +# ap-northeast-1 v17.0.4 x86_64 Enterprise FIPS: ami-0df69b8a4380e1de6 +# ap-northeast-2 v17.0.4 arm64 Enterprise FIPS: ami-0f8d28e7bcefe2970 +# ap-northeast-2 v17.0.4 x86_64 Enterprise FIPS: ami-0197da2adec541176 +# ap-northeast-3 v17.0.4 arm64 Enterprise FIPS: ami-06f2fab51b401aa96 +# ap-northeast-3 v17.0.4 x86_64 Enterprise FIPS: ami-0076f778514b9496d +# ap-south-1 v17.0.4 arm64 Enterprise FIPS: ami-07ea988d6c2412e73 +# ap-south-1 v17.0.4 x86_64 Enterprise FIPS: ami-0ac1183e7314ea34d +# ap-southeast-1 v17.0.4 arm64 Enterprise FIPS: ami-0f4a91f7e074c1771 +# ap-southeast-1 v17.0.4 x86_64 Enterprise FIPS: ami-01ee28a10a5e1e11f +# ap-southeast-2 v17.0.4 arm64 Enterprise FIPS: ami-0a65998ce9d562d79 +# ap-southeast-2 v17.0.4 x86_64 Enterprise FIPS: ami-0e1b23bcaaf49287c +# ca-central-1 v17.0.4 arm64 Enterprise FIPS: ami-05ecb968b73974203 +# ca-central-1 v17.0.4 x86_64 Enterprise FIPS: ami-07491a64d004d3291 +# eu-central-1 v17.0.4 arm64 Enterprise FIPS: ami-08a2592c33f8ea84e +# eu-central-1 v17.0.4 x86_64 Enterprise FIPS: ami-0f9e368192f2ec651 +# eu-north-1 v17.0.4 arm64 Enterprise FIPS: ami-0b380397bb540ce29 +# eu-north-1 v17.0.4 x86_64 Enterprise FIPS: ami-023badde3df29ae70 +# eu-west-1 v17.0.4 arm64 Enterprise FIPS: ami-03490ba6be4c23476 +# eu-west-1 v17.0.4 x86_64 Enterprise FIPS: ami-0d5f2c95321fe98f2 +# eu-west-2 v17.0.4 arm64 Enterprise FIPS: ami-03437b2758ba462c9 +# eu-west-2 v17.0.4 x86_64 Enterprise FIPS: ami-0f569292c54f0569f +# eu-west-3 v17.0.4 arm64 Enterprise FIPS: ami-02bf987212952aab2 +# eu-west-3 v17.0.4 x86_64 Enterprise FIPS: ami-0cbe8a49f10fa96ff +# sa-east-1 v17.0.4 arm64 Enterprise FIPS: ami-096f403881ccb12ec +# sa-east-1 v17.0.4 x86_64 Enterprise FIPS: ami-025711384880cb5a8 +# us-east-1 v17.0.4 arm64 Enterprise FIPS: ami-0c1506fe582a035bc +# us-east-1 v17.0.4 x86_64 Enterprise FIPS: ami-083791d36cad90c5b +# us-east-2 v17.0.4 arm64 Enterprise FIPS: ami-0beabe7f3c09fbe87 +# us-east-2 v17.0.4 x86_64 Enterprise FIPS: ami-02d7a281b2c843203 +# us-west-1 v17.0.4 arm64 Enterprise FIPS: ami-0e5a7de7a6163d9da +# us-west-1 v17.0.4 x86_64 Enterprise FIPS: ami-01298486181f8e6b0 +# us-west-2 v17.0.4 arm64 Enterprise FIPS: ami-0aff456ddb4a86a85 +# us-west-2 v17.0.4 x86_64 Enterprise FIPS: ami-0998561252ed04b71 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index 86e3049adae46..808929be0b49c 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.0.2-arm64" +export TF_VAR_ami_name="teleport-ent-17.0.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 8f3a74bb39b67..0fa8984f8c78b 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.0.2-arm64" +TF_VAR_ami_name ?= "teleport-ent-17.0.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"