mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Update GCE Windows node images with March's Windows updates
This commit is contained in:
parent
3842a92f5f
commit
55df85ba37
@ -159,4 +159,4 @@ export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-k
|
|||||||
# Path for kube-proxy kubeconfig file on Windows nodes.
|
# Path for kube-proxy kubeconfig file on Windows nodes.
|
||||||
export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
|
export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
|
||||||
# Pause container image for Windows container.
|
# Pause container image for Windows container.
|
||||||
export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.1.0"
|
export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.2.0"
|
||||||
|
@ -88,11 +88,11 @@ function set-linux-node-image() {
|
|||||||
function set-windows-node-image() {
|
function set-windows-node-image() {
|
||||||
WINDOWS_NODE_IMAGE_PROJECT="windows-cloud"
|
WINDOWS_NODE_IMAGE_PROJECT="windows-cloud"
|
||||||
if [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win2019" ]]; then
|
if [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win2019" ]]; then
|
||||||
WINDOWS_NODE_IMAGE="windows-server-2019-dc-core-for-containers-v20200114"
|
WINDOWS_NODE_IMAGE="windows-server-2019-dc-core-for-containers-v20200310"
|
||||||
elif [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win1909" ]]; then
|
elif [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win1909" ]]; then
|
||||||
WINDOWS_NODE_IMAGE="windows-server-1909-dc-core-for-containers-v20200114"
|
WINDOWS_NODE_IMAGE="windows-server-1909-dc-core-for-containers-v20200310"
|
||||||
elif [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win1809" ]]; then
|
elif [[ "${WINDOWS_NODE_OS_DISTRIBUTION}" == "win1809" ]]; then
|
||||||
WINDOWS_NODE_IMAGE="windows-server-1809-dc-core-for-containers-v20200114"
|
WINDOWS_NODE_IMAGE="windows-server-1809-dc-core-for-containers-v20200310"
|
||||||
else
|
else
|
||||||
echo "Unknown WINDOWS_NODE_OS_DISTRIBUTION ${WINDOWS_NODE_OS_DISTRIBUTION}" >&2
|
echo "Unknown WINDOWS_NODE_OS_DISTRIBUTION ${WINDOWS_NODE_OS_DISTRIBUTION}" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -135,11 +135,24 @@ function Add_GceMetadataServerRoute {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Returns a PowerShell object representing the Windows version.
|
||||||
|
function Get_WindowsVersion {
|
||||||
|
# Unlike checking `[System.Environment]::OSVersion.Version`, this long-winded
|
||||||
|
# approach gets the OS revision/patch number correctly
|
||||||
|
# (https://superuser.com/a/1160428/652018).
|
||||||
|
$win_ver = New-Object -TypeName PSObject
|
||||||
|
$win_ver | Add-Member -MemberType NoteProperty -Name Major -Value $(Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion' CurrentMajorVersionNumber).CurrentMajorVersionNumber
|
||||||
|
$win_ver | Add-Member -MemberType NoteProperty -Name Minor -Value $(Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion' CurrentMinorVersionNumber).CurrentMinorVersionNumber
|
||||||
|
$win_ver | Add-Member -MemberType NoteProperty -Name Build -Value $(Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion' CurrentBuild).CurrentBuild
|
||||||
|
$win_ver | Add-Member -MemberType NoteProperty -Name Revision -Value $(Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion' UBR).UBR
|
||||||
|
return $win_ver
|
||||||
|
}
|
||||||
|
|
||||||
# Writes debugging information, such as Windows version and patch info, to the
|
# Writes debugging information, such as Windows version and patch info, to the
|
||||||
# console.
|
# console.
|
||||||
function Dump-DebugInfoToConsole {
|
function Dump-DebugInfoToConsole {
|
||||||
Try {
|
Try {
|
||||||
$version = "$([System.Environment]::OSVersion.Version | Out-String)"
|
$version = Get_WindowsVersion | Out-String
|
||||||
$hotfixes = "$(Get-Hotfix | Out-String)"
|
$hotfixes = "$(Get-Hotfix | Out-String)"
|
||||||
$image = "$(Get-InstanceMetadata 'image' | Out-String)"
|
$image = "$(Get-InstanceMetadata 'image' | Out-String)"
|
||||||
Log-Output "Windows version:`n$version"
|
Log-Output "Windows version:`n$version"
|
||||||
|
@ -358,7 +358,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: pause-win
|
- name: pause-win
|
||||||
image: gcr.io/gke-release/pause-win:1.1.0
|
image: gcr.io/gke-release/pause-win:1.2.0
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/os: windows
|
kubernetes.io/os: windows
|
||||||
tolerations:
|
tolerations:
|
||||||
|
Loading…
Reference in New Issue
Block a user