From 07488d47b099901294160658d269e37afa07da9d Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Mon, 31 Aug 2020 14:26:04 +0200
Subject: [PATCH] fix(k8s): error with basic auth on WebSocket connections

Using fork of the k8s API library, pending release of
https://github.com/kubernetes-client/javascript/pull/492.
---
 core/package.json |  2 +-
 yarn.lock         | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/package.json b/core/package.json
index 4e53675ad8..c2329ab9d8 100644
--- a/core/package.json
+++ b/core/package.json
@@ -22,7 +22,7 @@
   "main": "build/src/index.js",
   "dependencies": {
     "@hapi/joi": "git+https://github.com/garden-io/joi.git#master",
-    "@kubernetes/client-node": "^0.12.0",
+    "@kubernetes/client-node": "git+https://github.com/garden-io/javascript.git#fix-websocket-basic-auth-yarn",
     "JSONStream": "^1.3.5",
     "ajv": "^6.12.2",
     "analytics-node": "3.3.0",
diff --git a/yarn.lock b/yarn.lock
index 089b58310f..ffd6f2b4dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1766,14 +1766,14 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@kubernetes/client-node@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@kubernetes/client-node/-/client-node-0.12.0.tgz#79120311bced206ac8fa36435fb4cc2c1828fff2"
-  integrity sha512-u57q5IaZl91f7YZoZOsgCa31hHyowHxFG88XZXd8arI8heSxbdHWHineo/8mLZbeSbHkge9Awae1stQZzuTnjg==
+"@kubernetes/client-node@git+https://github.com/garden-io/javascript.git#fix-websocket-basic-auth-yarn":
+  version "0.12.1"
+  resolved "git+https://github.com/garden-io/javascript.git#501d427c5d9464e59946ddaa2af9382c32c12e2e"
   dependencies:
     "@types/js-yaml" "^3.12.1"
     "@types/node" "^10.12.0"
     "@types/request" "^2.47.1"
+    "@types/tar" "^4.0.3"
     "@types/underscore" "^1.8.9"
     "@types/ws" "^6.0.1"
     byline "^5.0.0"
@@ -1785,9 +1785,12 @@
     request "^2.88.0"
     rfc4648 "^1.3.0"
     shelljs "^0.8.2"
+    stream-buffers "^3.0.2"
+    tar "^6.0.2"
+    tmp-promise "^3.0.2"
     tslib "^1.9.3"
     underscore "^1.9.1"
-    ws "^6.1.0"
+    ws "^7.3.1"
 
 "@lerna/add@3.21.0":
   version "3.21.0"
@@ -20760,14 +20763,14 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.1.0, ws@^6.1.2, ws@^6.2.1:
+ws@^6.1.2, ws@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
   integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.0.1, ws@^7.3.0:
+ws@^7.0.1, ws@^7.3.0, ws@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==