Skip to content

Commit 0d5be61

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #1371 from thockin/master
Automatic merge from submit-queue. Add staging godeps to godep instructions This was missed in the last rewrite.
2 parents 59c0c21 + 990d9cb commit 0d5be61

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

Diff for: contributors/devel/godep.md

+13-2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,19 @@ calculate which deps are needed, and rebuild the database. It will also
145145
regenerate other metadata files which the project needs, such as BUILD files and
146146
the LICENSE database.
147147

148+
## Saving deps in staging repos
149+
150+
Kubernetes stores some code in a directory called `staging` which is handled
151+
specially, and is not covered by the above. If you modified any code under
152+
staging, or if you changed a dependency of code under staging (even
153+
transitively), you'll also need to update deps there:
154+
155+
```sh
156+
./hack/update-staging-godeps.sh
157+
```
158+
159+
## Sanity checking
160+
148161
After all of this is done, `git status` should show you what files have been
149162
modified and added/removed. Make sure to sanity-check them with `git diff`, and
150163
to `git add` and `git rm` them, as needed. It is commonly advised to make one
@@ -153,8 +166,6 @@ another `git commit` that includes changes to Kubernetes code to use (or stop
153166
using) the new/updated/removed dependency. These commits can go into a single
154167
pull request.
155168

156-
## Sanity checking
157-
158169
Before sending your PR, it's a good idea to sanity check that your
159170
Godeps.json file and the contents of `vendor/ `are ok:
160171

0 commit comments

Comments
 (0)