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

patches: Add maintenance mode dates, updated EOLs, and final v1.18 release #1532

Merged
merged 5 commits into from
Apr 22, 2021
Merged

patches: Add maintenance mode dates, updated EOLs, and final v1.18 release #1532

merged 5 commits into from
Apr 22, 2021

Conversation

justaugustus
Copy link
Member

What type of PR is this:

/kind cleanup documentation feature

What this PR does / why we need it:

  • Restore release history table for v1.18 series
  • Add a final maintenance release (v1.18.19) to the v1.18 series
  • Extend EOL dates to include a maintenance window
  • Add maintenance mode dates for active release series
  • Add copy around maintenance mode and EOL expectations

/assign @hasheddan @saschagrunert @xmudrii
cc: @kubernetes/sig-release-leads @kubernetes/release-managers

ref:

Which issue(s) this PR fixes:

Special notes for your reviewer:

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/documentation Categorizes issue or PR as related to documentation. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority labels Apr 22, 2021
@k8s-ci-robot k8s-ci-robot requested review from feiskyer and puerco April 22, 2021 02:27
@k8s-ci-robot k8s-ci-robot added area/release-team Issues or PRs related to the release-team subproject sig/release Categorizes an issue or PR as relevant to SIG Release. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 22, 2021
@justaugustus
Copy link
Member Author

/hold for discussion

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2021
hasheddan
hasheddan reviewed Apr 22, 2021
View reviewed changes
releases/patch-releases.md Outdated

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
|--- |--- |--- |
| 1.18.19 | 2021-04-26 | 2021-04-28 |
Copy link
Contributor

Choose a reason for hiding this comment

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

I would like to propose final patch release for 1.18 on 5/7/21 with the rest of the active branch patches. This is simpler for folks trying to get cherry picks backported to all branches, and also provides more time given that we are a bit late communicating this date.

Copy link
Member Author

Choose a reason for hiding this comment

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

@hasheddan -- I'd like to minimize how much longer we keep the 1.18 branch around, as it's running on go1.13.15 (which is out of support upstream).

The thought process around the 28th was although it deviates from the patch release schedule month-to-month, it allows us to give a very consistent response about when a release in entering maintenance mode or going EOL; it's always the 28th of the designated month.

A consideration for a follow-up 👇🏾
Are we okay with 5/7 as a patch release date next month? That falls within the week of KubeCon.

Copy link
Contributor

Choose a reason for hiding this comment

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

That sounds like a good policy (having final patch be on the 28th of the EOL month), but I would encourage us to consider enacting that post 1.18 as we are already close to the deadline and some folks have made the assumption (reasonably) that if we were to have one more patch it would be aligned with the other branches. We should also consider any future confusion this could introduce with folks opening CPs to branches that have different CP deadlines when the oldest active branch is reaching EOL.

Copy link
Member Author

Choose a reason for hiding this comment

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

some folks have made the assumption (reasonably) that if we were to have one more patch it would be aligned with the other branches

@hasheddan -- Great point. Updated!

Are we okay with 5/7 as a patch release date next month? That falls within the week of KubeCon.

Don't mind me. Looking again, I see that this is the cherry pick deadline, with the patches to happen the week after (which should be fine).

@puerco
Copy link
Member

puerco commented Apr 22, 2021

Much clearer, thanks 😊
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 22, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 22, 2021
cpanato
cpanato approved these changes Apr 22, 2021
View reviewed changes
Copy link
Member

@cpanato cpanato left a comment •
edited
Loading

Choose a reason for hiding this comment

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

thanks for the update and make sense to me

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 22, 2021
saschagrunert
saschagrunert approved these changes Apr 22, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

Let's wrap-up those changes in a mail, too.

@xmudrii
Copy link
Member

xmudrii commented Apr 22, 2021

Should we also update schedule.yaml or should we do it in a follow-up?

xmudrii
xmudrii approved these changes Apr 22, 2021
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

Other than the comment I left, this looks great to me. Thank you for taking care of this!

/lgtm

releases/patch-releases.md
Comment on lines +56 to +61
During the two-month maintenance mode period, Release Managers may cut
additional maintenance releases to resolve:

- CVEs (under the advisement of the Product Security Committee)
- dependency issues (including base image updates)
- critical core component issues
Copy link
Member

Choose a reason for hiding this comment

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

Are we going to allow other changes in the maintenance mode period?

I guess that one option is that we might allow them if we are fixing one of those three issues specified here, but otherwise, we wouldn't cut a release only because of other changes. Another option is that we don't allow other changes non-related to those at all.

Should we make that clear in the document?

hasheddan
hasheddan approved these changes Apr 22, 2021
View reviewed changes
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, hasheddan, justaugustus, saschagrunert, xmudrii

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:

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

@justaugustus
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2021
@k8s-ci-robot k8s-ci-robot merged commit 704ca3a into kubernetes:master Apr 22, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Apr 22, 2021
@justaugustus
Copy link
Member Author

Note to the community to pre-announce May's patch releases and extending EOLs with a maintenance mode: https://groups.google.com/g/kubernetes-announce/c/Vixft2lPyaA

This was referenced Apr 25, 2021
Closed
Merged
@github-actions github-actions bot mentioned this pull request Apr 27, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hasheddan hasheddan hasheddan approved these changes

@xmudrii xmudrii xmudrii approved these changes

@cpanato cpanato cpanato approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@puerco puerco Awaiting requested review from puerco

Assignees

@saschagrunert saschagrunert

@puerco puerco

@cpanato cpanato

@xmudrii xmudrii

@hasheddan hasheddan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/release-team Issues or PRs related to the release-team subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/documentation Categorizes issue or PR as related to documentation. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority sig/release Categorizes an issue or PR as relevant to SIG Release. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.
7 participants
@justaugustus @puerco @xmudrii @k8s-ci-robot @saschagrunert @cpanato @hasheddan