Add better functionality for instantiating other API clients.

Revise examples.

Author: brendandburns

README.md

@@ -21,7 +21,12 @@ $ npm install @kubernetes/client-node
 ```javascript
 const k8s = require('@kubernetes/client-node');
 
-var k8sApi = k8s.Config.defaultClient();
+
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
+
 k8sApi.listNamespacedPod('default')
     .then((res) => {
         console.log(res.body);
@@ -32,7 +37,10 @@ k8sApi.listNamespacedPod('default')
 ```javascript
 const k8s = require('@kubernetes/client-node');
 
-var k8sApi = k8s.Config.defaultClient();
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
 
 var namespace = {
   metadata: {

examples/example.js

@@ -1,6 +1,10 @@
 const k8s = require('@kubernetes/client-node');
 
-let k8sApi = k8s.Config.defaultClient();
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
+
 k8sApi.listNamespacedPod('default')
     .then((res) => {
 	console.log(res.body);

examples/in-cluster.js

@@ -1,10 +1,9 @@
 const k8s = require('@kubernetes/client-node');
 
-let kc = new k8s.KubeConfig();
+const kc = new k8s.KubeConfig();
 kc.loadFromCluster();
 
-let k8sApi = new k8s.Core_v1Api(kc.getCurrentCluster()['server']);
-k8sApi.setDefaultAuthentication(kc);
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
 
 k8sApi.listNamespacedPod('default')
     .then((res) => {

examples/namespace.js

@@ -1,6 +1,9 @@
 const k8s = require('@kubernetes/client-node');
 
-var k8sApi = k8s.Config.defaultClient();
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
+
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
 
 var namespace = {
   metadata: {

examples/typescript/attach/attach-example.ts

@@ -1,7 +1,7 @@
 import k8s = require('@kubernetes/client-node');
 
 let kc = new k8s.KubeConfig();
-kc.loadFromFile(process.env['HOME'] + '/.kube/config');
+kc.loadFromDefault();
 
 let attach = new k8s.Attach(kc);
 attach.attach('default', 'nginx-4217019353-9gl4s', 'nginx', process.stdout, process.stderr, null /* stdin */, false /* tty */);

examples/typescript/exec/exec-example.ts

@@ -3,7 +3,7 @@ import k8s = require('@kubernetes/client-node');
 let command = process.argv[2];
 
 let kc = new k8s.KubeConfig();
-kc.loadFromFile(process.env['HOME'] + '/.kube/config');
+kc.loadFromDefault();
 
 let exec = new k8s.Exec(kc);
 exec.exec('default', 'nginx-4217019353-9gl4s', 'nginx', command, process.stdout, process.stderr, process.stdin, true /* tty */);

examples/typescript/simple/example.ts

@@ -1,6 +1,8 @@
 import k8s = require('@kubernetes/client-node');
+const kc = new k8s.KubeConfig();
+kc.loadFromDefault();
 
-let k8sApi = k8s.Config.defaultClient();
+const k8sApi = kc.makeApiClient(k8s.Core_v1Api);
 
 k8sApi.listNamespacedPod('default')
     .then((res) => {

examples/typescript/watch/watch-example.ts

@@ -1,7 +1,7 @@
 import k8s = require('@kubernetes/client-node');
 
 let kc = new k8s.KubeConfig();
-kc.loadFromFile(process.env['HOME'] + '/.kube/config');
+kc.loadFromDefault();
 
 let watch = new k8s.Watch(kc);
 let req = watch.watch('/api/v1/namespaces',

node-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubernetes/client-node",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "NodeJS client for kubernetes",
   "repository": {
     "type": "git",

node-client/src/config.ts

@@ -196,6 +196,36 @@ export class KubeConfig {
         this.currentContext = contextName;
     }
 
+    public loadFromDefault() {
+        if (process.env.KUBECONFIG) {
+            this.loadFromFile(process.env.KUBECONFIG);
+            return;
+        }
+
+        const config = path.join(process.env.HOME, '.kube', 'config');
+        if (fs.existsSync(config)) {
+            this.loadFromFile(config);
+            return;
+        }
+
+        if (fs.existsSync(Config.SERVICEACCOUNT_TOKEN_PATH)) {
+            this.loadFromCluster();
+            return;
+        }
+
+        this.loadFromClusterAndUser(
+            {name: 'cluster', server: 'http://localhost:8080'} as Cluster,
+            {name: 'user'} as User,
+        );
+    }
+
+    public makeApiClient<T extends ApiType>(apiClientType: { new(server: string): T}) {
+        const apiClient = new apiClientType(this.getCurrentCluster().server);
+        apiClient.setDefaultAuthentication(this);
+
+        return apiClient;
+    }
+
     private getCurrentContextObject() {
         return this.getContextObject(this.currentContext);
     }
@@ -276,6 +306,11 @@ export class KubeConfig {
     }
 }
 
+export interface ApiType {
+    setDefaultAuthentication(config: KubeConfig);
+}
+
+// This class is deprecated and will eventually be removed.
 export class Config {
     public static SERVICEACCOUNT_ROOT =
     '/var/run/secrets/kubernetes.io/serviceaccount';
@@ -288,10 +323,7 @@ export class Config {
         const kc = new KubeConfig();
         kc.loadFromFile(filename);
 
-        const k8sApi = new client.Core_v1Api(kc.getCurrentCluster().server);
-        k8sApi.setDefaultAuthentication(kc);
-
-        return k8sApi;
+        return kc.makeApiClient(api.Core_v1Api);
     }
 
     public static fromCluster(): api.Core_v1Api {
@@ -317,19 +349,9 @@ export class Config {
     }
 
     public static defaultClient(): api.Core_v1Api {
-        if (process.env.KUBECONFIG) {
-            return Config.fromFile(process.env.KUBECONFIG);
-        }
-
-        const config = path.join(process.env.HOME, '.kube', 'config');
-        if (fs.existsSync(config)) {
-            return Config.fromFile(config);
-        }
-
-        if (fs.existsSync(Config.SERVICEACCOUNT_TOKEN_PATH)) {
-            return Config.fromCluster();
-        }
+        const kc = new KubeConfig();
+        kc.loadFromDefault();
 
-        return new client.Core_v1Api('http://localhost:8080');
+        return kc.makeApiClient(api.Core_v1Api);
     }
 }