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

Adding a release page under "Release Information" #27929

Merged
merged 1 commit into from
May 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,20 @@ aliases:
- mrbobbytables
- nikhita
- parispittman
# authoritative source: git.k8s.io/release/OWNERS_ALIASES
release-engineering-approvers:
- cpanato # Release Manager
Copy link
Contributor

@kbhawkey kbhawkey May 11, 2021

Choose a reason for hiding this comment

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

@jimangel . I am reading through the changes.
My first reaction is that this is a largish list of approvers/reviewers to add to the docs repository.
Why is this needed/for what purpose?

Copy link
Member Author

Choose a reason for hiding this comment

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

I appreciate the concern! Adding them to the OWNERS_ALIASES doesn't give them the level of authority the name implies. We could change that, but I copied it as is from git.k8s.io/release/OWNERS_ALIASES. The groups are used to reference approvers & reviewers in their respective release sub folders (via sub OWNERS file).

The release data that is being used by SIG Docs is owned by SIG Release. We'd like to have them store date in our repo for generation purposes. In order to do that efficiently, it made sense to grant SIG Release folks access to their respective sub directories.

We could also demo this MVP with a smaller list to start if you'd be more comfortable! Let me know if that helps. It's also possible I messed up my understandings of OWNERS files 😅

- hasheddan # subproject owner / Release Manager
- puerco # Release Manager
- saschagrunert # subproject owner / Release Manager
- justaugustus # subproject owner / Release Manager
- xmudrii # Release Manager
release-engineering-reviewers:
- ameukam # Release Manager Associate
- jimangel # Release Manager Associate
- markyjackson-taulia # Release Manager Associate
- mkorbi # Release Manager Associate
- onlydole # Release Manager Associate
- sethmccombs # Release Manager Associate
- verolop # Release Manager Associate
- wilsonehusin # Release Manager Associate
3 changes: 2 additions & 1 deletion content/en/community/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<a href="#videos">Videos</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#discuss">Discussions</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#events">Events and meetups</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#news">News</a>
<a href="#news">News</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="/releases">Releases</a>

</div>
<br class="mobile"><br class="mobile">
Expand Down
4 changes: 0 additions & 4 deletions content/en/docs/setup/release/_index.md

This file was deleted.

1,626 changes: 0 additions & 1,626 deletions content/en/docs/setup/release/notes.md

This file was deleted.

15 changes: 15 additions & 0 deletions content/en/releases/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# See the OWNERS docs at https://go.k8s.io/owners

# This is the directory for English source content.
# Teams and members are visible at https://github.com/orgs/kubernetes/teams.

reviewers:
- sig-docs-en-reviews
- release-engineering-reviewers

approvers:
- sig-docs-en-owners
- release-engineering-approvers

labels:
- sig/release
27 changes: 27 additions & 0 deletions content/en/releases/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
linktitle: Release History
title: Releases
type: docs
---


<!-- overview -->

The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}). Kubernetes 1.19 and newer receive approximately 1 year of patch support. Kubernetes 1.18 and older received approximately 9 months of patch support.
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there another doc that lists or describes the Kubernetes patch support rules?

Copy link
Member Author

Choose a reason for hiding this comment

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

I stole that overview from "https://kubernetes.io/docs/setup/release/version-skew-policy/" because I thought it was helpful (although recognized duplication). The version skew policy page has been relocated to this new menu and I've added redirects from the old location.

I'm open to any alternative suggestions for the main overview!

Copy link
Contributor

Choose a reason for hiding this comment

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

At this point I think we can drop the bit about k8s 1.18 and older:

Suggested change
The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}). Kubernetes 1.19 and newer receive approximately 1 year of patch support. Kubernetes 1.18 and older received approximately 9 months of patch support.
The Kubernetes project maintains release branches for the most recent three minor releases ({{< skew latestVersion >}}, {{< skew prevMinorVersion >}}, {{< skew oldestMinorVersion >}}). Kubernetes 1.19 and newer receive approximately 1 year of patch support.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think it hurts to leave it in for a little longer. I could be sold either way. 🤷

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree. I would leave it in a little longer.


Kubernetes versions are expressed as **x.y.z**,
where **x** is the major version, **y** is the minor version, and **z** is the patch version, following [Semantic Versioning](https://semver.org/) terminology.

More information in the [version skew policy](/releases/version-skew-policy/) document.

<!-- body -->

## Release History

{{< release-data >}}

## Upcoming Release

Check out the [schedule](https://github.com/kubernetes/sig-release/tree/master/releases/release-{{< skew nextMinorVersion >}}) for the upcoming **{{< skew nextMinorVersion >}}** Kubernetes release!

## Helpful Resources
26 changes: 26 additions & 0 deletions content/en/releases/download.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
title: Download Kubernetes
type: docs
---
## Core Kubernetes components

Find links to download Kubernetes components (and their checksums) in the [CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) files.

Alternately, use [downloadkubernetes.com](https://www.downloadkubernetes.com/) to filter by version and architecture.

## kubectl

<!-- overview -->
The Kubernetes command-line tool, [kubectl](/docs/reference/kubectl/kubectl/), allows
you to run commands against Kubernetes clusters.

You can use kubectl to deploy applications, inspect and manage cluster resources,
and view logs. For more information including a complete list of kubectl operations, see the
[`kubectl` reference documentation](/docs/reference/kubectl/).

kubectl is installable on a variety of Linux platforms, macOS and Windows.
Find your preferred operating system below.

- [Install kubectl on Linux](/docs/tasks/tools/install-kubectl-linux)
- [Install kubectl on macOS](/docs/tasks/tools/install-kubectl-macos)
- [Install kubectl on Windows](/docs/tasks/tools/install-kubectl-windows)
13 changes: 13 additions & 0 deletions content/en/releases/notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
linktitle: Release Notes
title: Notes
type: docs
description: >
Kubernetes release notes.
jimangel marked this conversation as resolved.
Show resolved Hide resolved
sitemap:
priority: 0.5
---

Release notes can be found by reading the [Changelog](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG) that matches your Kubernetes version. View the changelog for {{< skew latestVersion >}} on [GitHub](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-{{< skew latestVersion >}}.md).

Alternately, release notes can be searched and filtered online at: [relnotes.k8s.io](relnotes.k8s.io). View filtered release notes for {{< skew latestVersion >}} on [relnotes.k8s.io](https://relnotes.k8s.io/?releaseVersions={{< skew latestVersion >}}.0).
195 changes: 195 additions & 0 deletions content/en/releases/patch-releases.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
---
title: Patch Releases
type: docs
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the type?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is somewhat of a "hack" to have Hugo look at /layouts/docs/ for it's templates. It allows me to use the same "Docs" 3-bar theme for a handful of release docs. It also reduces the need for me to create custom CSS.

auto_generated: true
---
<!-- THIS CONTENT IS AUTO-GENERATED via ./scripts/update-release-info.sh in k/website -->

{{< warning >}}
This content is auto-generated and links may not function. The source of the document is located [here](https://github.com/kubernetes/sig-release/blob/master/releases/patch-releases.md).
{{< /warning >}}

# Kubernetes Patch Releases

Schedule and team contact information for Kubernetes patch releases.

For general information about Kubernetes release cycle, see the
[release process description].

## Cadence

Our typical patch release cadence is monthly. It is
commonly a bit faster (1 to 2 weeks) for the earliest patch releases
after a 1.X minor release. Critical bug fixes may cause a more
immediate release outside of the normal cadence. We also aim to not make
releases during major holiday periods.

## Contact

See the [Release Managers page][release-managers] for full contact details on the Patch Release Team.

Please give us a business day to respond - we may be in a different timezone!

In between releases the team is looking at incoming cherry-pick
requests on a weekly basis. The team will get in touch with
submitters via GitHub PR, SIG channels in Slack, and direct messages
in Slack and [email](mailto:[email protected])
if there are questions on the PR.

## Cherry-Picks

Please follow the [cherry-pick process].

Cherry-picks must be merge-ready in GitHub with proper labels (eg:
approved, lgtm, release note) and passing CI tests ahead of the
cherry-pick deadline. This is typically two days before the target
release, but may be more. Earlier PR readiness is better, as we
need time to get CI signal after merging your cherry-picks ahead
of the actual release.

Cherry-pick PRs which miss merge criteria will be carried over and tracked
for the next patch release.

## Support Period

In accordance with the [yearly support KEP][yearly-support], the Kubernetes
Community will support active patch release series for a period of roughly
fourteen (14) months.

The first twelve months of this timeframe will be considered the standard
period.

Towards the end of the twelve month, the following will happen:

- [Release Managers][release-managers] will cut a release
- The patch release series will enter maintenance mode

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

At the end of the two-month maintenance mode period, the patch release series
will be considered EOL (end of life) and cherry picks to the associated branch
are to be closed soon afterwards.

Note that the 28th of the month was chosen for maintenance mode and EOL target
dates for simplicity (every month has it).

## Upcoming Monthly Releases

Timelines may vary with the severity of bug fixes, but for easier planning we
will target the following monthly release points. Unplanned, critical
releases may also occur in between these.

| Monthly Patch Release | Target date |
| --- | --- |
| May 2021 | 2021-05-12 |
| June 2021 | 2021-06-16 |
| July 2021 | 2021-07-14 |

## Detailed Release History for Active Branches

### 1.21

**1.21** enters maintenance mode on **2022-04-28**

End of Life for **1.21** is **2022-06-28**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
|--- |--- |--- |
| 1.21.1 | 2021-05-07 | 2021-05-12 |

### 1.20

**1.20** enters maintenance mode on **2021-12-28**

End of Life for **1.20** is **2022-02-28**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
|--- |--- |--- |
| 1.20.7 | 2021-05-07 | 2021-05-12 |
| 1.20.6 | 2021-04-09 | 2021-04-14 |
| 1.20.5 | 2021-03-12 | 2021-03-17 |
| 1.20.4 | 2021-02-12 | 2021-02-18 |
| 1.20.3 | [Conformance Tests Issue](https://groups.google.com/g/kubernetes-dev/c/oUpY9vWgzJo) | 2021-02-17 |
| 1.20.2 | 2021-01-08 | 2021-01-13 |
| 1.20.1 | [Tagging Issue](https://groups.google.com/g/kubernetes-dev/c/dNH2yknlCBA) | 2020-12-18 |

### 1.19

**1.19** enters maintenance mode on **2021-08-28**

End of Life for **1.19** is **2021-10-28**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
|--- |--- |--- |
| 1.19.11 | 2021-05-07 | 2021-05-12 |
| 1.19.10 | 2021-04-09 | 2021-04-14 |
| 1.19.9 | 2021-03-12 | 2021-03-17 |
| 1.19.8 | 2021-02-12 | 2021-02-17 |
| 1.19.7 | 2021-01-08 | 2021-01-13 |
| 1.19.6 | [Tagging Issue](https://groups.google.com/g/kubernetes-dev/c/dNH2yknlCBA) | 2020-12-18 |
| 1.19.5 | 2020-12-04 | 2020-12-09 |
| 1.19.4 | 2020-11-06 | 2020-11-11 |
| 1.19.3 | 2020-10-09 | 2020-10-14 |
| 1.19.2 | 2020-09-11 | 2020-09-16 |
| 1.19.1 | 2020-09-04 | 2020-09-09 |

### 1.18

**1.18** enters maintenance mode on **2021-04-28**

End of Life for **1.18** is **2021-05-12**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
|--- |--- |--- |
| 1.18.19 | 2021-05-07 | 2021-05-12 |
| 1.18.18 | 2021-04-09 | 2021-04-14 |
| 1.18.17 | 2021-03-12 | 2021-03-17 |
| 1.18.16 | 2021-02-12 | 2021-02-17 |
| 1.18.15 | 2021-01-08 | 2021-01-13 |
| 1.18.14 | [Tagging Issue](https://groups.google.com/g/kubernetes-dev/c/dNH2yknlCBA) | 2020-12-18 |
| 1.18.13 | 2020-12-04 | 2020-12-09 |
| 1.18.12 | N/A | 2020-11-12 |
| 1.18.11 | [No-op release](https://groups.google.com/g/kubernetes-dev/c/nJix1xLQvZE) | 2020-11-11 |
| 1.18.10 | 2020-10-09 | 2020-10-14 |
| 1.18.9 | 2020-09-11 | 2020-09-16 |
| 1.18.8 | N/A | 2020-08-13 |
| 1.18.7 | 2020-08-07 | 2020-08-12 |
| 1.18.6 | 2020-07-10 | 2020-07-15 |
| 1.18.5 | 2020-06-25 | 2020-06-26 |
| 1.18.4 | 2020-06-12 | 2020-06-17 |
| 1.18.3 | 2020-05-15 | 2020-05-20 |
| 1.18.2 | 2020-04-13 | 2020-04-16 |
| 1.18.1 | 2020-04-06 | 2020-04-08 |

## Non-Active Branch History

These releases are no longer supported.

| Minor Version | Final Patch Release | EOL date |
| --- | --- | --- |
| 1.17 | 1.17.17 | 2021-01-13 |
| 1.16 | 1.16.15 | 2020-09-02 |
| 1.15 | 1.15.12 | 2020-05-06 |
| 1.14 | 1.14.10 | 2019-12-11 |
| 1.13 | 1.13.12 | 2019-10-15 |
| 1.12 | 1.12.10 | 2019-07-08 |
| 1.11 | 1.11.10 | 2019-05-01 |
| 1.10 | 1.10.13 | 2019-02-13 |
| 1.9 | 1.9.11 | 2018-09-29 |
| 1.8 | 1.8.15 | 2018-07-12 |
| 1.7 | 1.7.16 | 2018-04-04 |
| 1.6 | 1.6.13 | 2017-11-23 |
| 1.5 | 1.5.8 | 2017-10-01 |
| 1.4 | 1.4.12 | 2017-04-21 |
| 1.3 | 1.3.10 | 2016-11-01 |
| 1.2 | 1.2.7 | 2016-10-23 |

[cherry-pick process]: https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md
[release-managers]: /release-managers.md
jimangel marked this conversation as resolved.
Show resolved Hide resolved
[release process description]: https://git.k8s.io/community/contributors/devel/sig-release/release.md
[yearly-support]: https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md
Loading