Merge pull request #2411 from crunchywelch/2401-arm64_support

nishanttotla · web-flow · commit ce5f7b8a6f5a · 2017-11-02T14:34:07.000-07:00
issue 2401 - normalize "aarch64" architectures to "arm64"
diff --git a/manager/scheduler/filter.go b/manager/scheduler/filter.go
@@ -294,6 +294,14 @@ func (f *PlatformFilter) platformEqual(imgPlatform, nodePlatform api.Platform) b
 		nodePlatform.Architecture = "amd64"
 	}
 
+	// normalize "aarch64" architectures to "arm64"
+	if imgPlatform.Architecture == "aarch64" {
+		imgPlatform.Architecture = "arm64"
+	}
+	if nodePlatform.Architecture == "aarch64" {
+		nodePlatform.Architecture = "arm64"
+	}
+
 	if (imgPlatform.Architecture == "" || imgPlatform.Architecture == nodePlatform.Architecture) && (imgPlatform.OS == "" || imgPlatform.OS == nodePlatform.OS) {
 		return true
 	}

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,14 @@ func (f *PlatformFilter) platformEqual(imgPlatform, nodePlatform api.Platform) b`
`294`	`294`	`nodePlatform.Architecture = "amd64"`
`295`	`295`	`}`
`296`	`296`
	`297`	`+ // normalize "aarch64" architectures to "arm64"`
	`298`	`+ if imgPlatform.Architecture == "aarch64" {`
	`299`	`+ imgPlatform.Architecture = "arm64"`
	`300`	`+ }`
	`301`	`+ if nodePlatform.Architecture == "aarch64" {`
	`302`	`+ nodePlatform.Architecture = "arm64"`
	`303`	`+ }`
	`304`	`+`
`297`	`305`	`if (imgPlatform.Architecture == "" \|\| imgPlatform.Architecture == nodePlatform.Architecture) && (imgPlatform.OS == "" \|\| imgPlatform.OS == nodePlatform.OS) {`
`298`	`306`	`return true`
`299`	`307`	`}`