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

WIP: Change the repo to use glide instead of godep #24202

Closed
wants to merge 5 commits into from

Conversation

thockin
Copy link
Member

@thockin thockin commented Apr 13, 2016

NO NOT MERGE

Switch to glide as our dependency manager. It seems more friendly and more stable than godep, and the glide developers are actively improving the UX. This assumes that we're using go-1.6 (or go-1.5 with GO15VENDOREXPERIMENT=1) and not go-1.4.

Most of this PR is moving deps around. The interesting parts are in the "glide init" and "convert everything" commits.

Open issues:

  • a bug in glide makes getting new packages fail in this config
  • godep licenses stuff needs to be ported
  • jenkins stuff needs to be ported
  • need to finish doc changes
  • needs more testing

This change is Reviewable

thockin added 3 commits April 12, 2016 15:35
glide install --delete --force --update-vendored --strip-vcs --strip-vendor

Many conflicts were flagged, we can examine them later.
@thockin
Copy link
Member Author

thockin commented Apr 13, 2016

@vishh @madhusudancs @eparis @mikedanese

I filed it as a PR so nobody repeats the work. Not quite ready for prime time, though

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 13, 2016
@k8s-github-robot
Copy link

@thockin PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 13, 2016
@lavalamp
Copy link
Member

lavalamp commented May 9, 2016

looks good so far. Let me know if I can help.

@thockin
Copy link
Member Author

thockin commented May 10, 2016

I'll wait for the glide guys to fix a couple of bugs we need fixed and then
rebase this against head, now that we have moved to a vendor/ dir.

On Mon, May 9, 2016 at 2:40 PM, Daniel Smith notifications@github.com
wrote:

looks good so far. Let me know if I can help.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#24202 (comment)

@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 18, 2016
@k8s-bot
Copy link

k8s-bot commented May 23, 2016

GCE e2e build/test failed for commit 3316388.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

@k8s-bot
Copy link

k8s-bot commented Jul 6, 2016

Build finished. No test results found.

@lavalamp lavalamp assigned thockin and unassigned lavalamp Jul 8, 2016
@lavalamp
Copy link
Member

lavalamp commented Jul 8, 2016

Please assign back when it's ready for review.

@vladimirvivien
Copy link
Member

vladimirvivien commented Jul 19, 2016

@thockin is this targeting k8s 1.4 or later ?

@thockin
Copy link
Member Author

thockin commented Jul 20, 2016

It's really dependent on the glide folks fixing a bunch of issues.

On Tue, Jul 19, 2016 at 2:47 PM, Vladimir Vivien notifications@github.com
wrote:

@thockin https://github.com/thockin is this targeting 1.4 or later ?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVKZm6jalnlKxG-t-DXLwtYF0gh6bks5qXUXugaJpZM4IGhbm
.

@vishh
Copy link
Contributor

vishh commented Jul 20, 2016

I really wish we can stop using godep soon. A lot of us, including me, have
wasted incredible amounts of time due to godep.
I really wish k8s community picks up either godep or glide and updates
it as necessary to meet k8s requirements.

On Wed, Jul 20, 2016 at 3:26 PM, Tim Hockin notifications@github.com
wrote:

It's really dependent on the glide folks fixing a bunch of issues.

On Tue, Jul 19, 2016 at 2:47 PM, Vladimir Vivien <notifications@github.com

wrote:

@thockin https://github.com/thockin is this targeting 1.4 or later ?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<
#24202 (comment)
,
or mute the thread
<
https://github.com/notifications/unsubscribe-auth/AFVgVKZm6jalnlKxG-t-DXLwtYF0gh6bks5qXUXugaJpZM4IGhbm

.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AGvIKI7CNj6Rkw3PkKkcznHTbED_aKZDks5qXqCfgaJpZM4IGhbm
.

@thockin
Copy link
Member Author

thockin commented Jul 20, 2016

Not for lack of want.

On Jul 20, 2016 3:50 PM, "Vish Kannan" notifications@github.com wrote:

I really wish we can stop using godep soon. A lot of us, including me, have
wasted incredible amounts of time due to godep.
I really wish k8s community picks up either godep or glide and updates
it as necessary to meet k8s requirements.

On Wed, Jul 20, 2016 at 3:26 PM, Tim Hockin notifications@github.com
wrote:

It's really dependent on the glide folks fixing a bunch of issues.

On Tue, Jul 19, 2016 at 2:47 PM, Vladimir Vivien <
notifications@github.com

wrote:

@thockin https://github.com/thockin is this targeting 1.4 or later ?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<

#24202 (comment)

,
or mute the thread
<

https://github.com/notifications/unsubscribe-auth/AFVgVKZm6jalnlKxG-t-DXLwtYF0gh6bks5qXUXugaJpZM4IGhbm

.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<
#24202 (comment)
,
or mute the thread
<
https://github.com/notifications/unsubscribe-auth/AGvIKI7CNj6Rkw3PkKkcznHTbED_aKZDks5qXqCfgaJpZM4IGhbm

.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVCKh-WS_kQnx_cpLPcyfGVxsG1oIks5qXqYxgaJpZM4IGhbm
.

@jessfraz
Copy link
Contributor

yay glide, let me know if I can help the switch in anyway cuz I have feelings about godep hahaha

@jessfraz
Copy link
Contributor

do we have a list of the glide issues we are waiting on?

@thockin
Copy link
Member Author

thockin commented Jul 25, 2016

Look at issues I filed against glide. Basically, importing worked great,
but updates and other ops fell over.

On Jul 25, 2016 1:35 PM, "Jess Frazelle" notifications@github.com wrote:

do we have a list of the glide issues we are waiting on?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVK9b5CP-syL4IWBD3ldQBNLvXE2sks5qZR4ZgaJpZM4IGhbm
.

@jessfraz
Copy link
Contributor

I won't try to start a bike shed but I use gvt on all my repos and it works super intuitively https://github.com/FiloSottile/gvt also it's less ruby-esque since it doesn't have a lock file and uses the native golang manifest stuff, I do think the go team is working on fixing vendoring in general in 1.8 with something official so maybe we should just hold off entirely? idk

@justinsb
Copy link
Member

With @mikedanese 's amazing bazel work, I think it is worth revisiting this problem. gazel can exclude the vendor directories from our vendored dependencies. git submodules become even easier (for example).

There are two ways to use git submodules:

  1. use git submodules directly (one per dependency). This does require github to be online during the initial clone.
  2. use git submodules into an ignored directory (_vendor) which we then copy into a directory which we commit to version control. This allows us to exclude vendor/**/vendor dirs, which may be clearer and support non-bazel build tools.

@lxfontes lxfontes mentioned this pull request Nov 1, 2016
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 10, 2016
@apelisse apelisse removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 11, 2016
@AlmogBaku
Copy link
Member

@justinsb glide is a working solution which is quite common in the go community... i don't understand why we should use gazelle for doing that.. especially when other k8s projects are already using it.

@thockin I believe glide is more than stable to give it a new try.. how can we push this forward?

@nhlfr
Copy link

nhlfr commented Nov 20, 2016

I'd also suggest to ignore vendor/ dir, regardless whether glide or gazel will be used - it is possible with glide, helm is already doing that.

@thockin
Copy link
Member Author

thockin commented Nov 20, 2016

To push this forward, someone needs to do the work - convert it to glide,
convert all scripts and docs to describe glide, and convince me that the
new state is equivalent. Also, since glide lists conflicts more verbosely,
provide a list of those for consideration.

On Sun, Nov 20, 2016 at 5:40 AM, Almog Baku notifications@github.com
wrote:

@justinsb https://github.com/justinsb glide is a working solution which
is quite common in the go community... i don't understand why we should use
gazelle for doing that.. especially when other k8s projects are already
using it.

@thockin https://github.com/thockin I believe glide is more than stable
to give it a new try.. how can we push this forward?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVIa4LXJGgYAyVuxVbjkzpsvcLEt_ks5rAE3EgaJpZM4IGhbm
.

@AlmogBaku
Copy link
Member

Fair enough. So I guess this PR is too outdated?
Can we open an issue that describe the issue in more details/with todo list?

On Sun, Nov 20, 2016 at 11:27 PM, Tim Hockin notifications@github.com
wrote:

To push this forward, someone needs to do the work - convert it to glide,
convert all scripts and docs to describe glide, and convince me that the
new state is equivalent. Also, since glide lists conflicts more verbosely,
provide a list of those for consideration.

On Sun, Nov 20, 2016 at 5:40 AM, Almog Baku notifications@github.com
wrote:

@justinsb https://github.com/justinsb glide is a working solution
which
is quite common in the go community... i don't understand why we should
use
gazelle for doing that.. especially when other k8s projects are already
using it.

@thockin https://github.com/thockin I believe glide is more than
stable
to give it a new try.. how can we push this forward?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<https://github.com/kubernetes/kubernetes/pull/
24202#issuecomment-261778976>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/
AFVgVIa4LXJGgYAyVuxVbjkzpsvcLEt_ks5rAE3EgaJpZM4IGhbm>

.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAGCpjgG04f_jU9jC5sXiqQdtllbKUIfks5rALs_gaJpZM4IGhbm
.

http://www.rimoto.net/

www.rimoto.com http://www.rimoto.net/

Almog Baku

CTO & Cofounder *
Mobile: +972.50.2288.744
Social: * http://www.facebook.com/AlmogBaku
http://www.linkedin.com/in/almogbaku

@thockin
Copy link
Member Author

thockin commented Nov 21, 2016

If someone gets the energy for this - just try it. See what works and what
still doesn't. Update a dependency - does it work sanely? Document it.
This PR has a lot of valuable notes, but is pretty obsolete as a whole.

On Sun, Nov 20, 2016 at 4:11 PM, Almog Baku notifications@github.com
wrote:

Fair enough. So I guess this PR is too outdated?
Can we open an issue that describe the issue in more details/with todo
list?

On Sun, Nov 20, 2016 at 11:27 PM, Tim Hockin notifications@github.com
wrote:

To push this forward, someone needs to do the work - convert it to glide,
convert all scripts and docs to describe glide, and convince me that the
new state is equivalent. Also, since glide lists conflicts more
verbosely,
provide a list of those for consideration.

On Sun, Nov 20, 2016 at 5:40 AM, Almog Baku notifications@github.com
wrote:

@justinsb https://github.com/justinsb glide is a working solution
which
is quite common in the go community... i don't understand why we should
use
gazelle for doing that.. especially when other k8s projects are already
using it.

@thockin https://github.com/thockin I believe glide is more than
stable
to give it a new try.. how can we push this forward?


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<https://github.com/kubernetes/kubernetes/pull/
24202#issuecomment-261778976>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/
AFVgVIa4LXJGgYAyVuxVbjkzpsvcLEt_ks5rAE3EgaJpZM4IGhbm>

.


You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<https://github.com/kubernetes/kubernetes/pull/
24202#issuecomment-261807059>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAGCpjgG04f_
jU9jC5sXiqQdtllbKUIfks5rALs_gaJpZM4IGhbm>
.

http://www.rimoto.net/

www.rimoto.com http://www.rimoto.net/

Almog Baku

CTO & Cofounder *
Mobile: +972.50.2288.744
Social: * http://www.facebook.com/AlmogBaku
http://www.linkedin.com/in/almogbaku


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVOaKJrmouI9ma6RNg9S59NhqPCgMks5rAOGzgaJpZM4IGhbm
.

@timoreimann
Copy link
Contributor

FWIW, 4 of the 9 issues @thockin filed with the glide project are still open.

@thockin
Copy link
Member Author

thockin commented Nov 21, 2016

They may be obsolete now - it's worth revisiting.

On Sun, Nov 20, 2016 at 9:29 PM, Timo Reimann notifications@github.com
wrote:

FWIW, 4 of the 9 issues @thockin https://github.com/thockin filed with
the glide project are still open
https://github.com/Masterminds/glide/issues/created_by/Thockin.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#24202 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVGms_SxVDT9SDtmTKMpxUWttpOwyks5rASwngaJpZM4IGhbm
.

@nhlfr
Copy link

nhlfr commented Nov 28, 2016

There is one big problem with making k8s compatible with glide. We are doing symlink in vendor/k8s.io/client-go. Why is it problematic? Every time when you're running glide install, the whole vendor/ dir is cleaned and only repositories fetched by glide are putted there.

@thockin
Copy link
Member Author

thockin commented Nov 28, 2016

I think that symlink is a transitional thing, and we can fix up the glide process to restore it (wrap in a shell script if need be)

@thockin
Copy link
Member Author

thockin commented Nov 28, 2016

@caesarxuchao

@caesarxuchao
Copy link
Member

I think that symlink is a transitional thing, and we can fix up the glide process to restore it (wrap in a shell script if need be)

Yes, it's transitional, though we have several steps to go before removing it.

We already had a script for godep save. It sets up the symlink.

@thockin
Copy link
Member Author

thockin commented Nov 29, 2016 via email

@k8s-github-robot
Copy link

Adding label:do-not-merge because PR changes docs prohibited to auto merge
See http://kubernetes.io/editdocs/ for information about editing docs

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Dec 1, 2016
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @brendandburns
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

This PR hasn't been active in 62 days. It will be closed in 27 days (Feb 27, 2017).

cc @thockin

You can add 'keep-open' label to prevent this from happening, or add a comment to keep it open another 90 days

@k8s-github-robot k8s-github-robot assigned ixdy and unassigned thockin Jan 30, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2017
@thockin thockin closed this Jan 31, 2017
@thockin thockin deleted the glide branch August 14, 2019 17:46
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Nov 26, 2019
…upstreams-jsafrane

Bug 1776351: Restore UPSTREAMs dropped in kubernetes#24159

Origin-commit: 1573ab247c4cf86b4466e336dd904b6f3039f1bd
p0lyn0mial pushed a commit to p0lyn0mial/kubernetes that referenced this pull request Dec 20, 2019
…upstreams-jsafrane

Bug 1776351: Restore UPSTREAMs dropped in kubernetes#24159
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.