diff --git a/assets/aws/Makefile b/assets/aws/Makefile index 6f545daf8075c..bb73c236bfc72 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.1.4 +TELEPORT_VERSION ?= 17.1.5 # 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 a3f62aeb1b533..669f2b50ef0d0 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.1.4 arm64 OSS: ami-04c280237d4cf0833 -# ap-northeast-1 v17.1.4 x86_64 OSS: ami-06c1f487a00ef61b5 -# ap-northeast-2 v17.1.4 arm64 OSS: ami-0fcb1303377d3d4a8 -# ap-northeast-2 v17.1.4 x86_64 OSS: ami-048b699cbd8d7f796 -# ap-northeast-3 v17.1.4 arm64 OSS: ami-0500cd373b82cdb95 -# ap-northeast-3 v17.1.4 x86_64 OSS: ami-03d321729da0ec81a -# ap-south-1 v17.1.4 arm64 OSS: ami-08f91f9655adf0a5a -# ap-south-1 v17.1.4 x86_64 OSS: ami-01807acbcce023395 -# ap-southeast-1 v17.1.4 arm64 OSS: ami-0294f7de9d7db6cfc -# ap-southeast-1 v17.1.4 x86_64 OSS: ami-01ebe20b36e44cce4 -# ap-southeast-2 v17.1.4 arm64 OSS: ami-0ea7d4f47467e9841 -# ap-southeast-2 v17.1.4 x86_64 OSS: ami-0d50c370428d73bf7 -# ca-central-1 v17.1.4 arm64 OSS: ami-0f7d7f8643255425e -# ca-central-1 v17.1.4 x86_64 OSS: ami-0d36e40088c427ffa -# eu-central-1 v17.1.4 arm64 OSS: ami-06e74483401b0daad -# eu-central-1 v17.1.4 x86_64 OSS: ami-01ac616f4ecf8c7f8 -# eu-north-1 v17.1.4 arm64 OSS: ami-0817d77460aacdcdf -# eu-north-1 v17.1.4 x86_64 OSS: ami-008164fe024c0c77d -# eu-west-1 v17.1.4 arm64 OSS: ami-082271d71f55708d3 -# eu-west-1 v17.1.4 x86_64 OSS: ami-0da783c76f4a93de9 -# eu-west-2 v17.1.4 arm64 OSS: ami-0ca02a6c5eea6e798 -# eu-west-2 v17.1.4 x86_64 OSS: ami-0dea7bba37863918a -# eu-west-3 v17.1.4 arm64 OSS: ami-033f4214500d59041 -# eu-west-3 v17.1.4 x86_64 OSS: ami-024a03120d33206cc -# sa-east-1 v17.1.4 arm64 OSS: ami-04ae82102f936f84f -# sa-east-1 v17.1.4 x86_64 OSS: ami-06e5d76c71fd17a97 -# us-east-1 v17.1.4 arm64 OSS: ami-06aa1a489c76bbdae -# us-east-1 v17.1.4 x86_64 OSS: ami-0005ac0b4ab7b509d -# us-east-2 v17.1.4 arm64 OSS: ami-002f52ecac8e7deb2 -# us-east-2 v17.1.4 x86_64 OSS: ami-0256f105240d7b918 -# us-west-1 v17.1.4 arm64 OSS: ami-0c1aab7963bae4258 -# us-west-1 v17.1.4 x86_64 OSS: ami-0a114d514ce39c078 -# us-west-2 v17.1.4 arm64 OSS: ami-075ad0d96dd7431c2 -# us-west-2 v17.1.4 x86_64 OSS: ami-0b140a8f7580e17ac +# ap-northeast-1 v17.1.5 arm64 OSS: ami-0c64b9aee43793977 +# ap-northeast-1 v17.1.5 x86_64 OSS: ami-04347695a2357cef6 +# ap-northeast-2 v17.1.5 arm64 OSS: ami-02691c864566623db +# ap-northeast-2 v17.1.5 x86_64 OSS: ami-0f94b24fd76a6d933 +# ap-northeast-3 v17.1.5 arm64 OSS: ami-063a105652694d6fa +# ap-northeast-3 v17.1.5 x86_64 OSS: ami-0dcc61ef5eb94ed72 +# ap-south-1 v17.1.5 arm64 OSS: ami-018b9386321cfb0b1 +# ap-south-1 v17.1.5 x86_64 OSS: ami-08d7e2bda02371056 +# ap-southeast-1 v17.1.5 arm64 OSS: ami-02993fb5ceff29a79 +# ap-southeast-1 v17.1.5 x86_64 OSS: ami-0291e1c1ae16f9741 +# ap-southeast-2 v17.1.5 arm64 OSS: ami-0a371f7560dc20aa2 +# ap-southeast-2 v17.1.5 x86_64 OSS: ami-0d84e68c43f3c049d +# ca-central-1 v17.1.5 arm64 OSS: ami-014fe11a9d7135f78 +# ca-central-1 v17.1.5 x86_64 OSS: ami-08ce4c294c7996b0b +# eu-central-1 v17.1.5 arm64 OSS: ami-01b4301aab8e77f28 +# eu-central-1 v17.1.5 x86_64 OSS: ami-0ab32bb19bdb0f973 +# eu-north-1 v17.1.5 arm64 OSS: ami-09b01ff59c3a6ecee +# eu-north-1 v17.1.5 x86_64 OSS: ami-0896b2d721cc2f5cf +# eu-west-1 v17.1.5 arm64 OSS: ami-049e29d1a44cae7d6 +# eu-west-1 v17.1.5 x86_64 OSS: ami-0dab9d0920601fcd6 +# eu-west-2 v17.1.5 arm64 OSS: ami-0d6111faf0b2bd7fc +# eu-west-2 v17.1.5 x86_64 OSS: ami-039aac1c885285efc +# eu-west-3 v17.1.5 arm64 OSS: ami-0f7b7bf3205fddd33 +# eu-west-3 v17.1.5 x86_64 OSS: ami-036297043fa681d40 +# sa-east-1 v17.1.5 arm64 OSS: ami-09c18bd409e495359 +# sa-east-1 v17.1.5 x86_64 OSS: ami-0886313227ada2233 +# us-east-1 v17.1.5 arm64 OSS: ami-0091728eab07b05a9 +# us-east-1 v17.1.5 x86_64 OSS: ami-03bcb255a314f7cbc +# us-east-2 v17.1.5 arm64 OSS: ami-0f4bc305355de21fa +# us-east-2 v17.1.5 x86_64 OSS: ami-0de15b651542606a6 +# us-west-1 v17.1.5 arm64 OSS: ami-0c6fbb1276cab5497 +# us-west-1 v17.1.5 x86_64 OSS: ami-0b4a78700aef9bbc2 +# us-west-2 v17.1.5 arm64 OSS: ami-01d5ec752902ba90a +# us-west-2 v17.1.5 x86_64 OSS: ami-00d371ef0022382d9 ``` ### Enterprise ``` -# ap-northeast-1 v17.1.4 arm64 Enterprise: ami-02d10e31e68847a0c -# ap-northeast-1 v17.1.4 x86_64 Enterprise: ami-0b61e2c8b50d9d62b -# ap-northeast-2 v17.1.4 arm64 Enterprise: ami-0a6adcba917acacb6 -# ap-northeast-2 v17.1.4 x86_64 Enterprise: ami-0c003f45be68328f8 -# ap-northeast-3 v17.1.4 arm64 Enterprise: ami-0dbe9569a28fd8b55 -# ap-northeast-3 v17.1.4 x86_64 Enterprise: ami-04bdde4e67bd9db4a -# ap-south-1 v17.1.4 arm64 Enterprise: ami-0ea9b27a5d3f21371 -# ap-south-1 v17.1.4 x86_64 Enterprise: ami-017e7ffef7a748e6e -# ap-southeast-1 v17.1.4 arm64 Enterprise: ami-0d8cf314be9951880 -# ap-southeast-1 v17.1.4 x86_64 Enterprise: ami-0c25299871d0e5eff -# ap-southeast-2 v17.1.4 arm64 Enterprise: ami-09708e43fa35bfdbb -# ap-southeast-2 v17.1.4 x86_64 Enterprise: ami-03ddab1dbceaf923a -# ca-central-1 v17.1.4 arm64 Enterprise: ami-0a81ed114fc7aa1f4 -# ca-central-1 v17.1.4 x86_64 Enterprise: ami-01389b21a85fbda71 -# eu-central-1 v17.1.4 arm64 Enterprise: ami-057bec1f2f501b07b -# eu-central-1 v17.1.4 x86_64 Enterprise: ami-0dd60768649574583 -# eu-north-1 v17.1.4 arm64 Enterprise: ami-0c8013d555ba72fbb -# eu-north-1 v17.1.4 x86_64 Enterprise: ami-062b25e011c8c34e5 -# eu-west-1 v17.1.4 arm64 Enterprise: ami-0d16e9afac0643837 -# eu-west-1 v17.1.4 x86_64 Enterprise: ami-0e9c876c7e9bc0b00 -# eu-west-2 v17.1.4 arm64 Enterprise: ami-04b12e3b27aad7e52 -# eu-west-2 v17.1.4 x86_64 Enterprise: ami-0c990dd569d908035 -# eu-west-3 v17.1.4 arm64 Enterprise: ami-06f86ffaa20f8b62b -# eu-west-3 v17.1.4 x86_64 Enterprise: ami-0e4200ff5ea85055e -# sa-east-1 v17.1.4 arm64 Enterprise: ami-051c982de689ffa7b -# sa-east-1 v17.1.4 x86_64 Enterprise: ami-05b67968ad4784107 -# us-east-1 v17.1.4 arm64 Enterprise: ami-0b46e41e985c66c67 -# us-east-1 v17.1.4 x86_64 Enterprise: ami-0058d1d106d6c05eb -# us-east-2 v17.1.4 arm64 Enterprise: ami-072b5fd705008644b -# us-east-2 v17.1.4 x86_64 Enterprise: ami-04a2f283333041d0f -# us-west-1 v17.1.4 arm64 Enterprise: ami-01973af051056842c -# us-west-1 v17.1.4 x86_64 Enterprise: ami-0d5824cdcbb00e382 -# us-west-2 v17.1.4 arm64 Enterprise: ami-042cdd70f934b5d23 -# us-west-2 v17.1.4 x86_64 Enterprise: ami-0ad8d190b27b4959e +# ap-northeast-1 v17.1.5 arm64 Enterprise: ami-0d33c70cab62adc48 +# ap-northeast-1 v17.1.5 x86_64 Enterprise: ami-0e8c6b1d3e094c6fc +# ap-northeast-2 v17.1.5 arm64 Enterprise: ami-0ff1002b9913f61ca +# ap-northeast-2 v17.1.5 x86_64 Enterprise: ami-024811c4b6e343ea8 +# ap-northeast-3 v17.1.5 arm64 Enterprise: ami-0595675271fb761c5 +# ap-northeast-3 v17.1.5 x86_64 Enterprise: ami-0bd369e648d1eec42 +# ap-south-1 v17.1.5 arm64 Enterprise: ami-0c1723b3dd988fad3 +# ap-south-1 v17.1.5 x86_64 Enterprise: ami-089d34daed6f6975c +# ap-southeast-1 v17.1.5 arm64 Enterprise: ami-0a53c811a95c6865d +# ap-southeast-1 v17.1.5 x86_64 Enterprise: ami-0adcd0cf5edc56571 +# ap-southeast-2 v17.1.5 arm64 Enterprise: ami-0e1a27965d3ace680 +# ap-southeast-2 v17.1.5 x86_64 Enterprise: ami-0f77b4ef2a70c9b5f +# ca-central-1 v17.1.5 arm64 Enterprise: ami-0a0fe0e75a74ad414 +# ca-central-1 v17.1.5 x86_64 Enterprise: ami-0f242622e6e842f8c +# eu-central-1 v17.1.5 arm64 Enterprise: ami-0a0c3f8810a2c8ad3 +# eu-central-1 v17.1.5 x86_64 Enterprise: ami-0bd931b80b0c986ae +# eu-north-1 v17.1.5 arm64 Enterprise: ami-03f71b2e78f914298 +# eu-north-1 v17.1.5 x86_64 Enterprise: ami-02998320678479003 +# eu-west-1 v17.1.5 arm64 Enterprise: ami-0eb068619cd609be2 +# eu-west-1 v17.1.5 x86_64 Enterprise: ami-0eb8c4a078031b8a3 +# eu-west-2 v17.1.5 arm64 Enterprise: ami-0c6d662493803835a +# eu-west-2 v17.1.5 x86_64 Enterprise: ami-038bdb71d86db1a7a +# eu-west-3 v17.1.5 arm64 Enterprise: ami-0830b78e6b605b73f +# eu-west-3 v17.1.5 x86_64 Enterprise: ami-0ff5625c46981b3ea +# sa-east-1 v17.1.5 arm64 Enterprise: ami-0f74d50e1c3c14b62 +# sa-east-1 v17.1.5 x86_64 Enterprise: ami-05a616fc697a7001d +# us-east-1 v17.1.5 arm64 Enterprise: ami-08fb660035691550c +# us-east-1 v17.1.5 x86_64 Enterprise: ami-08f3030ed812dab31 +# us-east-2 v17.1.5 arm64 Enterprise: ami-0050532a6f94f96de +# us-east-2 v17.1.5 x86_64 Enterprise: ami-072dce9df63696e9a +# us-west-1 v17.1.5 arm64 Enterprise: ami-07b2bc0c077feff7b +# us-west-1 v17.1.5 x86_64 Enterprise: ami-0742036f8f4ed2901 +# us-west-2 v17.1.5 arm64 Enterprise: ami-0c4c42eaa5ab78ce9 +# us-west-2 v17.1.5 x86_64 Enterprise: ami-0e111554cb725bdda ``` ### Enterprise FIPS ``` -# ap-northeast-1 v17.1.4 arm64 Enterprise FIPS: ami-04cbf7a26f5eaac9d -# ap-northeast-1 v17.1.4 x86_64 Enterprise FIPS: ami-047907213df5405a1 -# ap-northeast-2 v17.1.4 arm64 Enterprise FIPS: ami-0a722ef42b507fb48 -# ap-northeast-2 v17.1.4 x86_64 Enterprise FIPS: ami-046b89d1a9f5ff679 -# ap-northeast-3 v17.1.4 arm64 Enterprise FIPS: ami-0553a49a294e333fe -# ap-northeast-3 v17.1.4 x86_64 Enterprise FIPS: ami-00b8a9fc7cda5047e -# ap-south-1 v17.1.4 arm64 Enterprise FIPS: ami-0d0c4fc6499981168 -# ap-south-1 v17.1.4 x86_64 Enterprise FIPS: ami-079016557d21dbbff -# ap-southeast-1 v17.1.4 arm64 Enterprise FIPS: ami-0768fae575f8355ed -# ap-southeast-1 v17.1.4 x86_64 Enterprise FIPS: ami-07d8f2a1ddb624e07 -# ap-southeast-2 v17.1.4 arm64 Enterprise FIPS: ami-00c05cda63b8c4022 -# ap-southeast-2 v17.1.4 x86_64 Enterprise FIPS: ami-0b40ec54a1bfabc6e -# ca-central-1 v17.1.4 arm64 Enterprise FIPS: ami-01ec31b58a34bf114 -# ca-central-1 v17.1.4 x86_64 Enterprise FIPS: ami-00b5997c74ec67a6d -# eu-central-1 v17.1.4 arm64 Enterprise FIPS: ami-0316e6fef72ee12f1 -# eu-central-1 v17.1.4 x86_64 Enterprise FIPS: ami-0bffb2b82d19b9fe4 -# eu-north-1 v17.1.4 arm64 Enterprise FIPS: ami-0cc803ee0103b5452 -# eu-north-1 v17.1.4 x86_64 Enterprise FIPS: ami-026e1dad3b3338ced -# eu-west-1 v17.1.4 arm64 Enterprise FIPS: ami-02aa57ad66c706c3e -# eu-west-1 v17.1.4 x86_64 Enterprise FIPS: ami-01cce0cb789f1244b -# eu-west-2 v17.1.4 arm64 Enterprise FIPS: ami-0279a9754f3fc1687 -# eu-west-2 v17.1.4 x86_64 Enterprise FIPS: ami-0f517fc8be59a56b4 -# eu-west-3 v17.1.4 arm64 Enterprise FIPS: ami-03007e46071d1691e -# eu-west-3 v17.1.4 x86_64 Enterprise FIPS: ami-0685cfbc21fe131af -# sa-east-1 v17.1.4 arm64 Enterprise FIPS: ami-0647e36b1c825d8d5 -# sa-east-1 v17.1.4 x86_64 Enterprise FIPS: ami-0e253b6060ae1cddd -# us-east-1 v17.1.4 arm64 Enterprise FIPS: ami-042cc5ce729365547 -# us-east-1 v17.1.4 x86_64 Enterprise FIPS: ami-0870e3e82bb0c6889 -# us-east-2 v17.1.4 arm64 Enterprise FIPS: ami-0ebfe9f7ecb7abdfe -# us-east-2 v17.1.4 x86_64 Enterprise FIPS: ami-0494af14fdf669b2e -# us-west-1 v17.1.4 arm64 Enterprise FIPS: ami-0df427cdcd044f1aa -# us-west-1 v17.1.4 x86_64 Enterprise FIPS: ami-034ee42a899329ad4 -# us-west-2 v17.1.4 arm64 Enterprise FIPS: ami-09250b44b4e05592f -# us-west-2 v17.1.4 x86_64 Enterprise FIPS: ami-055c4b60b96a52656 +# ap-northeast-1 v17.1.5 arm64 Enterprise FIPS: ami-065b8115d64137f32 +# ap-northeast-1 v17.1.5 x86_64 Enterprise FIPS: ami-0b3e367c2fbe68370 +# ap-northeast-2 v17.1.5 arm64 Enterprise FIPS: ami-0ce1ad773515673ca +# ap-northeast-2 v17.1.5 x86_64 Enterprise FIPS: ami-0f057de2cf29d709f +# ap-northeast-3 v17.1.5 arm64 Enterprise FIPS: ami-07ab29fe564450943 +# ap-northeast-3 v17.1.5 x86_64 Enterprise FIPS: ami-0d30ea2f727a67cf6 +# ap-south-1 v17.1.5 arm64 Enterprise FIPS: ami-0d737f1760300b99d +# ap-south-1 v17.1.5 x86_64 Enterprise FIPS: ami-04bf053ebb954edad +# ap-southeast-1 v17.1.5 arm64 Enterprise FIPS: ami-06e8a19a72919ecc6 +# ap-southeast-1 v17.1.5 x86_64 Enterprise FIPS: ami-08e25537a4f84a7a4 +# ap-southeast-2 v17.1.5 arm64 Enterprise FIPS: ami-08edccdcdeffe760d +# ap-southeast-2 v17.1.5 x86_64 Enterprise FIPS: ami-0d4cfc586e8ebc67d +# ca-central-1 v17.1.5 arm64 Enterprise FIPS: ami-05fa60a0036279b03 +# ca-central-1 v17.1.5 x86_64 Enterprise FIPS: ami-08bc03030bc290eeb +# eu-central-1 v17.1.5 arm64 Enterprise FIPS: ami-0641db60e6e173a9d +# eu-central-1 v17.1.5 x86_64 Enterprise FIPS: ami-098a11452b6ac9307 +# eu-north-1 v17.1.5 arm64 Enterprise FIPS: ami-0e63914ed8435dcbf +# eu-north-1 v17.1.5 x86_64 Enterprise FIPS: ami-0b0a730a26e918158 +# eu-west-1 v17.1.5 arm64 Enterprise FIPS: ami-03ec199364f64062a +# eu-west-1 v17.1.5 x86_64 Enterprise FIPS: ami-076793e78487c9976 +# eu-west-2 v17.1.5 arm64 Enterprise FIPS: ami-0c164873ae00c5b5e +# eu-west-2 v17.1.5 x86_64 Enterprise FIPS: ami-0b1762482d02d1708 +# eu-west-3 v17.1.5 arm64 Enterprise FIPS: ami-08feb7d2e323a1e3e +# eu-west-3 v17.1.5 x86_64 Enterprise FIPS: ami-09806c7b2b66a305c +# sa-east-1 v17.1.5 arm64 Enterprise FIPS: ami-045998918647cdc4e +# sa-east-1 v17.1.5 x86_64 Enterprise FIPS: ami-07830983ba1db44b3 +# us-east-1 v17.1.5 arm64 Enterprise FIPS: ami-0218e8c9033df400a +# us-east-1 v17.1.5 x86_64 Enterprise FIPS: ami-0896d4b226473426c +# us-east-2 v17.1.5 arm64 Enterprise FIPS: ami-0884d7fb951e40555 +# us-east-2 v17.1.5 x86_64 Enterprise FIPS: ami-0bf82037a7243842d +# us-west-1 v17.1.5 arm64 Enterprise FIPS: ami-05a52aaf5818fe7fc +# us-west-1 v17.1.5 x86_64 Enterprise FIPS: ami-09da97f44015317e5 +# us-west-2 v17.1.5 arm64 Enterprise FIPS: ami-0e81d516e63352ece +# us-west-2 v17.1.5 x86_64 Enterprise FIPS: ami-05b62ce24c25cc818 ``` diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md index 4c6b8bbcaee9a..64a3ee8d1581f 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.1.4-arm64" +export TF_VAR_ami_name="teleport-ent-17.1.5-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 6f0fe03b295cf..7ce7ec9845cc7 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.1.4-arm64" +TF_VAR_ami_name ?= "teleport-ent-17.1.5-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"