Skip to content

Commit 1ab39f1

Browse files
authored
Add support for Windows 20h2 and 2022 (#205)
* Add support for Windows 20h2 and 2022 * Add support for Windows 20h2 and 2022 * Update pause container from 1.4.1 to 3.6
1 parent d02719e commit 1ab39f1

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

kubeadm/flannel/buildconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
],
66
"baseimage": "mcr.microsoft.com/powershell",
77
"tagsMap":[
8+
{"source":"nanoserver-ltsc2022","target":"ltsc2022"},
9+
{"source":"nanoserver-20h2","target":"20h2"},
810
{"source":"nanoserver-2004","target":"2004"},
911
{"source":"nanoserver-1909","target":"1909"},
1012
{"source":"nanoserver-1903","target":"1903"},

kubeadm/kube-proxy/buildconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"baseimage": "mcr.microsoft.com/powershell",
33
"tagsMap":[
4+
{"source":"nanoserver-ltsc2022","target":"ltsc2022"},
5+
{"source":"nanoserver-20h2","target":"20h2"},
46
{"source":"nanoserver-2004","target":"2004"},
57
{"source":"nanoserver-1909","target":"1909"},
68
{"source":"nanoserver-1903","target":"1903"},

kubeadm/scripts/PrepareNode.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ if ($global:containerRuntime -eq "Docker") {
104104
}
105105
}
106106
107-
$cmd = "C:\k\kubelet.exe $global:KubeletArgs --cert-dir=$env:SYSTEMDRIVE\var\lib\kubelet\pki --config=/var/lib/kubelet/config.yaml --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --hostname-override=$(hostname) --pod-infra-container-image=`"mcr.microsoft.com/oss/kubernetes/pause:1.4.1`" --enable-debugging-handlers --cgroups-per-qos=false --enforce-node-allocatable=`"`" --network-plugin=cni --resolv-conf=`"`" --log-dir=/var/log/kubelet --logtostderr=false --image-pull-progress-deadline=20m"
107+
$cmd = "C:\k\kubelet.exe $global:KubeletArgs --cert-dir=$env:SYSTEMDRIVE\var\lib\kubelet\pki --config=/var/lib/kubelet/config.yaml --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --kubeconfig=/etc/kubernetes/kubelet.conf --hostname-override=$(hostname) --pod-infra-container-image=`"mcr.microsoft.com/oss/kubernetes/pause:3.6`" --enable-debugging-handlers --cgroups-per-qos=false --enforce-node-allocatable=`"`" --network-plugin=cni --resolv-conf=`"`" --log-dir=/var/log/kubelet --logtostderr=false --image-pull-progress-deadline=20m"
108108
109109
Invoke-Expression $cmd'
110110
$StartKubeletFileContent = $StartKubeletFileContent -replace "{{CONTAINER_RUNTIME}}", "`"$ContainerRuntime`""

0 commit comments

Comments
 (0)