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

k8s-ci-robot · web-flow · commit d2a44cef4fdf · 2023-10-30T07:03:44.000+01:00
Update CAPA supported AMI OS
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

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ const (`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`func getSupportedOsList() []string {`
`41`		`- return []string{"centos-7", "ubuntu-18.04", "ubuntu-20.04", "amazon-2", "flatcar-stable"}`
	`41`	`+ return []string{"centos-7", "ubuntu-22.04", "ubuntu-18.04", "ubuntu-20.04", "amazon-2", "flatcar-stable"}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func getimageRegionList() []string {`