Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

containerd: fix the issue of getting cri version #3629

Merged
merged 1 commit into from
Jun 30, 2021

Conversation

lifupan
Copy link
Member

@lifupan lifupan commented Jun 17, 2021

Since 1.5.0, containerd had embedded cri and there's no
need to get the cri version.

Depends-on: github.com/kata-containers/kata-containers#2040

Fixes:#3630

Signed-off-by: fupan.lfp fupan.lfp@antgroup.com

@lifupan
Copy link
Member Author

lifupan commented Jun 17, 2021

/test

@lifupan
Copy link
Member Author

lifupan commented Jun 17, 2021

/test

Copy link
Member

@fidencio fidencio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @lifupan!

Copy link
Contributor

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @lifupan.

lgtm

@snir911
Copy link
Member

snir911 commented Jun 17, 2021

/retest

echo "Get cri_containerd version"
cri_containerd_version_url="https://raw.githubusercontent.com/containerd/containerd/${cri_containerd_tarball_version}/vendor.conf"
cri_containerd_version=$(curl -sL $cri_containerd_version_url | grep "github.com/containerd/cri" | awk '{print $2}')
cri_containerd_version=$(cri_containerd_tarball_version)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be cri_containerd_version="$cri_containerd_tarball_version"
The CI run into this error:

03:19:00 .ci/install_cri_containerd.sh: line 32: cri_containerd_tarball_version: command not found
03:19:01 Failed at 32: cri_containerd_version=$(cri_containerd_tarball_version)

@lifupan lifupan force-pushed the main branch 5 times, most recently from ab6846e to 6ea8679 Compare June 18, 2021 09:19
@lifupan
Copy link
Member Author

lifupan commented Jun 18, 2021

/test

@lifupan
Copy link
Member Author

lifupan commented Jun 22, 2021

/test-ubuntu

@lifupan
Copy link
Member Author

lifupan commented Jun 22, 2021

/test

@lifupan
Copy link
Member Author

lifupan commented Jun 22, 2021

Hi, @fidencio
By now it seemed the CI worked well on containerd, but the cri-o didn't work, can you take a look on the cri-o case?

@fidencio
Copy link
Member

@lifupan, sure, let me dig into this.

@lifupan
Copy link
Member Author

lifupan commented Jun 22, 2021

/test

@fidencio
Copy link
Member

The error we're getting is interesting, at least:

 CreateContainer failed: Can not convert uint to grpc.isLinuxSyscall_ErrnoRet: invalid argument

And this is coming from the agent.

@lifupan
Copy link
Member Author

lifupan commented Jun 22, 2021

The error we're getting is interesting, at least:

 CreateContainer failed: Can not convert uint to grpc.isLinuxSyscall_ErrnoRet: invalid argument

And this is coming from the agent.

Oh, I got it. Since the upgrading containerd vendor bring the oci runtime spec's upgrading, and the latest oci spec redefined some fields.

@fidencio
Copy link
Member

The error we're getting is interesting, at least:

 CreateContainer failed: Can not convert uint to grpc.isLinuxSyscall_ErrnoRet: invalid argument

And this is coming from the agent.

Oh, I got it. Since the upgrading containerd vendor bring the oci runtime spec's upgrading, and the latest oci spec redefined some fields.

Did you? I'm still confused, to be honest, and would appreciate some light to the issue.

Since 1.5.0, containerd had embedded cri and there's no
need to get the cri version.

Depends-on: github.com/kata-containers/kata-containers#2040

Fixes:kata-containers#3630

Signed-off-by: fupan.lfp <fupan.lfp@antgroup.com>
@lifupan
Copy link
Member Author

lifupan commented Jun 25, 2021

/retest

@lifupan
Copy link
Member Author

lifupan commented Jun 25, 2021

Hi @fidencio

The CI worked, and it's ready for your review.

lifupan pushed a commit to lifupan/kata-containers that referenced this pull request Jun 25, 2021
Since the rpc spec used an interface to represen the ErrnoRet,
thus the transform function of OCItoGRPC should take care of
this case.

Depends-on: github.com/kata-containers/tests#3629

Fixes: kata-containers#1441

Signed-off-by: fupan.lfp <fupan.lfp@antgroup.com>
@egernst egernst merged commit 505c4ad into kata-containers:main Jun 30, 2021
lifupan pushed a commit to lifupan/kata-containers that referenced this pull request Jul 1, 2021
Since the rpc spec used an interface to represen the ErrnoRet,
thus the transform function of OCItoGRPC should take care of
this case.

Depends-on: github.com/kata-containers/tests#3629

Fixes: kata-containers#1441

Signed-off-by: fupan.lfp <fupan.lfp@antgroup.com>
snir911 pushed a commit to snir911/tests that referenced this pull request Jul 26, 2021
Since latest versions, containerd had embedded cri and there's no
need to get the cri version.

Depends-on: github.com/kata-containers/kata-containers#2222

Fixes:kata-containers#3630
Backports: kata-containers#3629

Signed-off-by: fupan.lfp <fupan.lfp@antgroup.com>
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants