From 3f1c6a1e870b8c860267c2a22895140615282a29 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Wed, 10 May 2017 18:14:04 -0400 Subject: [PATCH] fix(windows): Updating docker/distribution Kubernetes has a dependency on a development version of github.com/docker/distribution that does not work for windows. Helm picks up this dependency and it breaks helm development on win. The bug was later fixed. There is an issue on Kubernetes to update to a newer version. In the meantime, this change causes helm to use the latest stable release for that minor version. Fixes #2396 Relates to https://github.com/kubernetes/kubernetes/issues/45377 --- glide.lock | 8 ++++---- glide.yaml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/glide.lock b/glide.lock index 239392888..9e9341ef9 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 6ee139cf584a7c74de86b7bfe1269ea8a467bc710801cb2a8156980cbad43180 -updated: 2017-05-12T16:19:06.928220473-07:00 +hash: 6754faf700ea2428c13d565039d2179b9124e39b80da8dffbbf25d3078f6f948 +updated: 2017-05-17T10:18:25.740091502-04:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -49,7 +49,7 @@ imports: - name: github.com/dgrijalva/jwt-go version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20 - name: github.com/docker/distribution - version: cd27f179f2c10c5d300e6d09025b538c475b0d51 + version: 03efb43768979f4d2ea5187bef995656441829e5 subpackages: - digest - reference @@ -471,7 +471,7 @@ imports: - util/integer - util/jsonpath - name: k8s.io/kubernetes - version: 0480917b552be33e2dba47386e51decb1a211df6 + version: 00fb653e406a4b5bbac71a10c3e330afef960f13 subpackages: - federation/apis/federation - federation/apis/federation/install diff --git a/glide.yaml b/glide.yaml index a4a203966..0a7539f76 100644 --- a/glide.yaml +++ b/glide.yaml @@ -53,7 +53,8 @@ import: - package: vbom.ml/util repo: https://github.com/fvbommel/util.git vcs: git - +- package: github.com/docker/distribution + version: ~v2.4.0 testImports: - package: github.com/stretchr/testify version: ^1.1.4