Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

fix: specify correct pause image in containerd config for Windows 20h2 #4344

Merged
merged 1 commit into from
Mar 25, 2021
Merged

fix: specify correct pause image in containerd config for Windows 20h2 #4344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion parts/k8s/windowscontainerdfunc.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function Select-Windows-Version {
"18362" { return "1903" }
"18363" { return "1909" }
"19041" { return "2004" }
"19042" { return "20H2" }
Default { return "" }
}
}
Expand Down Expand Up @@ -143,7 +144,13 @@ function Install-Containerd {
$formatedbin = $(($CNIBinDir).Replace("\", "/"))
$formatedconf = $(($CNIConfDir).Replace("\", "/"))
$sandboxIsolation = 0
$windowsVersion = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").ReleaseId
$windowsReleaseId = (Get-ItemProperty "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion").ReleaseId
marosset marked this conversation as resolved.
Show resolved Hide resolved
# Starting with 20H2 tags used to publish contianer images may not match the 'ReleaseId'
switch ($windowsReleaseId)
{
"2009" { $windowsVersion = "20H2"}
default { $windowsVersion = $windowsReleaseId}
}
$hypervRuntimes = ""
$hypervHandlers = $global:HypervRuntimeHandlers.split(",", [System.StringSplitOptions]::RemoveEmptyEntries)

Expand Down
9 changes: 8 additions & 1 deletion pkg/engine/templates_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.