Merge pull request #90 from brendandburns/config

Remove custom fromCluster logic.

Author: k8s-ci-robot

node-client/src/config.ts

@@ -326,23 +326,11 @@ export class Config {
     }
 
     public static fromCluster(): api.Core_v1Api {
-        const host = process.env.KUBERNETES_SERVICE_HOST;
-        const port = process.env.KUBERNETES_SERVICE_PORT;
-
-        // TODO: better error checking here.
-        const caCert = fs.readFileSync(Config.SERVICEACCOUNT_CA_PATH);
-        const token = fs.readFileSync(Config.SERVICEACCOUNT_TOKEN_PATH);
+        const kc = new KubeConfig();
+        kc.loadFromCluster();
 
-        const k8sApi = new api.Core_v1Api('https://' + host + ':' + port);
-        k8sApi.setDefaultAuthentication({
-            applyToRequest: (opts) => {
-                opts.ca = caCert;
-                if (!opts.headers) {
-                    opts.headers = [];
-                }
-                opts.headers.Authorization = 'Bearer ' + token;
-            },
-        });
+        const k8sApi = new api.Core_v1Api(kc.getCurrentCluster().server);
+        k8sApi.setDefaultAuthentication(kc);
 
         return k8sApi;
     }