Skip to content
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

Simplify godep licenses logic #26348

Merged
merged 1 commit into from
May 27, 2016
Merged

Conversation

thockin
Copy link
Member

@thockin thockin commented May 26, 2016

This code used to actually reach out to the internet to look for files. This
is flaky, slow, and semantically WRONG. The license that is upstream might
actually be different than what we have vendored. Only look at local files.

This now passes back-to-back updates and verifies.

@quinton-hoole @mhrgoog @bgrant0607 - FYI
@zmerlynn @david-mcmahon - do you guys think this will satisfy legal? The older form was WAY complicated and a regular source of pain.

@thockin thockin added the release-note-none Denotes a PR that doesn't merit a release note. label May 26, 2016
@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 26, 2016
@ghost ghost added this to the v1.3 milestone May 26, 2016
@ghost ghost added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. team/cluster labels May 26, 2016
@@ -32,9 +32,9 @@ fi
# to work with docker-machine on macs
mkdir -p "${KUBE_ROOT}/_tmp"
_tmpdir="$(mktemp -d "${KUBE_ROOT}/_tmp/kube-godep-licenses.XXXXXX")"
echo "Created workspace: ${_tmpdir}"
#echo "Created workspace: ${_tmpdir}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Remove dead comments here and two lines down?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left them for the next poor debugger, but I could nix them.

@thockin thockin force-pushed the fix-godep-licenses branch from a8cca8d to 710ba0a Compare May 26, 2016 17:23
@david-mcmahon
Copy link
Contributor

@thockin We need to go get and cache the missing license data from the internet. I don't know any other way around that.

The old godep license process was several times slower than this and required hand-maintaining an exclusion list. The artifact from that was simply a list of licenses and this new version gathers actual license content dynamically across all packages and does it several times faster.

I commented in the other issue. What is the repro case here for the failure?

@k8s-bot
Copy link

k8s-bot commented May 26, 2016

GCE e2e build/test passed for commit 710ba0a7adbdcb1bbc04350e70e1bda532b7f634.

@thockin
Copy link
Member Author

thockin commented May 26, 2016

@david-mcmahon Hard to pin down. I spent hours trying to grok what was happening - back-to-back verify cycles would produce different results and then I caught it occasionally flaking in the (now removed) part. I decided it was wrong and excised it.

@ghost
Copy link

ghost commented May 26, 2016

@david-mcmahon FYI I ran it a few times on two different machines at different times, and it produced no output, or error message, ever. I didn't debug it any further than that.

@ghost
Copy link

ghost commented May 26, 2016

OK, I tested this, and it seems to do what's required. Code looks fine to me. LGTM.

@ghost ghost added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 26, 2016
@ghost
Copy link

ghost commented May 26, 2016

Fixes #26328

@alex-mohr alex-mohr added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 26, 2016
@lavalamp lavalamp assigned ghost and unassigned lavalamp May 27, 2016
@ghost
Copy link

ghost commented May 27, 2016

@thockin It seems that there are some merge conflicts on this?

@ghost
Copy link

ghost commented May 27, 2016

@thockin It would be awesome if we could get this resolved ASAP, as there is a whole train of 1.3-blocking PR's queued up behind this one.

This code used to actually reach out to the internet to look for files.  This
is flaky, slow, and semantically WRONG.  The license that is upstream might
actually be different than what we have vendored.  Only look at local files.

This now passes back-to-back updates and verifies.
@thockin thockin force-pushed the fix-godep-licenses branch from 710ba0a to 847b56b Compare May 27, 2016 17:01
@thockin thockin removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 27, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2016
@thockin thockin added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2016
@k8s-bot
Copy link

k8s-bot commented May 27, 2016

GCE e2e build/test passed for commit 847b56b.

@a-robinson
Copy link
Contributor

Manually merging to unblock dependent ubernetes PRs while submit queue is down. e2es passed, I assume this wouldn't have broken only unit tests.

@a-robinson a-robinson merged commit 3ab6ac4 into kubernetes:master May 27, 2016
@bgrant0607
Copy link
Member

@quinton-hoole Writing "fixes #issue" in a PR comment doesn't close the issue. That needs to go in the PR description. Consequently, #26328 is still open.

@ghost
Copy link

ghost commented May 28, 2016

@bgrant0607 noted, thanks!

@ghost
Copy link

ghost commented May 28, 2016

@bgrant0607 FYI, according to this any commit message should do it, not only the PR description. So I still don't actually understand why my commit message above didn't work.

@bgrant0607
Copy link
Member

@quinton-hoole Github comments aren't commit messages.

@thockin thockin deleted the fix-godep-licenses branch July 2, 2016 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants