summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hockin <thockin@google.com>2017-11-07 14:21:43 -0800
committerTim Hockin <thockin@google.com>2017-11-08 21:30:37 -0800
commit990d9cb47a64257e508dc1ebf7afe02be53991d3 (patch)
treef49dd6cfc2bd6851a3d5c08cef649932f7336437
parentaf9b559d053386337a10041eb492888f6048f86d (diff)
Add staging godeps to godep instructions
-rw-r--r--contributors/devel/godep.md15
1 files changed, 13 insertions, 2 deletions
diff --git a/contributors/devel/godep.md b/contributors/devel/godep.md
index cc741f66..4b645012 100644
--- a/contributors/devel/godep.md
+++ b/contributors/devel/godep.md
@@ -145,6 +145,19 @@ calculate which deps are needed, and rebuild the database. It will also
regenerate other metadata files which the project needs, such as BUILD files and
the LICENSE database.
+## Saving deps in staging repos
+
+Kubernetes stores some code in a directory called `staging` which is handled
+specially, and is not covered by the above. If you modified any code under
+staging, or if you changed a dependency of code under staging (even
+transitively), you'll also need to update deps there:
+
+```sh
+./hack/update-staging-godeps.sh
+```
+
+## Sanity checking
+
After all of this is done, `git status` should show you what files have been
modified and added/removed. Make sure to sanity-check them with `git diff`, and
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
using) the new/updated/removed dependency. These commits can go into a single
pull request.
-## Sanity checking
-
Before sending your PR, it's a good idea to sanity check that your
Godeps.json file and the contents of `vendor/ `are ok: