Use new 21h2 server definitions

dcantah · dcantah · commit af9e01f92621 · 2021-11-12T12:12:13.000-08:00
As three different builds of windows have the 21h2 moniker, use the server 21h2
definition

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
@@ -163,8 +163,8 @@ func getWindowsNanoserverImage(build uint16) string {
 	// 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.V21H2 {
-		build = osversion.V21H2
+	if build > osversion.V21H2Server {
+		build = osversion.V21H2Server
 	}
 	switch build {
 	case osversion.RS5:
@@ -177,26 +177,33 @@ func getWindowsNanoserverImage(build uint16) string {
 		return "mcr.microsoft.com/windows/nanoserver:2004"
 	case osversion.V20H2:
 		return "mcr.microsoft.com/windows/nanoserver:2009"
-	case osversion.V21H2:
+	case osversion.V21H2Server:
 		return "mcr.microsoft.com/windows/nanoserver:ltsc2022"
 	default:
 		panic("unsupported build")
 	}
 }
 
 func getWindowsServerCoreImage(build uint16) string {
-	switch b := build; {
-	case b == osversion.RS5:
+	// 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/servercore:1809"
-	case b == osversion.V19H1:
+	case osversion.V19H1:
 		return "mcr.microsoft.com/windows/servercore:1903"
-	case b == osversion.V19H2:
+	case osversion.V19H2:
 		return "mcr.microsoft.com/windows/servercore:1909"
-	case b == osversion.V20H1:
+	case osversion.V20H1:
 		return "mcr.microsoft.com/windows/servercore:2004"
-	case b == osversion.V20H2:
+	case osversion.V20H2:
 		return "mcr.microsoft.com/windows/servercore:2009"
-	case b >= osversion.V21H2:
+	case osversion.V21H2Server:
 		return "mcr.microsoft.com/windows/servercore:ltsc2022"
 	default:
 		panic("unsupported build")
