-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix Update Kubernetes Procedure + Docs #2136
Conversation
Update k8s instructions
Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA. It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Can one of the admins verify this patch? |
@@ -44,7 +44,7 @@ Make sure to also fetch tags, as Godep relies on these. | |||
|
|||
```shell | |||
git checkout $DESIREDTAG | |||
./hack/godeps/godep-restore.sh | |||
./hack/godep-restore.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like ./hack/godeps/godep-restore.sh
is actually the right path? ./hack/godep-restore.sh
is the path in kubernetes/kubernetes
We have a script at ./hack/godeps/godep-update-k8s.sh
that this doc should probably point to instead.
The right usage for that is KUBE_VERSION=v1.8.1 ./hack/godeps/godep-update-k8s.sh
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My reading of those instructions is that they refer to restoring Kubernetes' dependencies (hack/godep-restore.sh
) and not Minikube's. Is that incorrect?
@@ -33,6 +33,7 @@ if [ ! -d "${KUBE_ROOT}" ]; then | |||
fi | |||
|
|||
godep::restore_kubernetes | |||
godep::remove_staging_from_json |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, a "restore" shouldn't make your repo dirty.
However, I understand this will break if you have some of the staging libraries cloned from their bot-pushed downstream repos. We have to do this since localkube vendors kubernetes code which references the staging/ libraries directly, rather than the split out repos - and the downstream repos are not synced regularly enough. The contributing doc should note this.
If you remove the staging entries from the godep json, you won't get the right versions of the staging libraries.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So as-is this script will not work with a clean checkout and new GOPATH
following the instructions. What is the suggested approach?
Given #2134 I am going to close this issue - I believe the existing documentation is incomplete/broken but there's no point in fixing it if localkube is being deprecated. |
Codecov Report
@@ Coverage Diff @@
## master #2136 +/- ##
==========================================
+ Coverage 28.76% 28.78% +0.01%
==========================================
Files 81 81
Lines 5322 5322
==========================================
+ Hits 1531 1532 +1
+ Misses 3598 3597 -1
Partials 193 193
Continue to review full report at Codecov.
|
Problem
The contributor guide instructions for updating k8s do not work out of the box. Step 2 is broken:
This step cannot work because the commits referenced in
Godeps.json
do not actually exist in upstream repositories. They are generated on the local disk of the maintainer by the utility script.If you try to run Minikube's
godep-restore.sh
you will get similar errors:Solution
Godeps.json
duringgodep-restore.sh
godep-restore.sh
script.