Skip to content

Commit 39796d1

Browse files
committed
releases: Canonicalize patch release information on k/website
Signed-off-by: Stephen Augustus <[email protected]>
1 parent 8bdc23c commit 39796d1

File tree

2 files changed

+10
-42
lines changed

2 files changed

+10
-42
lines changed

content/en/releases/patch-releases.md

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
---
22
title: Patch Releases
33
type: docs
4-
auto_generated: true
54
---
6-
<!-- THIS CONTENT IS AUTO-GENERATED via ./scripts/update-release-info.sh in k/website -->
7-
8-
{{< warning >}}
9-
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).
10-
{{< /warning >}}
11-
12-
# Kubernetes Patch Releases
135

146
Schedule and team contact information for Kubernetes patch releases.
157

@@ -30,24 +22,24 @@ See the [Release Managers page][release-managers] for full contact details on th
3022

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

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

39-
## Cherry-Picks
31+
## Cherry picks
4032

41-
Please follow the [cherry-pick process].
33+
Please follow the [cherry pick process][cherry-picks].
4234

43-
Cherry-picks must be merge-ready in GitHub with proper labels (eg:
44-
approved, lgtm, release note) and passing CI tests ahead of the
45-
cherry-pick deadline. This is typically two days before the target
35+
Cherry picks must be merge-ready in GitHub with proper labels (e.g.,
36+
`approved`, `lgtm`, `release-note`) and passing CI tests ahead of the
37+
cherry pick deadline. This is typically two days before the target
4638
release, but may be more. Earlier PR readiness is better, as we
47-
need time to get CI signal after merging your cherry-picks ahead
39+
need time to get CI signal after merging your cherry picks ahead
4840
of the actual release.
4941

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

5345
## Support Period
@@ -189,7 +181,7 @@ These releases are no longer supported.
189181
| 1.3 | 1.3.10 | 2016-11-01 |
190182
| 1.2 | 1.2.7 | 2016-10-23 |
191183

192-
[cherry-pick process]: https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md
184+
[cherry-picks]: https://git.k8s.io/community/contributors/devel/sig-release/cherry-picks.md
193185
[release-managers]: /release-managers.md
194-
[release process description]: https://git.k8s.io/community/contributors/devel/sig-release/release.md
186+
[release process description]: /release.md
195187
[yearly-support]: https://git.k8s.io/enhancements/keps/sig-release/1498-kubernetes-yearly-support-period/README.md

scripts/releng/update-release-info.sh

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
#!/usr/bin/env bash
22

3-
# patch-releases.md
4-
####################################
5-
cat << EOF > content/en/releases/patch-releases.md
6-
---
7-
title: Patch Releases
8-
type: docs
9-
auto_generated: true
10-
---
11-
<!-- THIS CONTENT IS AUTO-GENERATED via ./scripts/update-release-info.sh in k/website -->
12-
13-
{{< warning >}}
14-
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).
15-
{{< /warning >}}
16-
17-
EOF
18-
19-
curl --retry 3 https://raw.githubusercontent.com/kubernetes/sig-release/master/releases/patch-releases.md >> content/en/releases/patch-releases.md
20-
21-
223
# release.md
234
####################################
245
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
3617
EOF
3718

3819
curl --retry 3 https://raw.githubusercontent.com/kubernetes/community/master/contributors/devel/sig-release/release.md >> content/en/releases/release.md
39-
40-
41-
# schedule.yaml
42-
####################################
43-
curl --retry 3 https://raw.githubusercontent.com/kubernetes/sig-release/master/releases/schedule.yaml > data/releases/schedule.yaml

0 commit comments

Comments
 (0)