To support new changes for Windows HostProcess Pod for K8S v1.28 and containerd 1.7 #5528

NamanAg30 · 2023-09-26T12:03:09Z

The patch is required to handle following cases:-
1.To handle WindowsHostProcessContainer for k8s 1.28 and and make required adjustment in antrea-windows-containerd.yaml for containerd 1.7.
2.To change commands to clean containerd environment on jumper node from ci/jenkins.sh (since on new tested we only have docker runtime)

build/yamls/antrea-windows-containerd.yml

wenyingd

LGTM

hack/windows/Prepare-Node.ps1

XinShuYang · 2023-09-28T14:50:47Z

/test-windows-all

hack/windows/Prepare-Node.ps1

antoninbas

LGTM

build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1

XinShuYang · 2023-10-08T08:07:20Z

/test-windows-all

XinShuYang · 2023-10-09T01:36:15Z

LGTM, did all CI tests pass on the 1.28 testbed? @NamanAg30

ci/jenkins/test.sh

build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1

test/e2e/framework.go

wenyingd

LGTM.

We can optimize the usage of antctl from Node ssh to Pod operations in a separate change.

tnqn · 2023-10-26T03:03:21Z

build/yamls/antrea-windows-containerd-with-ovs.yml

-    cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/ca.crt C:/var/run/secrets/kubernetes.io/serviceaccount
-    cp $mountPath/var/run/secrets/kubernetes.io/serviceaccount/token C:/var/run/secrets/kubernetes.io/serviceaccount
+
+        # From containerd version 1.7 onwards, the servcieaccount directory, the ca.cert and token files will automatically be created.


why the new code use a different indent?

Updated, thanks.

test/e2e/framework.go

tnqn · 2023-10-26T03:33:30Z

build/yamls/antrea-windows-containerd-with-ovs.yml

+
+        # From containerd version 1.7 onwards, the servcieaccount directory, the ca.cert and token files will automatically be created.
+        $serviceAccountPath = "C:\var\run\secrets\kubernetes.io\serviceaccount"
+        if (-Not $(Test-Path $serviceAccountPath)) {


I understand this is better, but will the original code fail if the path exists?

Does the PR fix anything or just improve code? This is important to understand what's the compatibility of previous Antrea releases.

Yes, it will fail in containerd 1.7. If the path exists, related files can not be modified.

Then how does it fix it if the PR just skips creating the path when it exists. The related files still cannot be modified, right?

So basically there are three cases:

If paths exist and files are unchanged, the agent skips copying files.

If paths don't exist, the agent copies files to the destination.

If paths exist and files have been modified, there is no way to modify the file, and the pod is expected to crash. The user should clean up the related paths by themselves.

Previously, the agent always copied related files, regardless of their existence, which could lead to agent crashes due to authorization issues. This PR fixes the case 1.

After discussing with Wenying, now I know that these 3 cases only can happen with containerd 1.6. For contianerd 1.7 since the destination and source path is the same path so we can just skip coping files, the code change in this PR is only to make it compatible for containerd1.6. @tnqn

According to this link (https://kubernetes.io/docs/tasks/configure-pod-container/create-hostprocess-pod/), with containerd versions <=1.6, the ca file and token of the service account only exists inside containers, but antrea-agent needs files under path "c:\var\run\secrets\kubernetes.io\serviceaccount" to create kubeClient, so we should copy the files to the target path. However, since containerd 1.7, containerd would automatically place the files under path "c:\var\run\secrets\kubernetes.io\serviceaccount" ( it is supposed to be 3 links to the same file), so we don't perform "copy" actions.

So the change here is to be consistent of the previous versions.

test/e2e/framework.go

XinShuYang · 2023-10-26T08:32:20Z

/test-windows-containerd-conformance

tnqn

Code LGTM, but the commit title and body aren't following the convention. I will edit it when merging it, please format it correctly for future PRs.

XinShuYang · 2023-10-26T09:31:10Z

/test-windows-containerd-e2e

wenyingd

LGTM

XinShuYang · 2023-10-26T12:35:20Z

/test-windows-containerd-e2e

…ins.sh w.r.t new k8s and containerd version Upgrade StartKubelet script and ci test script for k8s 1.28 version and antrea-windows-containerd.yaml for containerd 1.7 version. Signed-off-by: Naman Agarwal <naman.agarwal75@gmail.com> Signed-off-by: Shuyang Xin <gavinx@vmware.com>

XinShuYang · 2023-10-26T13:48:38Z

This change is only for checksum update and code rebase.

XinShuYang · 2023-10-26T13:48:50Z

/test-windows-containerd-e2e
/test-windows-containerd-conformance

XinShuYang · 2023-10-26T15:19:45Z

/test-windows-containerd-e2e

tnqn · 2023-10-27T03:12:33Z

/skip-all

tnqn · 2023-10-27T03:14:40Z

/skip-all

NamanAg30 requested a review from rajnkamr September 26, 2023 12:03

rajnkamr reviewed Sep 26, 2023

View reviewed changes

build/yamls/antrea-windows-containerd.yml Outdated Show resolved Hide resolved

rajnkamr reviewed Sep 26, 2023

View reviewed changes

build/yamls/antrea-windows-containerd.yml Outdated Show resolved Hide resolved

rajnkamr added this to the Antrea v1.14 release milestone Sep 26, 2023

NamanAg30 force-pushed the updatek8sandcontainerd branch 4 times, most recently from 0b65bb8 to f6434f5 Compare September 27, 2023 16:27

NamanAg30 requested a review from XinShuYang September 27, 2023 16:28

NamanAg30 marked this pull request as ready for review September 27, 2023 16:28

wenyingd previously approved these changes Sep 28, 2023

View reviewed changes

XinShuYang reviewed Sep 28, 2023

View reviewed changes

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

rajnkamr reviewed Oct 3, 2023

View reviewed changes

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

NamanAg30 requested a review from antoninbas October 4, 2023 07:17

antoninbas reviewed Oct 4, 2023

View reviewed changes

build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1 Outdated Show resolved Hide resolved

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

NamanAg30 dismissed wenyingd’s stale review via c60c29c October 7, 2023 18:55

NamanAg30 force-pushed the updatek8sandcontainerd branch 2 times, most recently from c60c29c to 25a3d6d Compare October 7, 2023 19:00

NamanAg30 force-pushed the updatek8sandcontainerd branch 3 times, most recently from f3b4a3a to eab7706 Compare October 9, 2023 10:44

antoninbas previously approved these changes Oct 9, 2023

View reviewed changes

XinShuYang reviewed Oct 10, 2023

View reviewed changes

ci/jenkins/test.sh Show resolved Hide resolved

NamanAg30 dismissed antoninbas’s stale review via f3574f5 October 10, 2023 04:07

NamanAg30 force-pushed the updatek8sandcontainerd branch 2 times, most recently from f3574f5 to 61e84b7 Compare October 12, 2023 08:31

wenyingd reviewed Oct 25, 2023

View reviewed changes

build/yamls/windows/containerd/conf/Install-WindowsCNI-Containerd.ps1 Outdated Show resolved Hide resolved

antoninbas reviewed Oct 25, 2023

View reviewed changes

test/e2e/framework.go Outdated Show resolved Hide resolved

test/e2e/framework.go Outdated Show resolved Hide resolved

test/e2e/framework.go Outdated Show resolved Hide resolved

XinShuYang dismissed their stale review via fda949e October 26, 2023 02:55

XinShuYang force-pushed the updatek8sandcontainerd branch from 28b9ff1 to fda949e Compare October 26, 2023 02:55

XinShuYang requested review from antoninbas and wenyingd October 26, 2023 02:58

XinShuYang force-pushed the updatek8sandcontainerd branch from fda949e to bff5ce2 Compare October 26, 2023 03:19

wenyingd previously approved these changes Oct 26, 2023

View reviewed changes

tnqn reviewed Oct 26, 2023

View reviewed changes

XinShuYang dismissed wenyingd’s stale review via b4bac0c October 26, 2023 03:41

XinShuYang force-pushed the updatek8sandcontainerd branch 3 times, most recently from 93c05d0 to e9981e9 Compare October 26, 2023 03:48

XinShuYang requested a review from tnqn October 26, 2023 08:32

tnqn approved these changes Oct 26, 2023

View reviewed changes

wenyingd approved these changes Oct 26, 2023

View reviewed changes

XinShuYang force-pushed the updatek8sandcontainerd branch from e9981e9 to 47630ea Compare October 26, 2023 13:46

tnqn approved these changes Oct 26, 2023

View reviewed changes

tnqn merged commit 5b74593 into antrea-io:main Oct 27, 2023
48 of 59 checks passed

This was referenced Oct 31, 2023

Automated cherry pick of #5528: Update prepare-node script, antrea-windows-containerd.yml and #5643

Merged

Automated cherry pick of #5528: Update prepare-node script, antrea-windows-containerd.yml and #5646

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

To support new changes for Windows HostProcess Pod for K8S v1.28 and containerd 1.7 #5528

To support new changes for Windows HostProcess Pod for K8S v1.28 and containerd 1.7 #5528

NamanAg30 commented Sep 26, 2023 •

edited by rajnkamr

wenyingd left a comment

XinShuYang commented Sep 28, 2023

antoninbas left a comment

XinShuYang commented Oct 8, 2023

XinShuYang commented Oct 9, 2023

wenyingd left a comment

tnqn Oct 26, 2023

XinShuYang Oct 26, 2023

tnqn Oct 26, 2023

XinShuYang Oct 26, 2023 •

edited

tnqn Oct 26, 2023

XinShuYang Oct 26, 2023 •

edited

wenyingd Oct 26, 2023

XinShuYang commented Oct 26, 2023

tnqn left a comment

XinShuYang commented Oct 26, 2023

wenyingd left a comment

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

tnqn commented Oct 27, 2023

tnqn commented Oct 27, 2023

To support new changes for Windows HostProcess Pod for K8S v1.28 and containerd 1.7 #5528

To support new changes for Windows HostProcess Pod for K8S v1.28 and containerd 1.7 #5528

Conversation

NamanAg30 commented Sep 26, 2023 • edited by rajnkamr

wenyingd left a comment

Choose a reason for hiding this comment

XinShuYang commented Sep 28, 2023

antoninbas left a comment

Choose a reason for hiding this comment

XinShuYang commented Oct 8, 2023

XinShuYang commented Oct 9, 2023

wenyingd left a comment

Choose a reason for hiding this comment

tnqn Oct 26, 2023

Choose a reason for hiding this comment

XinShuYang Oct 26, 2023

Choose a reason for hiding this comment

tnqn Oct 26, 2023

Choose a reason for hiding this comment

XinShuYang Oct 26, 2023 • edited

Choose a reason for hiding this comment

tnqn Oct 26, 2023

Choose a reason for hiding this comment

XinShuYang Oct 26, 2023 • edited

Choose a reason for hiding this comment

wenyingd Oct 26, 2023

Choose a reason for hiding this comment

XinShuYang commented Oct 26, 2023

tnqn left a comment

Choose a reason for hiding this comment

XinShuYang commented Oct 26, 2023

wenyingd left a comment

Choose a reason for hiding this comment

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

XinShuYang commented Oct 26, 2023

tnqn commented Oct 27, 2023

tnqn commented Oct 27, 2023

NamanAg30 commented Sep 26, 2023 •

edited by rajnkamr

XinShuYang Oct 26, 2023 •

edited

XinShuYang Oct 26, 2023 •

edited