Support more types

lib/api.js

@@ -2,9 +2,15 @@
 
 const Core = require('./core');
 const Extensions = require('./extensions');
+const Apps = require('./apps');
+const Batch = require('./batch');
+const Rbac = require('./rbac');
 
 const groups = {
-  extensions: Extensions
+  extensions: Extensions,
+  apps: Apps,
+  batch: Batch,
+  'rbac.authorization.k8s.io': Rbac
 };
 
 class Api {
@@ -13,11 +19,17 @@ class Api {
    * @param {object} options - Options to pass to client constructors
    * @param {object} options.core - Optional default Core client
    * @param {object} options.extensions - Optional default Extensions client
+   * @param {object} options.apps - Optional default Apps client
+   * @param {object} options.batch - Optional default Batch client
+   * @param {object} options.rbac - Optional default RBAC client
    */
   constructor(options) {
     this.options = options;
     this.core = options.core || new Core(options);
     this.extensions = options.extensions || new Extensions(options);
+    this.apps = options.apps || new Apps(options);
+    this.batch = options.batch || new Batch(options);
+    this.rbac = options.rbac || new Rbac(options);
   }
 
   /**

lib/apps.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const ApiGroup = require('./api-group');
+
+class Apps extends ApiGroup {
+  constructor(options) {
+    const genericTypes = [
+      // Deprecated name of statefulsets in kubernetes 1.4
+      'petsets',
+      'statefulsets'
+    ];
+    options = Object.assign({}, options, {
+      path: 'apis/apps',
+      version: options.version || 'v1beta1',
+      genericTypes: genericTypes
+    });
+    super(options);
+  }
+}
+
+module.exports = Apps;

lib/batch.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const ApiGroup = require('./api-group');
+
+class Batch extends ApiGroup {
+  constructor(options) {
+    const genericTypes = [
+      'cronjobs',
+      // Deprecated name for cronjobs in kubernetes 1.4
+      'scheduledjobs'
+    ];
+    options = Object.assign({}, options, {
+      path: 'apis/batch',
+      version: options.version || 'v1',
+      genericTypes: genericTypes
+    });
+    super(options);
+  }
+}
+
+module.exports = Batch;

lib/common.js

@@ -5,8 +5,11 @@ module.exports.aliasResources = function (resourceObject) {
   //   http://kubernetes.io/docs/user-guide/kubectl-overview/
   // and anything else we think is useful.
   const resourceAliases = {
+    clusterroles: [],
+    clusterrolebindings: [],
     componentstatuses: ['cs'],
     configmaps: ['cm'],
+    cronjobs: [],
     daemonsets: ['ds'],
     deployments: ['deploy'],
     events: ['ev'],
@@ -19,13 +22,20 @@ module.exports.aliasResources = function (resourceObject) {
     nodes: ['no'],
     persistentvolumes: ['pv'],
     persistentvolumeclaims: ['pvc'],
+    // Deprecated name of statefulsets in kubernetes 1.4
+    petsets: [],
     pods: ['po'],
     replicationcontrollers: ['rc'],
     replicasets: ['rs'],
     resourcequotas: ['quota'],
+    roles: [],
+    rolebindings: [],
+    // Deprecated name of cronjobs in kubernetes 1.4
+    scheduledjobs: [],
     secrets: [],
     serviceaccounts: [],
-    services: ['svc']
+    services: ['svc'],
+    statefulsets: []
   };
 
   const esPlurals = {

lib/index.js

@@ -5,6 +5,9 @@ module.exports.Api = require('./api');
 module.exports.Core = core;
 module.exports.Extensions = require('./extensions');
 module.exports.config = require('./config')
+module.exports.Apps = require('./apps');
+module.exports.Batch = require('./batch');
+module.exports.Rbac = require('./rbac');
 module.exports.testUtils = {
   aliasResources: require('./common').aliasResources
 };

lib/namespaces.js

@@ -37,7 +37,10 @@ class Namespaces extends BaseObject {
     // Generic objects we don't implement special functionality for.
     //
     const genericTypes = [
+      'clusterroles',
+      'clusterrolebindings',
       'configmaps',
+      'cronjobs',
       'daemonsets',
       'deployments',
       'endpoints',
@@ -47,11 +50,18 @@ class Namespaces extends BaseObject {
       'jobs',
       'limitranges',
       'persistentvolumeclaims',
+      // Deprecated name of statefulsets in kubernetes 1.4,
+      'petsets',
       'replicasets',
       'resourcequotas',
+      'roles',
+      'rolebindings',
+      // Deprecated name of cronjobs in kubernetes 1.4
+      'scheduledjobs',
       'secrets',
       'serviceaccounts',
-      'services'
+      'services',
+      'statefulsets'
     ];
     for (const type of genericTypes) {
       this[type] = new BaseObject(

lib/rbac.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const ApiGroup = require('./api-group');
+
+class Rbac extends ApiGroup {
+  constructor(options) {
+    const genericTypes = [
+      'clusterroles',
+      'clusterrolebindings',
+      'roles',
+      'rolebindings'
+    ];
+    options = Object.assign({}, options, {
+      path: 'apis/rbac.authorization.k8s.io',
+      version: options.version || 'v1alpha1',
+      genericTypes: genericTypes
+    });
+    super(options);
+  }
+}
+
+module.exports = Rbac;

test/common.js

@@ -7,8 +7,6 @@ const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
 
-const Core = require('../lib/core');
-const Extensions = require('../lib/extensions');
 const Api = require('../lib/api');
 
 const defaultName = process.env.NAMESPACE || 'integration-tests';
@@ -61,6 +59,23 @@ function newName() {
   return `${ defaultName }-${ buffer.toString('hex') }`;
 }
 
+function injectApis(moduleExports, options, versionOverride) {
+  // APIs and their default version
+  const apis = {
+    'api': [ require('../lib/core'), 'v1' ],
+    'extensions': [ require('../lib/extensions'), 'v1beta1' ]
+  }
+  Object.keys(apis).forEach(apiName => {
+    const api = apis[apiName];
+    moduleExports[apiName] = new (Function.prototype.bind.call(api[0], null, Object.assign({}, options, {
+      version: versionOverride || api[1],
+    })));
+  });
+
+  // Add the apiGroup with the same options but no version
+  moduleExports.apiGroup = new Api(options);
+}
+
 function changeNameInt(cb) {
   let url;
   let ca;
@@ -97,31 +112,13 @@ function changeNameInt(cb) {
   const currentName = newName();
   module.exports.currentName = currentName;
 
-  module.exports.api = new Core({
-    url: url,
-    ca: ca,
-    cert: cert,
-    key: key,
-    version: process.env.VERSION || 'v1',
-    namespace: currentName
-  });
-
-  module.exports.extensions = new Extensions({
-    url: url,
-    ca: ca,
-    cert: cert,
-    key: key,
-    version: process.env.VERSION || 'v1beta1',
-    namespace: currentName
-  });
-
-  module.exports.apiGroup = new Api({
+  injectApis(module.exports, {
     url: url,
     ca: ca,
     cert: cert,
     key: key,
     namespace: currentName
-  });
+  }, process.env.VERSION);
 
   module.exports.api.ns.post({
     body: {
@@ -147,25 +144,14 @@ function changeNameInt(cb) {
 }
 
 function changeNameUnit() {
+  const mockUrl = 'http://mock.kube.api';
   const currentName = newName();
   module.exports.currentName = currentName;
 
-  module.exports.api = new Core({
-    url: 'http://mock.kube.api',
-    version: process.env.VERSION || 'v1',
-    namespace: currentName
-  });
-
-  module.exports.extensions = new Extensions({
-    url: 'http://mock.kube.api',
-    version: process.env.VERSION || 'v1beta1',
-    namespace: currentName
-  });
-
-  module.exports.apiGroup = new Api({
-    url: 'http://mock.kube.api',
-    namespace: currentName
-  });
+  injectApis(module.exports, {
+      url: mockUrl,
+      namespace: currentName
+  }, process.env.VERSION);
 }
 
 function changeName(cb) {