-
Notifications
You must be signed in to change notification settings - Fork 5k
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
Bump go-marathon dep #1524
Bump go-marathon dep #1524
Conversation
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.
SGTM
glide.lock
Outdated
@@ -667,4 +728,61 @@ imports: | |||
- tools/clientcmd/api | |||
- tools/metrics | |||
- transport | |||
testImports: [] | |||
testImports: |
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.
These imports are for the integration tests. This means we might be able to remove the integration vendor folder that way.
cc @timoreimann @ldez
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.
@jangie can you make a commit on top of this one that removes integration/glide.{yaml,lock}
and integration/vendor
to see if it's still green ? 👼
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.
@vdemeester just in case you missed it in the fog of war: I tried this, and did not receive a green. https://travis-ci.org/containous/traefik/jobs/227970015 is the respective job.
glide.lock
Outdated
- registry/client/transport | ||
- registry/storage/cache | ||
- registry/storage/cache/memory | ||
- uuid | ||
- name: github.com/docker/docker |
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.
Do we need all of thoses subpackages ? (anyway.. never really understood how glide handled them 😝)
@jangie out of curiosity, how did you update the dependencies? did you just run |
@vdemeester will try! @timoreimann i was using your approach but hadn't remembered that integration had their own glide configuration attached. The first few times I tried to run the glide update command, i ran into issues as there was a file and folder structure expected in docker/docker that wasn't available in the version we had locked it to. I will retry, taking into account the integration glide configurations. |
@jangie if you use the "dirty" method, you should end up with a single (go-marathon) package getting updated per lock file only (besides the hash the timestamp, that is). |
@timoreimann I've tried the process again, this time performing a
Looking at github.com/docker/docker at Removing the I will be making a separate commit to do what @vdemeester suggested to see how that goes shortly. |
2cc67f3
to
c5b42b6
Compare
@jangie make sure you don't call glide directly but use |
@timoreimann for clarity's sake, am i to use |
@jangie I think I was a bit sloppy on the comment. It should be |
Ah ok, I'll try again then after this build completes, I'm wanting to see if at least the integration portion can be removed from the Travis build. [it did not :( working on redoing following your steps] |
c5b42b6
to
ee6d212
Compare
@timoreimann fwiw, what i did just now was a |
5ca6c5f
to
abeefa0
Compare
I just realized that go-marathon isn't even used for the integration tests: The current Marathon test suite consists of a single test, and that just fires up a Marathon compose file and checks if Traefik is running. Nothing interacts with Marathon at this point. I think we can safely ignore the integration tests for now. #1406 will deal with improving them in the future. |
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.
LGTM.
attempt to remove glide from integration glide trim Revert "attempt to remove glide from integration" This reverts commit c5b42b6cdebb44e730080a0cf20a871c11ef095b.
fix docker dependency remove unneeded docker dependency files further cleanup
abeefa0
to
12c2d39
Compare
Fixes #1510. |
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.
Thanks @jangie
LGTM
Was: #1519 before I did something without thinking.
Description
Update
go-marathon
dependency. Addresses gambol99/go-marathon#274 , which is problematic for Traefik users who use Traefik against the Marathon provider, where the Marathon provider is protected by basic auth. At current with that setup, if a given Marathon instance goes out of service, Traefik will not be able to reconnect to that Marathon instance and will essentially have a no-longer-updated frontend/backend configuration. (Traefik will continue to service known routes successfully, but new deployments will not be tracked.)This dependency update aims to resolve that situation.
As a note: I was unable to lock the
docker/docker
dependency, I suspect that there is something to do with how thecoreos/etcd
dependency is doing things that didn't allow the locking to work as expected.Related to #1510