Skip to content

Conversation

@dcantah
Copy link
Contributor

@dcantah dcantah commented Jan 10, 2022

This change backports the following changes to get ws2022 support for the cri-containerd suite.

  1. osversion package definitions for 21h2: Add 21H2 definitions to osversion package #1205
  2. Add ws2022 image/build to cri-containerd tests: Add ws2022 image/build to cri-containerd tests #1160

@dcantah dcantah requested a review from a team as a code owner January 10, 2022 21:15
@dcantah
Copy link
Contributor Author

dcantah commented Jan 10, 2022

Oh crud, need the 21h1 osversion definitions too. Fixing and updating the description

* Add 21H2 definitions to osversion package

This change adds three new definitions to the osversion package. All
three definitions are all of the 21H2 builds across Windows 10, Windows Server
and Windows 11, which all have different build numbers.

The approach taken was to add a suffix to the definitions with Win10, Server and
Win11 respectively.

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit 3a8cd1e)
Signed-off-by: Daniel Canter <[email protected]>
* Add ws2022 image/build to cri-integration tests

This change adds a new case to the getWindowsServerCoreImage and
getWindowsNanoserverImage functions to return ws2022 on a ws2022 or higher
build. The higher case is because of some recent efforts to improve down-level
compatability for Windows container images. For reference, the ltsc2022 image
works on a win11 host without hypervisor isolation.

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit f099e34)
Signed-off-by: Daniel Canter <[email protected]>
@dcantah dcantah force-pushed the backport-ws2022-cricontainerd branch from 07ad0e9 to 7577f5b Compare January 10, 2022 21:23
@dcantah dcantah merged commit 6abda2a into microsoft:release/0.9 Jan 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants