Merge pull request #120 from ioito/hotfix/qx-aws-image

fix: add amazon linux
yunionio · Apr 10, 2024 · 5c1bbbd · 5c1bbbd
2 parents 7c75358 + 745e8a5
commit 5c1bbbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/util/imagetools/image_test.go b/util/imagetools/image_test.go
@@ -125,6 +125,14 @@ func TestNormalizeImageInfo(t *testing.T) {
 			OsLang:    "",
 			OsArch:    "x86_64",
 		},
+		{
+			Name:      "EKS Kubernetes Worker AMI with AmazonLinux2 image, (k8s: 1.24.17, docker: 20.10.*, containerd: 1.7.*)",
+			OsDistro:  "Amazon Linux",
+			OsType:    osprofile.OS_TYPE_LINUX,
+			OsVersion: "2",
+			OsLang:    "",
+			OsArch:    "x86_64",
+		},
 	}
 
 	for _, image := range images {

diff --git a/util/imagetools/imagetools.go b/util/imagetools/imagetools.go
@@ -110,7 +110,7 @@ func normalizeOsDistribution(osDist string, imageName string) string {
 		return "Fedora"
 	} else if strings.Contains(osDist, "alma") {
 		return "AlmaLinux"
-	} else if strings.Contains(osDist, "amazon linux") {
+	} else if strings.Contains(osDist, "amazon linux") || strings.Contains(osDist, "amazonlinux") {
 		return "Amazon Linux"
 	} else if strings.Contains(osDist, "windows") {
 		for _, ver := range []string{"2003", "2008", "2012", "2016", "2019", "2022"} {