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.

Sign up for GitHub

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

Jump to bottom

feat: bump Containerd to 1.6.24 #922

Merged
merged 1 commit into from
Oct 17, 2023
Merged

feat: bump Containerd to 1.6.24 #922

merged 1 commit into from
Oct 17, 2023

Conversation

bcm820
Copy link
Contributor

@bcm820 bcm820 commented Oct 6, 2023

What problem does this PR solve?:

Which issue(s) does this PR fix?:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

@bcm820 bcm820 requested review from dkoshkin and a team October 6, 2023 14:52
@dkoshkin dkoshkin added the runs-e2e-tests runs e2e tests for GHA label Oct 6, 2023
@jimmidyson
Copy link
Contributor

Why can't we bump to 1.7.x?

@bcm820
Copy link
Contributor Author

bcm820 commented Oct 6, 2023

Why can't we bump to 1.7.x?

Ah, we can! Just checked https://github.com/containerd/containerd/blob/main/RELEASES.md#kubernetes-support

@bcm820 bcm820 force-pushed the mendoza/containerd-1.6.24 branch from 8e9e4c2 to 881823e Compare October 6, 2023 16:51
@bcm820 bcm820 changed the title feat: update Containerd to 1.6.24 feat: update Containerd to 1.7.6 Oct 6, 2023
@github-actions github-actions bot added feature and removed feature labels Oct 6, 2023
@dkoshkin dkoshkin self-requested a review October 6, 2023 17:17
@dkoshkin
Copy link
Contributor

dkoshkin commented Oct 6, 2023

We don't have the builds for 1.7.x yet https://teamcity.mesosphere.io/project/MesosphereOnly_ClosedSource_DkpReleases_UpstreamBuilds_Containerd?branch=&buildTypeTab=overview&mode=builds#all-projects

@dkoshkin
Copy link
Contributor

dkoshkin commented Oct 6, 2023 •
edited
Loading

I wouldn't be comfortable merging a 1.7.x bump before testing some images built with KIB in Konvoy.

@bcm820 bcm820 force-pushed the mendoza/containerd-1.6.24 branch from 881823e to 7a0eddb Compare October 6, 2023 17:21
@bcm820 bcm820 changed the title feat: update Containerd to 1.7.6 feat: update Containerd to 1.6.24 Oct 6, 2023
@github-actions github-actions bot added feature and removed feature labels Oct 6, 2023
@faiq faiq added runs-e2e-tests runs e2e tests for GHA and removed runs-e2e-tests runs e2e tests for GHA labels Oct 12, 2023
@dkoshkin
Copy link
Contributor

@faiq when did the podman build get broken? Will we need to backport for DKP 2.6? If so, please pull those commits out into a separate PR.

@faiq
Copy link
Collaborator

faiq commented Oct 13, 2023

To me the issue with podman seems to be rooted with using the binary with the embedded image. I'm not sure when this happened, but to work around it in the tests we are now pulling the image instead. For users that wish to you use podman as a container engine, it seems to me that they should not use the binary with the embeded image and opt to pull it instead.

@faiq faiq changed the title feat: update Containerd to 1.6.24 feat: bump Containerd to 1.6.24 Oct 13, 2023
@github-actions github-actions bot added feature and removed feature labels Oct 13, 2023
@bcm820
Copy link
Contributor Author

bcm820 commented Oct 16, 2023

Based on this conversation we actually cannot upgrade containerd at this time. The containerd version is constrained by our Flatcar LTS version; see the previous PR for K8s 1.26 and Flatcar LTS release notes.

@dkoshkin
Copy link
Contributor

Based on this conversation we actually cannot upgrade containerd at this time. The containerd version is constrained by our Flatcar LTS version; see the previous PR for K8s 1.26 and Flatcar LTS release notes.

@bcm820 do you mean here that you can't upgrade Flatcar, or are you saying we shouldn't upgrade Containerd at all?

@bcm820
Copy link
Contributor Author

bcm820 commented Oct 16, 2023

@bcm820 do you mean here that you can't upgrade Flatcar, or are you saying we shouldn't upgrade Containerd at all?

As discussed in the thread, I was confused about the dependency on containerd. Please disregard :)

@faiq faiq force-pushed the mendoza/containerd-1.6.24 branch from ba7e851 to 5b3f1ae Compare October 16, 2023 18:25
@dkoshkin dkoshkin merged commit 79c1737 into main Oct 17, 2023
62 of 63 checks passed
@dkoshkin dkoshkin deleted the mendoza/containerd-1.6.24 branch October 17, 2023 15:22
@mesosphere-ci mesosphere-ci mentioned this pull request Oct 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkarroqe mkarroqe mkarroqe approved these changes

@dkoshkin dkoshkin dkoshkin approved these changes

Assignees
No one assigned
Labels
feature runs-e2e-tests runs e2e tests for GHA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bcm820 @jimmidyson @dkoshkin @faiq @mkarroqe