Add containerd support to PrepareNode script #5071

NamanAg30 · 2023-06-01T10:58:38Z

This patch gives the user the option of using containerd runtime while using the PrepareNode.ps1 for configuring k8s on windows node.
for #4952

hack/windows/Prepare-Node.ps1

docs/windows.md

hack/windows/Prepare-Node.ps1

XinShuYang

LGTM, @wenyingd do you have more comments?

wenyingd · 2023-07-21T03:13:32Z

hack/windows/Prepare-Node.ps1


-$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.3.0`" --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 --node-ip=$env:NODE_IP"
+$StartKubeletFileContent += [Environment]::NewLine + '$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=`"`" --resolv-conf=`"`" --node-ip=$env:NODE_IP"'


Question1: I think this kubelet command is based on version 1.27, do you verify if it can work with the previous K8s versions?

Quesion2: "--network-plugin=cni" is needed when using docker if my memory is correct, but I didn't see it in the changed code. Did you confirm it can work with docker or we do not support docker?

Besdies, I remember containerd has a config of "--container-runtime-endpoint ", does it require now?

https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/#installation
Prior to Kubernetes 1.24, the CNI plugins could also be managed by the kubelet using the cni-bin-dir and network-plugin command-line parameters. These command-line parameters were removed in Kubernetes 1.24, with management of the CNI no longer in scope for kubelet.

@wenyingd --container-runtime-endpoint flag for containerd is automatically added to kubeadm-flags.env file on running kubeadm join command , which is being used in $global:KubeletArgs in the Start-Kubelet script

XinShuYang · 2023-07-21T07:29:20Z

Please also resolve conflicts.

docs/windows.md

hack/windows/Prepare-Node.ps1

tnqn · 2023-07-21T13:32:14Z

hack/windows/Prepare-Node.ps1


 if ($netId.Length -lt 1) {
    docker network create -d nat host
+}' + [Environment]::NewLine


but does it mean?

Sorry , i did not understand this comment.
Are you asking about [Environment]::NewLine? (used to give new line)

From line 112 to 116 , (from '$netId ) ... it is one string being added to StartKubeletFileContent

Got it, I misunderstood it.

hack/windows/Prepare-Node.ps1

wenyingd

LGTM

XinShuYang

LGTM

tnqn

LGTM

tnqn · 2023-07-25T11:20:21Z

hack/windows/Prepare-Node.ps1


 if ($netId.Length -lt 1) {
    docker network create -d nat host
+}' + [Environment]::NewLine


Got it, I misunderstood it.

tnqn · 2023-07-25T11:38:05Z

/skip-all

Signed-off-by: Naman Agarwal <naman.agarwal75@gmail.com>

NamanAg30 · 2023-07-25T11:40:13Z

@tnqn , ready for merge now

tnqn · 2023-07-25T13:03:32Z

/skip-all

NamanAg30 requested review from rajnkamr and XinShuYang June 1, 2023 10:59

NamanAg30 marked this pull request as ready for review June 1, 2023 11:14

XinShuYang reviewed Jun 1, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Show resolved Hide resolved

XinShuYang reviewed Jun 1, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved

XinShuYang reviewed Jun 1, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved

NamanAg30 force-pushed the preparenode branch 2 times, most recently from 1e2de40 to e5b9708 Compare June 1, 2023 11:47

XinShuYang reviewed Jun 1, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved

NamanAg30 force-pushed the preparenode branch from e5b9708 to 2a133bc Compare June 1, 2023 12:28

NamanAg30 requested a review from XinShuYang June 2, 2023 04:37

XinShuYang reviewed Jun 2, 2023

View reviewed changes

docs/windows.md Outdated Show resolved Hide resolved

XinShuYang reviewed Jun 2, 2023

View reviewed changes

docs/windows.md Outdated Show resolved Hide resolved

NamanAg30 force-pushed the preparenode branch from 2a133bc to cc0d8d4 Compare June 2, 2023 08:15

NamanAg30 requested a review from XinShuYang June 2, 2023 08:16

NamanAg30 mentioned this pull request Jun 2, 2023

Add support for Windows OVS Containerisation in Install-OVS script #5055

Closed

rajnkamr reviewed Jun 2, 2023

View reviewed changes

docs/windows.md Outdated Show resolved Hide resolved

rajnkamr reviewed Jun 2, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Show resolved Hide resolved

rajnkamr reviewed Jun 2, 2023

View reviewed changes

hack/windows/Prepare-Node.ps1 Outdated Show resolved Hide resolved

NamanAg30 force-pushed the preparenode branch from cc0d8d4 to 8e07681 Compare June 2, 2023 13:19

XinShuYang requested a review from wenyingd June 7, 2023 07:45

XinShuYang previously approved these changes Jun 7, 2023

View reviewed changes

rajnkamr added this to the Antrea v1.13 release milestone Jun 19, 2023

rajnkamr added the action/release-note Indicates a PR that should be included in release notes. label Jun 19, 2023

NamanAg30 dismissed XinShuYang’s stale review via 1f2addb June 28, 2023 07:21

NamanAg30 force-pushed the preparenode branch 2 times, most recently from 1f2addb to 25c1e6a Compare June 28, 2023 08:30

NamanAg30 force-pushed the preparenode branch 2 times, most recently from 716bde2 to e0863dc Compare July 5, 2023 10:44

rajnkamr added the area/OS/windows Issues or PRs related to the Windows operating system. label Jul 11, 2023

wenyingd reviewed Jul 21, 2023

View reviewed changes

NamanAg30 force-pushed the preparenode branch from 6d5cafd to 8b30603 Compare July 21, 2023 06:32

NamanAg30 force-pushed the preparenode branch 2 times, most recently from 2c26fa0 to 98e8ba3 Compare July 21, 2023 07:36

NamanAg30 requested a review from wenyingd July 21, 2023 11:16

NamanAg30 force-pushed the preparenode branch 3 times, most recently from 5a6ad93 to 013e356 Compare July 21, 2023 13:20

tnqn reviewed Jul 21, 2023

View reviewed changes

NamanAg30 force-pushed the preparenode branch 2 times, most recently from 72636c9 to cff49ab Compare July 21, 2023 20:42

wenyingd previously approved these changes Jul 24, 2023

View reviewed changes

XinShuYang previously approved these changes Jul 24, 2023

View reviewed changes

NamanAg30 requested a review from tnqn July 24, 2023 05:52

tnqn previously approved these changes Jul 25, 2023

View reviewed changes

Add containerd support to PrepareNode script

f574613

Signed-off-by: Naman Agarwal <naman.agarwal75@gmail.com>

NamanAg30 dismissed stale reviews from tnqn, XinShuYang, and wenyingd via f574613 July 25, 2023 11:39

NamanAg30 force-pushed the preparenode branch from cff49ab to f574613 Compare July 25, 2023 11:39

tnqn approved these changes Jul 25, 2023

View reviewed changes

tnqn merged commit 09ff732 into antrea-io:main Jul 25, 2023

Atish-iaf mentioned this pull request Jul 25, 2023

Release 1.13.0 #5303

Merged

rajnkamr mentioned this pull request Jul 27, 2023

Windows OVS Containerization Support #4952

Closed

antoninbas mentioned this pull request Jan 9, 2024

kubelet does not start on Windows when using the Prepare-Node.ps1 script #5857

Closed

XinShuYang mentioned this pull request Jan 10, 2024

Add missing space for kubelet args in Prepare-Node.ps1 #5858

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add containerd support to PrepareNode script #5071

Add containerd support to PrepareNode script #5071

NamanAg30 commented Jun 1, 2023 •

edited by rajnkamr

Loading

XinShuYang left a comment

wenyingd Jul 21, 2023

XinShuYang Jul 21, 2023

NamanAg30 Jul 21, 2023

XinShuYang commented Jul 21, 2023

tnqn Jul 21, 2023

NamanAg30 Jul 21, 2023 •

edited

Loading

NamanAg30 Jul 24, 2023

tnqn Jul 25, 2023

wenyingd left a comment

XinShuYang left a comment

tnqn left a comment

tnqn Jul 25, 2023

tnqn commented Jul 25, 2023

NamanAg30 commented Jul 25, 2023

tnqn commented Jul 25, 2023


		$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.3.0`" --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 --node-ip=$env:NODE_IP"
		$StartKubeletFileContent += [Environment]::NewLine + '$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=`"`" --resolv-conf=`"`" --node-ip=$env:NODE_IP"'

Add containerd support to PrepareNode script #5071

Add containerd support to PrepareNode script #5071

Conversation

NamanAg30 commented Jun 1, 2023 • edited by rajnkamr Loading

XinShuYang left a comment

Choose a reason for hiding this comment

wenyingd Jul 21, 2023

Choose a reason for hiding this comment

XinShuYang Jul 21, 2023

Choose a reason for hiding this comment

NamanAg30 Jul 21, 2023

Choose a reason for hiding this comment

XinShuYang commented Jul 21, 2023

tnqn Jul 21, 2023

Choose a reason for hiding this comment

NamanAg30 Jul 21, 2023 • edited Loading

Choose a reason for hiding this comment

NamanAg30 Jul 24, 2023

Choose a reason for hiding this comment

tnqn Jul 25, 2023

Choose a reason for hiding this comment

wenyingd left a comment

Choose a reason for hiding this comment

XinShuYang left a comment

Choose a reason for hiding this comment

tnqn left a comment

Choose a reason for hiding this comment

tnqn Jul 25, 2023

Choose a reason for hiding this comment

tnqn commented Jul 25, 2023

NamanAg30 commented Jul 25, 2023

tnqn commented Jul 25, 2023

NamanAg30 commented Jun 1, 2023 •

edited by rajnkamr

Loading

NamanAg30 Jul 21, 2023 •

edited

Loading