From 4f107cc48affe82e42049323a91a03b84e00a01c Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Thu, 12 Oct 2017 13:27:20 -0700
Subject: [PATCH 1/2] pin golang.org/x/sys to master

fixes issues seen in master with `make build-cross` for windows
---
 glide.lock | 6 +++---
 glide.yaml | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/glide.lock b/glide.lock
index 06ee4088b..cb17642e4 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: f5e472b397d20aaa131c8eada3966fdbbf65457073bd1ee8fb8b349bf39c522a
-updated: 2017-10-09T13:32:53.067503253-07:00
+hash: 650f1d4cd9e9dc5ba76480a5465923ce1bbd11b8fa956b644aaf975e8f7e1f33
+updated: 2017-10-12T13:08:50.435765-07:00
 imports:
 - name: cloud.google.com/go
   version: 3b1ae45394a234c385be014e9a488f2bb6eef821
@@ -285,7 +285,7 @@ imports:
   - jws
   - jwt
 - name: golang.org/x/sys
-  version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
+  version: 43eea11bc92608addb41b8a406b0407495c106f6
   subpackages:
   - unix
   - windows
diff --git a/glide.yaml b/glide.yaml
index 5aa459ca5..feb03a69a 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -28,13 +28,19 @@ import:
 - package: google.golang.org/grpc
   version: 1.2.1
 - package: k8s.io/kubernetes
-  version: ~1.8.0
+  version: 1.8.0
 - package: github.com/gosuri/uitable
 - package: github.com/asaskevich/govalidator
   version: ^4.0.0
 - package: golang.org/x/crypto
   subpackages:
   - openpgp
+  # pin version of golang.org/x/sys that is compatible with golang.org/x/crypto
+- package: golang.org/x/sys
+  version: 43eea11
+  subpackages:
+  - unix
+  - windows
 - package: github.com/gobwas/glob
   version: ^0.2.1
 - package: github.com/evanphx/json-patch

From 4b9b780421159bda253f765c838a2af3b10b18b3 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Thu, 12 Oct 2017 15:26:51 -0700
Subject: [PATCH 2/2] add comment on k8s 1.8.1 deps being hosed

---
 glide.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/glide.yaml b/glide.yaml
index feb03a69a..f89e940fe 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -27,6 +27,8 @@ import:
   - ptypes/timestamp
 - package: google.golang.org/grpc
   version: 1.2.1
+  # 1.8.1 libs are hosed and need some manual intervention, so pinning to 1.8.0 for now
+  # so others aren't getting errors when running `glide up`
 - package: k8s.io/kubernetes
   version: 1.8.0
 - package: github.com/gosuri/uitable