This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
Fix fsnotify and apimachinery dependency errors #895
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The currently pinned dependencies have two problems that are highlighted when attempting to vendor new dependencies or reproduce the vendor directory from the
Gopkg.lock
file (I'd encountered these while investigating building on windows).hpcloud/tail
has a transitive dependency to a no-longer existing repo.k8s.io/apimachinery
pins to an invalid revisionIf you wipe the
vendor
directory and attempt to reproduce it viadep ensure -v
you should see something similar to the following:hpcloud/tail
/fsnotify
fixThis PR pins the
hpcloud/tail
dependency to the fix in the PR branch for hpcloud/tail#138 which addresses problems due to thefsnotify
Github org name changing fromgo-fsnotify
tofsnotify
(see go-fsnotify/fsnotify#1).This change also effectively bumps the vendored
hpcloud/tail
version to1.4.7
, no impact to CI tests have been observed.When this upstream PR is merged we can point again at the
hpcloud/tail
repo.k8s.io/apimachinery
fixThis commit also addresses an issue introduced when migrating the dependencies from Rancher Trash to
dep
, thedep init
used to populate theGopkg.toml
file had interpreted the pinned value fork8s.io/apimachinery
as a revision and not the branch which it pointed to.The fix involves pinning
k8s.io/apimachinery
to therelease-1.7
branch again in an override.It should be possible to remove this when moving the
k8s.io/kubernetes
dependency to a version> 1.7.5
(there is no corresponding1.7.5
tag on the apimachinery project, the earliest being1.7.6
).