This repository was archived by the owner on Jan 21, 2020. It is now read-only.
Fix fsnotify and apimachinery dependency errors#895
Merged
chungers merged 2 commits intodocker-archive:masterfrom Mar 30, 2018
johnmccabe:dep-fixes
Merged
Fix fsnotify and apimachinery dependency errors#895chungers merged 2 commits intodocker-archive:masterfrom johnmccabe:dep-fixes
chungers merged 2 commits intodocker-archive:masterfrom
johnmccabe:dep-fixes
Conversation
This commit pins the hpcloud/tail dependency to the fix in the PR branch for hpcloud/tail#138 which addresses problems due to the fsnotify github org name changing from go-fsnotify to fsnotify (see go-fsnotify/fsnotify#1). This change also effectively bumps the vendored hpcloud/tail version to `1.4.7`, no impact to tests has been observed. When this upstream PR is merged we can point again at the hpcloud/tail repo. This commit also addresses an issue introduced when migrating the dependencies from Rancher Trash to dep, the `dep init` used to populate the `Gopkg.toml` file had interpreted the pinned value for k8s.io/apimachinery as a revision and not the branch which it pointed to. This then resulted in errors when trying to add new dependencies or freshly `dep ensure` the current locked versions as it was treating `release-1.7` as a revision. The fix involves pinning k8s.io/apimachinery to the `release-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 corresponding `1.7.5` tag on the apimachinery project, the earliest being `1.7.6`). Signed-off-by: John McCabe <john@johnmccabe.net>
This commit updates the vendored depdencies, impacting the following: Direct dependency: - hpcloud/tail Transitive dependency: - go-fsnotify -> fsnotify/fsnotify Note that the pinning for k8s.io/apimachinery has been updated but has had no impact on the vendored code. Signed-off-by: John McCabe <john@johnmccabe.net>
Codecov Report
@@ Coverage Diff @@
## master #895 +/- ##
==========================================
+ Coverage 48.53% 48.56% +0.02%
==========================================
Files 84 84
Lines 7837 7837
==========================================
+ Hits 3804 3806 +2
+ Misses 3722 3721 -1
+ Partials 311 310 -1
Continue to review full report at Codecov.
|
chungers
approved these changes
Mar 30, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.lockfile (I'd encountered these while investigating building on windows).hpcloud/tailhas a transitive dependency to a no-longer existing repo.k8s.io/apimachinerypins to an invalid revisionIf you wipe the
vendordirectory and attempt to reproduce it viadep ensure -vyou should see something similar to the following:hpcloud/tail/fsnotifyfixThis PR pins the
hpcloud/taildependency to the fix in the PR branch for hpcloud/tail#138 which addresses problems due to thefsnotifyGithub org name changing fromgo-fsnotifytofsnotify(see go-fsnotify/fsnotify#1).This change also effectively bumps the vendored
hpcloud/tailversion to1.4.7, no impact to CI tests have been observed.When this upstream PR is merged we can point again at the
hpcloud/tailrepo.k8s.io/apimachineryfixThis commit also addresses an issue introduced when migrating the dependencies from Rancher Trash to
dep, thedep initused to populate theGopkg.tomlfile had interpreted the pinned value fork8s.io/apimachineryas a revision and not the branch which it pointed to.The fix involves pinning
k8s.io/apimachineryto therelease-1.7branch again in an override.It should be possible to remove this when moving the
k8s.io/kubernetesdependency to a version> 1.7.5(there is no corresponding1.7.5tag on the apimachinery project, the earliest being1.7.6).