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

runc: release 1.2.0-rc.1 #3963

Closed
wants to merge 3 commits into from

Conversation

rata
Copy link
Contributor

@rata rata commented Aug 4, 2023

As discussed in the mailing-list, here is the changelog for the 1.2.0-rc.1 release.

For future reference (in case it helps others), this is what I did to create it: I started to create this by looking at all the merge commits since 1.1.0, but that took several hours and I only went through a few months. Then I started to look at github PRs with the impact/changelog label. I used these queries:

  • is:pr label:impact/changelog -label:backport/done/1.1 is:closed
  • is:pr is:closed label:impact/changelog -label:backport/done/1.1 milestone:1.2.0

This changelog is basically the result of those queries, plus 1-2 others that I found looking manually.

The release date is of course aspirational :)

CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

I think there are still a few too many things in the milestone for 1.2.0 to start doing RCs (time namespace, removing bindfd, full idmapped mounts support). The bindfd one is pretty important because the current state of main is such that quite a few people have reported significant performance issues with the new setup. I would want to get at least #3931 and #3876 merged before an -rc1, and I think #3953 needs to go into 1.2.0-rc2 at the latest (but I'd prefer to get it into -rc1).

I don't want us to have more than 2 or 3 rcs for 1.2, so we should get the big bits of code done and do a feature freeze after rc1 to make sure we don't have a repeat of 1.0.

@rata
Copy link
Contributor Author

rata commented Aug 4, 2023

@cyphar But the issues you mention are also in the 1.1 release branch, right? Not creating a release will not fix any issue either, IIUC. Can't we just release runc 1.3.0 when those PRs are merged and release 1.2.0 now?

Do you think those PRs can be merged soon (like next week)? Or what do you estimate (realistically)?

Not having a runc release also is complicating moving forward in Kubernetes and containerd with userns support (that requires idmap mounts. The full idmap mount support that you mention is not needed by any user for now).

Kubernetes requires idmap mounts since 1.27 already (now 1.28 is about to be released in the next days), and it can't be used with a runc release currently. And some PRs to containerd that require idmap mounts support in runc are also halted due to a missing release (containerd/containerd#8287 (review)).

@cyphar
Copy link
Member

cyphar commented Aug 4, 2023

#3931 and #3876 are both ready to merge IMHO. I would be fine with a -rc1 release with just those if we really do need to rush it that badly. #3953 will probably be ready next week (there is a CRIU test failure that only happens in CI that I'm currently debugging -- aside from that, all of the code works and full idmapped-mount support is implemented).

But I need to point out that your suggestion appears to be to have everyone ship -rcs? We did that for 1.0-rc9999999 but that's because we forgot how RCs are supposed to work. I would not expect distributions to ship -rc1 to everyone indiscriminately.

@rata
Copy link
Contributor Author

rata commented Aug 4, 2023

@cyphar Ok, so I assume the release 1.1 still has the same issue.

#3931 and #3876 are both ready to merge IMHO. I would be fine with a -rc1 release with just those if we really do need to rush it that badly. #3953 will probably be ready next week (there is a CRIU test failure that only happens in CI that I'm currently debugging -- aside from that, all of the code works and full idmapped-mount support is implemented).

Okay, so wanna include those in -rc.1 if they are merged by next week and otherwise we release 1.2.0-rc.1 AND 1.2.0 without them?

But I need to point out that your suggestion appears to be to have everyone ship -rcs? We did that for 1.0-rc9999999 but that's because we forgot how RCs are supposed to work. I would not expect distributions to ship -rc1 to everyone indiscriminately.

No, I don't propose to keep doing rc releases. My original proposal in the PR is to release without them, and release again when those are merged. Not delay any final release. Nor rc release to include PRs, as you just proposed ;)

@AkihiroSuda
Copy link
Member

Can we just release beta.1? Or alpha.1

@kolyshkin
Copy link
Contributor

kolyshkin commented Aug 4, 2023

I agree with @cyphar -- we need to merge these big things first, and also I see no point in release alpha or beta, if there will be big changes coming up.

OTOH I agree we need the 1.2.0 release soon (and, in general, make new releases more frequent -- which we're already doing with x.y.z -stable releases, but alas not the main branch). If that's the target, we can release what we have as 1.2 and move the features we're still working on to 1.3 milestone.

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@cyphar
Copy link
Member

cyphar commented Aug 5, 2023

@rata

so I assume the release 1.1 still has the same issue.

No, #3599 was never backported to 1.1.

otherwise we release 1.2.0-rc.1 AND 1.2.0 without them

I don't want a 1.2 release without full idmapped mount support when there is already a PR that has working code and is nearly ready for merging.

No, I don't propose to keep doing rc releases. My original proposal in the PR is to release without them, and release again when those are merged.

I don't really see any point to doing a 1.2 release and then doing a 1.3 release a few weeks later, when we can instead get a few remaining PRs in and then do a 1.2 release. But more importantly, I don't want a release with partial idmapped mount support if it's not necessary (and since #3953 exists and the code works, it seems extremely unnecessary).

@kolyshkin

OTOH I agree we need the 1.2.0 release soon (and, in general, make new releases more frequent -- which we're already doing with x.y.z -stable releases, but alas not the main branch).

I completely agree. We need to start doing time-based releases, like we discussed around the time of 1.1. Maybe we can aim for a minor release every 3 months, kind of like Linux?

@cyphar
Copy link
Member

cyphar commented Aug 6, 2023

I just noticed the JSON field names for the idmap mounts don't match the style of the other fields. This is something we cannot change after we do a runc release, so this needs to be fixed first as well. I will fix that in #3953 as well.

@rata
Copy link
Contributor Author

rata commented Aug 7, 2023

@cyphar

No, #3599 was never backported to 1.1.

Exactly. But that fixes an issue present in 1.1, right? If there are no known issues in main that are not present in 1.1, then we won't knowingly cause regressions by doing a release.

@kolyshkin

If that's the target, we can release what we have as 1.2 and move the features we're still working on to 1.3 milestone.

I completely agree with that, that is what I proposed :). I'm ok with either doing a rc release "now" or waiting 1 more week and do an rc release.

If we have pending PRs that are very useful, don't make it for 1.2 and fix issues users are reporting, I think that is nice too because we will do an 1.3 release in 3 months. And hopefully that helps to build the muscle :)

@cyphar

I completely agree. We need to start doing time-based releases, like we discussed around the time of 1.1. Maybe we can aim for a minor release every 3 months, kind of like Linux?

So, @cyphar does it sound good to you to do an rc release on Aug 17th, that would gives us time to merge the PRs that are very close, do any pass we want to do before and whatever big changes are not merged for the rc release, will be included in 1.3 in 3 months?

@kolyshkin kolyshkin added this to the 1.2.0 milestone Aug 14, 2023
@rata rata force-pushed the rata/release-1.2.0-rc.1 branch 2 times, most recently from a755754 to 0be0cd0 Compare September 12, 2023 10:10
@rata rata force-pushed the rata/release-1.2.0-rc.1 branch 2 times, most recently from 10fb4e0 to bf3ae7e Compare September 25, 2023 09:49
@rata
Copy link
Contributor Author

rata commented Sep 27, 2023

I'll be afk for a few weeks starting tomorrow. Please feel free to carry-this forward if you need to.

The changelog is updated until the current main as of today

@h-vetinari
Copy link

h-vetinari commented Oct 23, 2023

We need to start doing time-based releases, like we discussed around the time of 1.1. Maybe we can aim for a minor release every 3 months, kind of like Linux?

I think there's a clash between the mindset of "we shouldn't release until feature X or refactor Y lands" and time-based releases -- you cannot1 have both, and so far the former has clearly won, while people (including runc developers it seems) want the latter.

Given the developer/review capacity and resulting velocity in this repo, I think that a 3 months release cadence is way too ambitious (case in point: this PR is almost 3 months old). It might work with 6 months, where the last two months before a release are for finalization (presumably on a release branch, so that development on main doesn't have to stop). But whatever the cadence, the key to pull off time-based releases is to deny yourself the "<foo> shouldn't miss the next release" urge.

Just my 2c...

PS. Another case in point, citing 1.1.7 release notes:

[Apr. 27th] This is the seventh patch release in the 1.1.z release of runc, and is the last planned release of the 1.1.z series.

Footnotes

  1. while it's rare to use the C++ standard as a positive example, they managed to make the switch to time-based releases (and have been sticking to it successfully), but only by being very strict about avoiding the "wait for Z" mentality.

@SuperQ
Copy link
Contributor

SuperQ commented Oct 31, 2023

Just add a comparison, we cut main to a release branch every 6 weeks in Prometheus. The difference is we go from cut, to rc, to release in a few days. The regular cadence actually makes it easier to release.

@rata
Copy link
Contributor Author

rata commented Dec 8, 2023

Updated to current main, forward ported the changelog for other runc 1.1 releases and added entries for blocker PRs for 1.2.0-rc.1 that are not yet merged.

@cyphar
Copy link
Member

cyphar commented Dec 10, 2023

@h-vetinari I understand your point of view, however:

I think there's a clash between the mindset of "we shouldn't release until feature X or refactor Y lands" and time-based releases.

The PRs I've linked are fixes for a broken feature, which required a significant rewrite to fix. The only two options are to revert the feature entirely (which @rata wouldn't like, because that's the main feature he wants in 1.2) or to wait for the fix to land.

If we had an agreed-to time-based release cadence, I wouldn't have merged the idmap code in the state it was when we merged it. I merged it because I knew we had time to rework it (though it turns out it required a larger rework than I expected). So yes, if things were different, then things would be different. 😸

[Apr. 27th] This is the seventh patch release in the 1.1.z release of runc, and is the last planned release of the 1.1.z series.

In the defense of the other maintainers, that was my plan at the beginning of the year. Obviously, things didn't go to plan.

@SuperQ
Copy link
Contributor

SuperQ commented Dec 10, 2023

@cyphar Does the broken feature affect users who are not using it? If it does, I would revert for sure.

If it's only broken for people using it, I would put something in the Go docs.

But if the rework is as complicated as you suggest, I would probably revert it. The change + rework can be done separately, and a new release can be cut at any time to release it.

Getting 1.2.0 out the door is important for a lot of other features. For example, we've been waiting quite a long time for cgroup v2 PSI support. While we could use a git tag downstream, having a release is probably better practice considering how many downstream users of Kubernetes there are.

@cyphar
Copy link
Member

cyphar commented Dec 10, 2023

The code is already ready in #3985. Reverting all of the changes I've done over the past 4 months to fix this code is going to be significantly more work than finishing the review of 1 PR.

@rata rata force-pushed the rata/release-1.2.0-rc.1 branch 2 times, most recently from e1aba7f to 9f7cf5d Compare December 18, 2023 11:38
@bryantbiggs
Copy link

given #3985 is merged, is there anything else required before a RC can be created?

@AkihiroSuda
Copy link
Member

given #3985 is merged, is there anything else required before a RC can be created?

@AkihiroSuda
Copy link
Member

LGTM after rebase

@cyphar
Copy link
Member

cyphar commented Mar 13, 2024

An rc1 needs to include the changelog in #4218 since it includes warnings about possible breakages. I can prepare an rc1 update PR with that included though.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
@rata
Copy link
Contributor Author

rata commented Mar 13, 2024

@cyphar thanks! I've rebased, added that (removed the parenthesis about the mapping restriction, that wasn't never in a release), added this includes all the fixes to runc 1.1.12 and forward-ported those changelog entries too.

I added a tentative date of next week for the release, I can adjust that too, of course.

EDIT: I've also had a looked at the PRs that got merged since I last updated this (Dec 18), and it seems nothing was worth mentioning. So this should be up to date until now.

@cyphar @AkihiroSuda PTAL

@rata rata force-pushed the rata/release-1.2.0-rc.1 branch 2 times, most recently from b38377d to f4afe3d Compare March 13, 2024 11:43
Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
@cyphar
Copy link
Member

cyphar commented Mar 14, 2024

I have several other changelog fixes that I've applied to my own branch (wording fixes and your copy of the 1.1.z changes is missing the links and a few other things), and to be honest it's simpler for me to do a release from my own branch. Closing in favour of #4221.

@cyphar cyphar closed this Mar 14, 2024
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

7 participants