diff --git a/content/en/releases/patch-releases.md b/content/en/releases/patch-releases.md index 4c4770377a..2a83cc5031 100644 --- a/content/en/releases/patch-releases.md +++ b/content/en/releases/patch-releases.md @@ -1,15 +1,7 @@ --- title: Patch Releases type: docs -auto_generated: true --- - - -{{< 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. @@ -30,24 +22,24 @@ See the [Release Managers page][release-managers] for full contact details on th 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 +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:release-managers-private@kubernetes.io) if there are questions on the PR. -## Cherry-Picks +## Cherry picks -Please follow the [cherry-pick process]. +Please follow the [cherry pick process][cherry-picks]. -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 +Cherry picks must be merge-ready in GitHub with proper labels (e.g., +`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 +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 +Cherry pick PRs which miss merge criteria will be carried over and tracked for the next patch release. ## Support Period @@ -189,7 +181,7 @@ These releases are no longer supported. | 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 +[cherry-picks]: https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md [release-managers]: /release-managers.md -[release process description]: https://git.k8s.io/community/contributors/devel/sig-release/release.md +[release process description]: /release.md [yearly-support]: https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md diff --git a/scripts/releng/update-release-info.sh b/scripts/releng/update-release-info.sh index 96846a3cf4..ba403c2b5a 100755 --- a/scripts/releng/update-release-info.sh +++ b/scripts/releng/update-release-info.sh @@ -1,24 +1,5 @@ #!/usr/bin/env bash -# patch-releases.md -#################################### -cat << EOF > content/en/releases/patch-releases.md ---- -title: Patch Releases -type: docs -auto_generated: true ---- - - -{{< 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 >}} - -EOF - -curl --retry 3 https://raw.githubusercontent.com/kubernetes/sig-release/master/releases/patch-releases.md >> content/en/releases/patch-releases.md - - # release.md #################################### cat << EOF > content/en/releases/release.md @@ -36,8 +17,3 @@ This content is auto-generated and links may not function. The source of the doc EOF curl --retry 3 https://raw.githubusercontent.com/kubernetes/community/master/contributors/devel/sig-release/release.md >> content/en/releases/release.md - - -# schedule.yaml -#################################### -curl --retry 3 https://raw.githubusercontent.com/kubernetes/sig-release/master/releases/schedule.yaml > data/releases/schedule.yaml