PR Feedback

dcantah · dcantah · commit 6388b446cf5c · 2021-11-18T16:24:47.000-08:00
Move build check to default case.

Signed-off-by: Daniel Canter &lt;dcanter@microsoft.com&gt;
diff --git a/test/cri-containerd/main_test.go b/test/cri-containerd/main_test.go
@@ -159,13 +159,6 @@ func requireBinary(t *testing.T, binary string) string {
 }
 
 func getWindowsNanoserverImage(build uint16) string {
-	// Due to some efforts in improving down-level compatibility for Windows containers (see
-	// https://techcommunity.microsoft.com/t5/containers/windows-server-2022-and-beyond-for-containers/ba-p/2712487)
-	// the ltsc2022 image should continue to work on builds ws2022 and onwards. The panic for "unsupported build"
-	// should only be triggered if the user is on 21h1 or a build older than RS5 now.
-	if build > osversion.V21H2Server {
-		build = osversion.V21H2Server
-	}
 	switch build {
 	case osversion.RS5:
 		return "mcr.microsoft.com/windows/nanoserver:1809"
@@ -180,6 +173,13 @@ func getWindowsNanoserverImage(build uint16) string {
 	case osversion.V21H2Server:
 		return "mcr.microsoft.com/windows/nanoserver:ltsc2022"
 	default:
+		// Due to some efforts in improving down-level compatibility for Windows containers (see
+		// https://techcommunity.microsoft.com/t5/containers/windows-server-2022-and-beyond-for-containers/ba-p/2712487)
+		// the ltsc2022 image should continue to work on builds ws2022 and onwards. With this in mind,
+		// if there's no mapping for the host build, just use the Windows Server 2022 image.
+		if build > osversion.V21H2Server {
+			return "mcr.microsoft.com/windows/nanoserver:ltsc2022"
+		}
 		panic("unsupported build")
 	}
 }
@@ -206,6 +206,13 @@ func getWindowsServerCoreImage(build uint16) string {
 	case osversion.V21H2Server:
 		return "mcr.microsoft.com/windows/servercore:ltsc2022"
 	default:
+		// Due to some efforts in improving down-level compatibility for Windows containers (see
+		// https://techcommunity.microsoft.com/t5/containers/windows-server-2022-and-beyond-for-containers/ba-p/2712487)
+		// the ltsc2022 image should continue to work on builds ws2022 and onwards. With this in mind,
+		// if there's no mapping for the host build, just use the Windows Server 2022 image.
+		if build > osversion.V21H2Server {
+			return "mcr.microsoft.com/windows/servercore:ltsc2022"
+		}
 		panic("unsupported build")
 	}
 }
