move arm64/aarch64 validation logic

openshift · Sep 28, 2022 · b8475aa · b8475aa
1 parent fa6443a
commit b8475aa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/internal/bminventory/inventory.go b/internal/bminventory/inventory.go
@@ -3956,10 +3956,11 @@ func validateArchitectureAndVersion(v versions.Handler, c *common.Cluster, cpuAr
 	if ocpVersion == "" {
 		ocpVersion = c.OpenshiftVersion
 	}
+	if c.CPUArchitecture == "aarch64" && cpuArch == "arm64" {
+		return nil
+	}
 	if c.CPUArchitecture != common.MultiCPUArchitecture {
-		if c.CPUArchitecture == "aarch64" && cpuArch == "arm64" {
-			return nil
-		} else if c.CPUArchitecture != "" && c.CPUArchitecture != cpuArch {
+		if c.CPUArchitecture != "" && c.CPUArchitecture != cpuArch {
 			return errors.Errorf("Specified CPU architecture (%s) doesn't match the cluster (%s)", cpuArch, c.CPUArchitecture)
 		}
 	} else {