Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[backport stable-2.0] versions: Update Kubernetes, containerd, cri-o and cri-tools #981

Closed

Conversation

chavafg
Copy link
Contributor

@chavafg chavafg commented Oct 16, 2020

Kubernetes: from 1.17.3 to 1.18.9
CRI-O: from 0eec454168e381e460b3d6de07bf50bfd9b0d082 (1.17) to 1.18.3
Containerd: from 3a4acfbc99aa976849f51a8edd4af20ead51d8d7 (1.3.3) to 1.3.7
cri-tools: from 1.17.0 to 1.18.0

Fixes: #960.

Signed-off-by: Salvador Fuentes salvador.fuentes@intel.com
(cherry picked from commit 720eab7)

@chavafg chavafg changed the title versions: Update Kubernetes, containerd, cri-o and cri-tools [backport stable-2.0] versions: Update Kubernetes, containerd, cri-o and cri-tools Oct 16, 2020
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 @chavafg!

@chavafg
Copy link
Contributor Author

chavafg commented Oct 16, 2020

/test

Kubernetes: from 1.17.3 to 1.18.9
CRI-O: from 0eec454168e381e460b3d6de07bf50bfd9b0d082 (1.17) to 1.18.3
Containerd: from 3a4acfbc99aa976849f51a8edd4af20ead51d8d7 (1.3.3) to 1.3.7
cri-tools: from 1.17.0 to 1.18.0

Fixes: kata-containers#960.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
(cherry picked from commit 720eab7)
chavafg added a commit to chavafg/tests-1 that referenced this pull request Oct 17, 2020
Add runc to the runtimes map in the cri-o drop-in file.
In addition, the default runtime is set to runc as we use
runc for initiating the kubernetes cluster and then we use
RuntimeClass to run tests using Kata.

Add `manage_ns_lifecycle = true` to the drop in file and remove
the commands that changed this in `.ci/install_crio.sh`

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

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
(cherry picked from commit 0fb0f3b)
@bergwolf
Copy link
Member

These were included in #984 and already in stable-2.0.0. Thanks @chavafg and apology for the conflicts.

@amshinde
Copy link
Member

Since the changes have already made it to the stable 2.0 branch, closing this PR.

@amshinde amshinde closed this Oct 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants