From be3ae4ea91b2960be98c07e8f73754e67e87963c Mon Sep 17 00:00:00 2001
From: Matt Farina <matt@mattfarina.com>
Date: Mon, 18 Sep 2017 16:19:42 -0400
Subject: [PATCH] fix(deps): fix issues when running glide up

When running glide update there are errors due to pinned versions
in the glide.yaml file mixed with getting a more recent version of
kubernetes. client-go needs a newer version of go-autorest.

Note, go-autorest is pinned to v8.0.0 rather than the latest
release of v8.4.0 because kubernetes is pinned to v8.0.0.

(cherry picked from commit b69d6ceca0bca9290efb9d1ca89c50cf337cbb08)
---
 glide.lock | 8 ++++----
 glide.yaml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/glide.lock b/glide.lock
index dc8c616d2..3a61f6208 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 311e977050841ebb18e762e7fe42c1b62490dd6f2d37182f6dbfcc369636765c
-updated: 2017-10-03T15:20:32.19833-07:00
+hash: f563d96e00f95924b5c8b3bf32a6f0a3fba23097176937f8d2c65c746bc6bbbb
+updated: 2017-10-04T11:27:05.899491-07:00
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -8,7 +8,7 @@ imports:
 - name: github.com/asaskevich/govalidator
   version: 7664702784775e51966f0885f5cd27435916517b
 - name: github.com/Azure/go-autorest
-  version: d7c034a8af24eda120dd6460bfcd6d9ed14e43ca
+  version: 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d
 - name: github.com/beorn7/perks
   version: 3ac7bf7a47d159a033b107610db8a1b6575507a4
   subpackages:
@@ -133,7 +133,7 @@ imports:
   subpackages:
   - lru
 - name: github.com/golang/protobuf
-  version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
+  version: 4bd1920723d7b7c925de087aa32e2187708897f7
   subpackages:
   - proto
   - ptypes/any
diff --git a/glide.yaml b/glide.yaml
index 6a76c3932..89cbd25a5 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -20,7 +20,7 @@ import:
   version: ~1.3.1
 - package: github.com/technosophos/moniker
 - package: github.com/golang/protobuf
-  version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
+  version: 4bd1920723d7b7c925de087aa32e2187708897f7
   subpackages:
   - proto
   - ptypes/any
@@ -54,7 +54,7 @@ import:
 # hacks for kubernetes v1.7
 - package: cloud.google.com/go
 - package: github.com/Azure/go-autorest
-  version: d7c034a8af24eda120dd6460bfcd6d9ed14e43ca
+  version: v8.0.0
 - package: github.com/dgrijalva/jwt-go
 - package: github.com/docker/spdystream
 - package: github.com/go-openapi/analysis