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
Copy file name to clipboardExpand all lines: content/en/docs/contribute/review/for-approvers.md
+71-35Lines changed: 71 additions & 35 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -12,11 +12,12 @@ SIG Docs [Reviewers](/docs/contribute/participate/#reviewers) and
12
12
[Approvers](/docs/contribute/participate/#approvers) do a few extra things
13
13
when reviewing a change.
14
14
15
-
Every week a specific docs approver volunteers to triage
16
-
and review pull requests. This
17
-
person is the "PR Wrangler" for the week. See the
18
-
[PR Wrangler scheduler](https://github.com/kubernetes/website/wiki/PR-Wranglers) for more information. To become a PR Wrangler, attend the weekly SIG Docs meeting and volunteer. Even if you are not on the schedule for the current week, you can still review pull
19
-
requests (PRs) that are not already under active review.
15
+
Every week a specific docs approver volunteers to triage and review pull requests.
16
+
This person is the "PR Wrangler" for the week. See the
Everything described in [Reviewing a pull request](/docs/contribute/review/reviewing-prs) applies, but Reviewers and Approvers should also do the following:
32
+
Everything described in [Reviewing a pull request](/docs/contribute/review/reviewing-prs)
33
+
applies, but Reviewers and Approvers should also do the following:
31
34
32
-
- Using the `/assign` Prow command to assign a specific reviewer to a PR as needed. This is extra important
33
-
when it comes to requesting technical review from code contributors.
35
+
- Using the `/assign` Prow command to assign a specific reviewer to a PR as needed.
36
+
This is extra important when it comes to requesting technical review from code contributors.
34
37
35
38
{{< note >}}
36
39
Look at the `reviewers` field in the front-matter at the top of a Markdown file to see who can
37
40
provide technical review.
38
41
{{< /note >}}
39
42
40
-
- Making sure the PR follows the [Content](/docs/contribute/style/content-guide/) and [Style](/docs/contribute/style/style-guide/) guides; link the author to the relevant part of the guide(s) if it doesn't.
43
+
- Making sure the PR follows the [Content](/docs/contribute/style/content-guide/)
44
+
and [Style](/docs/contribute/style/style-guide/) guides; link the author to the
45
+
relevant part of the guide(s) if it doesn't.
41
46
- Using the GitHub **Request Changes** option when applicable to suggest changes to the PR author.
42
-
- Changing your review status in GitHub using the `/approve` or `/lgtm` Prow commands, if your suggestions are implemented.
47
+
- Changing your review status in GitHub using the `/approve` or `/lgtm` Prow commands,
48
+
if your suggestions are implemented.
43
49
44
50
## Commit into another person's PR
45
51
@@ -72,7 +78,9 @@ true:
72
78
[Prow](https://github.com/kubernetes/test-infra/blob/master/prow/README.md) is
73
79
the Kubernetes-based CI/CD system that runs jobs against pull requests (PRs). Prow
74
80
enables chatbot-style commands to handle GitHub actions across the Kubernetes
75
-
organization, like [adding and removing labels](#adding-and-removing-issue-labels), closing issues, and assigning an approver. Enter Prow commands as GitHub comments using the `/<command-name>` format.
81
+
organization, like [adding and removing labels](#adding-and-removing-issue-labels),
82
+
closing issues, and assigning an approver. Enter Prow commands as GitHub comments
83
+
using the `/<command-name>` format.
76
84
77
85
The most common prow commands reviewers and approvers use are:
78
86
@@ -92,26 +100,28 @@ To view the commands that you can use in a PR, see the
92
100
93
101
## Triage and categorize issues
94
102
95
-
96
-
In general, SIG Docs follows the [Kubernetes issue triage](https://github.com/kubernetes/community/blob/master/contributors/guide/issue-triage.md) process and uses the same labels.
This GitHub Issue [filter](https://github.com/kubernetes/website/issues?q=is%3Aissue+is%3Aopen+-label%3Apriority%2Fbacklog+-label%3Apriority%2Fimportant-longterm+-label%3Apriority%2Fimportant-soon+-label%3Atriage%2Fneeds-information+-label%3Atriage%2Fsupport+sort%3Acreated-asc)
100
108
finds issues that might need triage.
101
109
102
110
### Triaging an issue
103
111
104
112
1. Validate the issue
105
-
- Make sure the issue is about website documentation. Some issues can be closed quickly by
106
-
answering a question or pointing the reporter to a resource. See the
107
-
[Support requests or code bug reports](#support-requests-or-code-bug-reports) section for details.
108
-
- Assess whether the issue has merit.
109
-
- Add the `triage/needs-information` label if the issue doesn't have enough
110
-
detail to be actionable or the template is not filled out adequately.
111
-
- Close the issue if it has both the `lifecycle/stale` and `triage/needs-information` labels.
113
+
114
+
- Make sure the issue is about website documentation. Some issues can be closed quickly by
115
+
answering a question or pointing the reporter to a resource. See the
116
+
[Support requests or code bug reports](#support-requests-or-code-bug-reports) section for details.
117
+
- Assess whether the issue has merit.
118
+
- Add the `triage/needs-information` label if the issue doesn't have enough
119
+
detail to be actionable or the template is not filled out adequately.
120
+
- Close the issue if it has both the `lifecycle/stale` and `triage/needs-information` labels.
112
121
113
122
2. Add a priority label (the
114
-
[Issue Triage Guidelines](https://github.com/kubernetes/community/blob/master/contributors/guide/issue-triage.md#define-priority) define priority labels in detail)
@@ -146,7 +156,8 @@ To remove a label, leave a comment in one of the following formats:
146
156
In both cases, the label must already exist. If you try to add a label that does not exist, the command is
147
157
silently ignored.
148
158
149
-
For a list of all labels, see the [website repository's Labels section](https://github.com/kubernetes/website/labels). Not all labels are used by SIG Docs.
159
+
For a list of all labels, see the [website repository's Labels section](https://github.com/kubernetes/website/labels).
160
+
Not all labels are used by SIG Docs.
150
161
151
162
### Issue lifecycle labels
152
163
@@ -177,7 +188,9 @@ and avoids duplicate work on the same problem.
177
188
178
189
### Dead link issues
179
190
180
-
If the dead link issue is in the API or `kubectl` documentation, assign them `/priority critical-urgent` until the problem is fully understood. Assign all other dead link issues `/priority important-longterm`, as they must be manually fixed.
191
+
If the dead link issue is in the API or `kubectl` documentation, assign them
192
+
`/priority critical-urgent` until the problem is fully understood. Assign all
193
+
other dead link issues `/priority important-longterm`, as they must be manually fixed.
181
194
182
195
### Blog issues
183
196
@@ -224,24 +237,47 @@ If this is a documentation issue, please re-open this issue.
224
237
225
238
### Squashing
226
239
227
-
As an approver, when you review pull requests (PRs), there are various cases where you might do the following:
240
+
As an approver, when you review pull requests (PRs), there are various cases
241
+
where you might do the following:
242
+
228
243
- Advise the contributor to squash their commits.
229
244
- Squash the commits for the contributor.
230
245
- Advise the contributor not to squash yet.
231
246
- Prevent squashing.
232
247
233
-
**Advising contributors to squash**: A new contributor might not know that they should squash commits in their pull requests (PRs). If this is the case, advise them to do so, provide links to useful information, and offer to arrange help if they need it. Some useful links:
234
-
-[Opening pull requests and squashing your commits](/docs/contribute/new-content/open-a-pr#squashing-commits) for documentation contributors.
248
+
**Advising contributors to squash**: A new contributor might not know that they
249
+
should squash commits in their pull requests (PRs). If this is the case, advise
250
+
them to do so, provide links to useful information, and offer to arrange help if
251
+
they need it. Some useful links:
252
+
253
+
-[Opening pull requests and squashing your commits](/docs/contribute/new-content/open-a-pr#squashing-commits)
254
+
for documentation contributors.
235
255
-[GitHub Workflow](https://www.k8s.dev/docs/guide/github-workflow/), including diagrams, for developers.
236
256
237
-
**Squashing commits for contributors**: If a contributor might have difficulty squashing commits or there is time pressure to merge a PR, you can perform the squash for them:
238
-
- The kubernetes/website repo is [configured to allow squashing for pull request merges](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests). Simply select the *Squash commits* button.
239
-
- In the PR, if the contributor enables maintainers to manage the PR, you can squash their commits and update their fork with the result. Before you squash, advise them to save and push their latest changes to the PR. After you squash, advise them to pull the squashed commit to their local clone.
240
-
- You can get GitHub to squash the commits by using a label so that Tide / GitHub performs the squash or by clicking the *Squash commits* button when you merge the PR.
257
+
**Squashing commits for contributors**: If a contributor might have difficulty
258
+
squashing commits or there is time pressure to merge a PR, you can perform the
259
+
squash for them:
260
+
261
+
- The kubernetes/website repo is
262
+
[configured to allow squashing for pull request merges](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).
263
+
Simply select the *Squash commits* button.
264
+
- In the PR, if the contributor enables maintainers to manage the PR, you can
265
+
squash their commits and update their fork with the result. Before you squash,
266
+
advise them to save and push their latest changes to the PR. After you squash,
267
+
advise them to pull the squashed commit to their local clone.
268
+
- You can get GitHub to squash the commits by using a label so that Tide / GitHub
269
+
performs the squash or by clicking the *Squash commits* button when you merge the PR.
241
270
242
271
**Advise contributors to avoid squashing**
243
-
- If one commit does something broken or unwise, and the last commit reverts this error, don't squash the commits. Even though the "Files changed" tab in the PR on GitHub and the Netlify preview will both look OK, merging this PR might create rebase or merge conflicts for other folks.
244
-
Intervene as you see fit to avoid that risk to other contributors.
272
+
273
+
- If one commit does something broken or unwise, and the last commit reverts this
274
+
error, don't squash the commits. Even though the "Files changed" tab in the PR
275
+
on GitHub and the Netlify preview will both look OK, merging this PR might create
276
+
rebase or merge conflicts for other folks. Intervene as you see fit to avoid that
277
+
risk to other contributors.
245
278
246
279
**Never squash**
247
-
- If you're launching a localization or releasing the docs for a new version, you are merging in a branch that's not from a user's fork, _never squash the commits_. Not squashing is essential because you must maintain the commit history for those files.
280
+
281
+
- If you're launching a localization or releasing the docs for a new version,
282
+
you are merging in a branch that's not from a user's fork, _never squash the commits_.
283
+
Not squashing is essential because you must maintain the commit history for those files.
0 commit comments