ci: separarte pull-containerd-node-e2e for 1.5 branch #27912

akhilerm · 2022-11-07T10:39:53Z

containerd v1.5.x supports CRI v1alpha2, the API that was available at the time of release for containerd v1.5.
containerd v1.6.x has support for both CRI v1alpha2 and v1; and is being designated a long term support release.

kubelet master is removing support for CRI v1alpha2, this action has the effect of forcing kubernetes master(and kubernetes r.next+) users to move up to containerd v1.6.x where both CRI v1 and v1alpha2 is supported.

Therefore we need to separate out the pull-containerd-node-e2e job for containerd 1.5 branch, so that patches can still be made to 1.5 branch till its EOL. Instead of running against kubernetes master, it will run against k8s release-1.25 branch (the last release which supports CRI v1alpha2)

Ref: kubernetes/kubernetes#110618

Signed-off-by: Akhil Mohan makhil@vmware.com

k8s-ci-robot · 2022-11-07T10:40:02Z

Hi @akhilerm. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

akhilerm · 2022-11-07T10:41:58Z

/cc @dims @adisky @mikebrow

We need this job to run till containerd 1.5 EOL, so that the 1.5 branch can still accept patches

dims · 2022-11-07T13:54:52Z

/assign @mikebrow

mikebrow · 2022-11-07T15:36:04Z

nit on the explanation text in the PR...
containerd v1.5.x supports CRI v1alpha2, the api that was available at the time of release for containerd v.1.5
containerd v1.6.x has support for both CRI v1alpha2 and v1; and is being designated a long term support release

kubelet master is removing support for CRI v1alpha2, this action has the effect of forcing kubernetes master(and kubernetes r.next+) users to move up to containerd v1.6.x where both CRI v1 and v1alpha2 is supported...

samuelkarp

I'm not super familiar with the configuration here, but this LGTM.

k8s-ci-robot · 2022-11-08T01:13:58Z

@samuelkarp: changing LGTM is restricted to collaborators

In response to this:

I'm not super familiar with the configuration here, but this LGTM.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

qiutongs

Thanks for the fix.

containerd v1.5.x supports CRI v1alpha2, the API that was available at the time of release for containerd v1.5. containerd v1.6.x has support for both CRI v1alpha2 and v1; and is being designated a long term support release. kubelet master is removing support for CRI v1alpha2, this action has the effect of forcing kubernetes master(and kubernetes r.next+) users to move up to containerd v1.6.x where both CRI v1 and v1alpha2 is supported. Therefore we need to separate out the pull-containerd-node-e2e job for containerd 1.5 branch, so that patches can still be made to 1.5 branch till its EOL. Instead of running against kubernetes master, it will run against k8s release-1.25 branch (the last release which supports CRI v1alpha2) Ref: kubernetes/kubernetes#110618 Signed-off-by: Akhil Mohan <makhil@vmware.com>

akhilerm · 2022-11-08T05:38:24Z

@mikebrow Updated the PR description

adisky

Thanks @akhilerm
/lgtm

akhilerm · 2022-11-09T04:20:04Z

jobs/e2e_node/containerd/containerd-main-presubmit/env

@@ -6,3 +6,4 @@ CONTAINERD_PKG_PREFIX: 'containerd-cni'
 CONTAINERD_EXTRA_RUNTIME_HANDLER: 'test-handler'
 CONTAINERD_EXTRA_RUNTIME_OPTIONS: |
  BinaryName = "/home/containerd/usr/local/sbin/runc"
+CONTAINERD_SYSTEMD_CGROUP: 'true'


@bobbypage Should we add the CONTAINERD_COS_CGROUP_MODE: 'v2' also here?

akhilerm · 2022-11-09T04:53:54Z

/retest

k8s-ci-robot · 2022-11-09T04:54:08Z

@akhilerm: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

ameukam · 2022-11-09T05:22:02Z

/ok-to-test

endocrimes

/approve
^
node e2e change

I'll defer to @bobbypage on the COS_CGROUP_MODE thing.

/hold
^
unhold when ready

mikebrow

LGTM

k8s-ci-robot · 2022-11-09T16:58:06Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akhilerm, endocrimes, mikebrow, qiutongs, samuelkarp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~config/jobs/containerd/containerd/OWNERS~~ [mikebrow]
~~jobs/e2e_node/OWNERS~~ [endocrimes]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

SergeyKanzhelev · 2022-11-09T19:28:15Z

/unhold

lgtm

@bobbypage lmk if something needs to be changed

k8s-ci-robot · 2022-11-09T19:43:41Z

@akhilerm: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

key containerd-presubmit-jobs.yaml using file config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml

In response to this:

containerd v1.5.x supports CRI v1alpha2, the API that was available at the time of release for containerd v1.5.
containerd v1.6.x has support for both CRI v1alpha2 and v1; and is being designated a long term support release.

kubelet master is removing support for CRI v1alpha2, this action has the effect of forcing kubernetes master(and kubernetes r.next+) users to move up to containerd v1.6.x where both CRI v1 and v1alpha2 is supported.

Therefore we need to separate out the pull-containerd-node-e2e job for containerd 1.5 branch, so that patches can still be made to 1.5 branch till its EOL. Instead of running against kubernetes master, it will run against k8s release-1.25 branch (the last release which supports CRI v1alpha2)

Ref: kubernetes/kubernetes#110618

Signed-off-by: Akhil Mohan makhil@vmware.com

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bobbypage · 2022-11-09T19:54:56Z

/unhold

lgtm

@bobbypage lmk if something needs to be changed

Yes, we need to ensure that the systemd cgroup driver is configured for all the containerd jobs using COS M97+. Looks like this will be taken care of in #27943, thanks @akhilerm for followup PR.

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 7, 2022

k8s-ci-robot added area/config Issues or PRs related to code in /config area/jobs sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Nov 7, 2022

k8s-ci-robot requested review from dchen1107 and Random-Liu November 7, 2022 10:40

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 7, 2022

k8s-ci-robot requested review from adisky, dims and mikebrow November 7, 2022 10:41

k8s-ci-robot assigned mikebrow Nov 7, 2022

akhilerm mentioned this pull request Nov 7, 2022

[release/1.5] update to Go 1.18.8 to address CVE-2022-41716 containerd/containerd#7633

Merged

estesp mentioned this pull request Nov 7, 2022

[release/1.5] Setup pod network after creating the sandbox container containerd/containerd#7464

Merged

samuelkarp approved these changes Nov 8, 2022

View reviewed changes

qiutongs approved these changes Nov 8, 2022

View reviewed changes

k8s-ci-robot assigned qiutongs Nov 8, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2022

akhilerm force-pushed the pull-containerd-node-e2e-1_5 branch from d89a7bf to 935fa77 Compare November 8, 2022 05:37

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2022

adisky reviewed Nov 8, 2022

View reviewed changes

k8s-ci-robot assigned adisky Nov 8, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 8, 2022

akhilerm force-pushed the pull-containerd-node-e2e-1_5 branch from 93e8962 to fda1098 Compare November 9, 2022 04:19

akhilerm commented Nov 9, 2022

View reviewed changes

akhilerm requested review from adisky and removed request for dims, Random-Liu and dchen1107 November 9, 2022 04:20

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 9, 2022

endocrimes approved these changes Nov 9, 2022

View reviewed changes

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 9, 2022

k8s-ci-robot assigned endocrimes Nov 9, 2022

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 9, 2022

akhilerm mentioned this pull request Nov 9, 2022

add systemd as cgroup driver #27943

Merged

mikebrow approved these changes Nov 9, 2022

View reviewed changes

SergeyKanzhelev added this to Triage in SIG Node CI/Test Board Nov 9, 2022

SergeyKanzhelev added this to Triage in SIG Node PR Triage Nov 9, 2022

SergeyKanzhelev moved this from Triage to Done in SIG Node CI/Test Board Nov 9, 2022

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 9, 2022

k8s-ci-robot merged commit c2e018d into kubernetes:master Nov 9, 2022

SIG Node PR Triage automation moved this from Triage to Done Nov 9, 2022

akhilerm deleted the pull-containerd-node-e2e-1_5 branch November 10, 2022 05:25

akhilerm mentioned this pull request Dec 9, 2022

REQUEST: New membership for akhilerm kubernetes/org#3889

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ci: separarte pull-containerd-node-e2e for 1.5 branch #27912

ci: separarte pull-containerd-node-e2e for 1.5 branch #27912

akhilerm commented Nov 7, 2022 •

edited

k8s-ci-robot commented Nov 7, 2022

akhilerm commented Nov 7, 2022

dims commented Nov 7, 2022

mikebrow commented Nov 7, 2022

samuelkarp left a comment

k8s-ci-robot commented Nov 8, 2022

qiutongs left a comment

akhilerm commented Nov 8, 2022

adisky left a comment

akhilerm Nov 9, 2022

akhilerm commented Nov 9, 2022

k8s-ci-robot commented Nov 9, 2022

ameukam commented Nov 9, 2022

endocrimes left a comment

mikebrow left a comment

k8s-ci-robot commented Nov 9, 2022

SergeyKanzhelev commented Nov 9, 2022

k8s-ci-robot commented Nov 9, 2022

bobbypage commented Nov 9, 2022

ci: separarte pull-containerd-node-e2e for 1.5 branch #27912

ci: separarte pull-containerd-node-e2e for 1.5 branch #27912

Conversation

akhilerm commented Nov 7, 2022 • edited

k8s-ci-robot commented Nov 7, 2022

akhilerm commented Nov 7, 2022

dims commented Nov 7, 2022

mikebrow commented Nov 7, 2022

samuelkarp left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Nov 8, 2022

qiutongs left a comment

Choose a reason for hiding this comment

akhilerm commented Nov 8, 2022

adisky left a comment

Choose a reason for hiding this comment

akhilerm Nov 9, 2022

Choose a reason for hiding this comment

akhilerm commented Nov 9, 2022

k8s-ci-robot commented Nov 9, 2022

ameukam commented Nov 9, 2022

endocrimes left a comment

Choose a reason for hiding this comment

mikebrow left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Nov 9, 2022

SergeyKanzhelev commented Nov 9, 2022

k8s-ci-robot commented Nov 9, 2022

bobbypage commented Nov 9, 2022

akhilerm commented Nov 7, 2022 •

edited