Merge pull request #4597 from wyike/update-ami-os

Update CAPA supported AMI OS
kubernetes-sigs · Oct 30, 2023 · d2a44ce · d2a44ce
2 parents 411e172 + cf16e31
commit d2a44ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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