From cf16e311d754c551d07c1c30a7cb0f04efd4c10d Mon Sep 17 00:00:00 2001 From: Yike Wang Date: Sat, 28 Oct 2023 23:26:39 +0800 Subject: [PATCH] Update CAPA supported AMI OS --- cmd/clusterawsadm/ami/helper.go | 2 +- docs/book/src/topics/images/built-amis.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/clusterawsadm/ami/helper.go b/cmd/clusterawsadm/ami/helper.go index 27b05a8f5f..e8c8a2d9ed 100644 --- a/cmd/clusterawsadm/ami/helper.go +++ b/cmd/clusterawsadm/ami/helper.go @@ -38,7 +38,7 @@ const ( ) func getSupportedOsList() []string { - return []string{"centos-7", "ubuntu-18.04", "ubuntu-20.04", "amazon-2", "flatcar-stable"} + return []string{"centos-7", "ubuntu-22.04", "ubuntu-18.04", "ubuntu-20.04", "amazon-2", "flatcar-stable"} } func getimageRegionList() []string { diff --git a/docs/book/src/topics/images/built-amis.md b/docs/book/src/topics/images/built-amis.md index 814a281500..aeba64259c 100644 --- a/docs/book/src/topics/images/built-amis.md +++ b/docs/book/src/topics/images/built-amis.md @@ -9,7 +9,7 @@ See [clusterawsadm ami list](https://cluster-api-aws.sigs.k8s.io/clusterawsadm/c ## Supported OS Distributions - Amazon Linux 2 (amazon-2) -- Ubuntu (ubuntu-20.04, ubuntu-18.04) +- Ubuntu (ubuntu-20.04, ubuntu-22.04) - Centos (centos-7) - Flatcar (flatcar-stable) @@ -18,7 +18,7 @@ See [clusterawsadm ami list](https://cluster-api-aws.sigs.k8s.io/clusterawsadm/c - ap-northeast-2 - ap-south-1 - ap-southeast-1 -- ap-northeast-2 +- ap-southeast-2 - ca-central-1 - eu-central-1 - eu-west-1