You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
- Be aware the cherry-pick script assumes you have a git remote called
79
83
`upstream` that points at the Kubernetes github org.
80
84
81
-
Please see our [recommended Git workflow](https://git.k8s.io/community/contributors/guide/github-workflow.md#workflow).
85
+
Please see our [recommended Git workflow](/contributors/guide/github-workflow.md#workflow).
82
86
83
87
- You will need to run the cherry-pick script separately for each patch
84
88
release you want to cherry-pick to.
85
89
86
90
- Your cherry-pick PR will immediately get the
87
91
`do-not-merge/cherry-pick-not-approved` label.
88
92
89
-
[Normal rules apply for code merge](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/release.md#tldr),
93
+
[Normal rules apply for code merge](/contributors/devel/sig-release/release.md#tldr),
90
94
with some additional caveats outlined in the next section of this document.
91
95
92
96
## Cherry-pick Review
@@ -99,7 +103,7 @@ except the release note stanza will auto-populate from the master
99
103
branch pull request from which the cherry-pick originated. If this
100
104
is unsuccessful the `do-not-merge/release-note-label-needed` label
101
105
will be applied and the cherry-pick author must edit the pull request
102
-
description to [add a release note](https://git.k8s.io/community/contributors/guide/release-notes.md)
106
+
description to [add a release note](/contributors/guide/release-notes.md)
103
107
or include in a comment the `/release-note-none` command.
104
108
105
109
Cherry-pick pull requests are reviewed slightly differently than normal
@@ -114,15 +118,12 @@ pull requests on the master branch in that they:
114
118
- Have one additional level of review in that they must be approved
115
119
specifically for cherry-pick by branch approvers.
116
120
117
-
The [Branch Manager](https://git.k8s.io/sig-release/release-team/role-handbooks/branch-manager)
118
-
will triage PRs targeted to the next .0 minor release branch up until the
119
-
release, while the [Patch Release Team](https://git.k8s.io/sig-release/release-team/role-handbooks/patch-release-manager)
120
-
will handle all cherry-picks to patch releases.
121
+
The [Release Managers][release-managers] are the final approvers on release
122
+
branches.
121
123
122
-
The [Branch Manager](https://git.k8s.io/sig-release/release-team/role-handbooks/branch-manager)
123
-
or the [Patch Release Team](https://git.k8s.io/sig-release/release-team/role-handbooks/patch-release-manager)
124
-
are the final authority on branch approval by removing the
125
-
`do-not-merge/cherry-pick-not-approved` label and triggering a merge into the
124
+
Approval is signified by a Release Manager manually applying the
125
+
`cherry-pick-approved` label. This action removes the
126
+
`do-not-merge/cherry-pick-not-approved` label and triggers a merge into the
126
127
target branch.
127
128
128
129
The team scrubs through incoming cherry-picks on at least a weekly basis,
@@ -150,9 +151,10 @@ pull requests on the master branch in that they:
150
151
151
152
## Searching for Cherry-picks
152
153
153
-
-[A sample search on kubernetes/kubernetes pull requests that are labeled as `cherry-pick-approved`](https://github.com/kubernetes/kubernetes/pulls?q=is%3Aopen+is%3Apr+label%3Acherry-pick-approved)
154
+
Examples (based on cherry picks targeting the `release-1.18` branch):
154
155
155
-
-[A sample search on kubernetes/kubernetes pull requests that are labeled as `do-not-merge/cherry-pick-not-approved`](https://github.com/kubernetes/kubernetes/pulls?q=is%3Aopen+is%3Apr+label%3Ado-not-merge%2Fcherry-pick-not-approved)
Copy file name to clipboardExpand all lines: contributors/devel/sig-release/release.md
+21-23Lines changed: 21 additions & 23 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -66,14 +66,13 @@ Return to 'Normal Dev' phase requirements:
66
66
- /lgtm
67
67
- /approved
68
68
69
-
Merges into the 1.y branch are now [via cherrypicks](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md),
69
+
Merges into the 1.y branch are now [via cherry picks](/contributors/devel/sig-release/cherry-picks.md),
70
70
approved by release branch manager.
71
71
72
72
In the past there was a requirement for a milestone targeted pull request to
73
73
have an associated GitHub issue opened, but this is no longer the case.
74
-
Features are effectively GitHub issues or [KEPs](https://git.k8s.io/community/keps)
75
-
which lead to subsequent PRs. The general labeling process should be consistent
76
-
across artifact types.
74
+
Features are effectively GitHub issues or [KEPs][keps] which lead to subsequent
75
+
PRs. The general labeling process should be consistent across artifact types.
77
76
78
77
---
79
78
@@ -101,9 +100,9 @@ across artifact types.
101
100
The process of removing an Enhancement from a release milestone if it is not
102
101
fully implemented or is otherwise considered not stable.
0 commit comments