feat: remove deprecation warnings from openshift rest client (#398)

BREAKING CHANGE: The api for the openshift rest client has changed slightly, but there should be no nodeshift api changes

While this doesn't have to be a semver-major release, there might be some unexpected bugs.  One known issue, is we are no longer passing a custom config to the rest client.  If this removal causes issues we can work on a way to put it back in

fixes #377

* test(nodeshift-config): update tests to work with the new client

* squash: remove those tmp files

lib/build-watcher.js

@@ -53,7 +53,7 @@ module.exports = async function watchBuildLog (config, build) {
   await pingEndpoint(config, build);
   // Then do the follow endpoint
 
-  const response = config.openshiftRestClient.api.v1.ns(config.namespace.name).pods(`${build}-build`).log.getStream({ qs: { follow: true, pretty: false } });
+  const response = await config.openshiftRestClient.api.v1.ns(config.namespace.name).pods(`${build}-build`).log.getByteStream({ qs: { follow: true, pretty: false } });
 
   response.on('data', (chunk) => {
     logger.trace(chunk.toString('utf8').trim());

lib/nodeshift-config.js

@@ -19,7 +19,7 @@
 'use strict';
 
 const logger = require('./common-log')();
-const { OpenshiftClient: restClient, config: k8sConfig } = require('openshift-rest-client');
+const { OpenshiftClient: openshiftRestClient } = require('openshift-rest-client');
 const fs = require('fs');
 const { promisify } = require('util');
 const readFile = promisify(fs.readFile);
@@ -32,10 +32,16 @@ async function setup (options = {}) {
   const projectPackage = JSON.parse(await readFile(`${options.projectLocation}/package.json`, { encoding: 'utf8' }));
   // const config = await openshiftConfigLoader(Object.assign({}, { tryServiceAccount: options.tryServiceAccount, configLocation: options.configLocation }));
   // TODO: pass in different configs like in the openshift-rest-client
-  const kubeConfig = k8sConfig.fromKubeconfig(options.config);
+  const restClient = await openshiftRestClient(/* TODO: pass custom configs */);
+  const kubeConfig = restClient.kubeconfig;
+
+  const currentContext = kubeConfig.getCurrentContext();
+  const contexts = kubeConfig.getContexts();
+
+  const currentCluster = contexts.find(context => context.name === currentContext);
   const config = {
     namespace: {
-      name: kubeConfig.namespace
+      name: currentCluster.namespace
     }
   };
 
@@ -54,7 +60,7 @@ async function setup (options = {}) {
     delete options.namespace;
   }
 
-  logger.info(`using namespace ${config.namespace.name} at ${kubeConfig.url}`);
+  logger.info(`using namespace ${config.namespace.name} at ${kubeConfig.getCurrentCluster().server}`);
 
   if (!projectPackage.name.match(/^[a-z][0-9a-z-]+[0-9a-z]$/)) {
     throw new Error('"name" in package.json can only consist lower-case letters, numbers, and dashes. It must start with a letter and can\'t end with a -.');
@@ -73,7 +79,7 @@ async function setup (options = {}) {
     // Since we are only doing s2i builds(atm), append the s2i bit to the end
     buildName: `${projectPackage.name}-s2i`,
     // Load an instance of the Openshift Rest Client, https://www.npmjs.com/package/openshift-rest-client
-    openshiftRestClient: await restClient({ config: kubeConfig })
+    openshiftRestClient: restClient
   }, options);
 }
 

package.json

@@ -56,7 +56,7 @@
     "js-yaml": "~3.13.1",
     "lodash": "^4.17.4",
     "mkdirp": "^0.5.1",
-    "openshift-rest-client": "~2.3.0",
+    "openshift-rest-client": "~3.1.0",
     "rimraf": "^3.0.0",
     "tar": "~5.0.5",
     "yargs": "^15.0.2"