Merge pull request #20 from kube-HPC/add-kube-version

add kube-version api

Author: yehiyam

lib/formatters.js

@@ -0,0 +1,15 @@
+module.exports = {
+    parseInt(value, defaultValue) {
+        if (typeof value === 'number') {
+            return value;
+        }
+        if (typeof value === 'string') {
+            const ret = parseInt(value, 10);
+            if (Number.isNaN(ret)) {
+                return defaultValue;
+            }
+            return ret;
+        }
+        return defaultValue;
+    }
+};

lib/utils.js

@@ -1,4 +1,6 @@
 const clonedeep = require('lodash.clonedeep');
+const compareVersions = require('compare-versions');
+
 const objectPath = require('object-path');
 const { awsAccessKeyId, awsSecretAccessKey, s3EndpointUrl } = require('./templates/s3-template');
 const { fsBaseDirectory, fsVolumeMounts, fsVolumes } = require('./templates/fs-template');
@@ -308,6 +310,47 @@ const applySecret = (inputSpec, containerName, secret) => {
     return spec;
 };
 
+const getIngressApiVersion = (kubeVersion) => {
+    const { version } = kubeVersion;
+    if (compareVersions.compare(version, '1.14', '<')) {
+        return 'extensions/v1beta1';
+    }
+    if (compareVersions.compare(version, '1.19', '<')) {
+        return 'networking.k8s.io/v1beta1';
+    }
+    return 'networking.k8s.io/v1';
+};
+
+const shouldAddIngressPathType = (kubeVersion) => {
+    const { version } = kubeVersion;
+    return compareVersions.compare(version, '1.19', '>=');
+};
+
+const getIngressBackend = (serviceName, servicePort, kubeVersion) => {
+    const { version } = kubeVersion;
+    if (compareVersions.compare(version, '1.19', '<')) {
+        return {
+            backend: {
+                serviceName,
+                servicePort
+            }
+        };
+    }
+    const backend = {
+        service: {
+            name: serviceName,
+            port: {
+                [Number.isInteger(servicePort) ? 'number' : 'name']: servicePort
+            }
+        }
+    };
+    const ret = { backend };
+    if (shouldAddIngressPathType(kubeVersion)) {
+        ret.pathType = 'ImplementationSpecific';
+    }
+    return ret;
+};
+
 module.exports = {
     findContainer,
     parseImageName,
@@ -326,5 +369,7 @@ module.exports = {
     applySecret,
     createEnvFromConfigmap,
     applyAnnotation,
-    applyImagePullSecret
+    applyImagePullSecret,
+    getIngressApiVersion,
+    getIngressBackend
 };

lib/versions.js

@@ -1,10 +1,29 @@
 
 const Client = require('./client-base');
+const formatters = require('./formatters');
 
 class Versions extends Client {
+    constructor(client, namespace) {
+        super(client, namespace);
+        this._kubeVersion = null;
+    }
+
     async get() {
         return this._client.version.get();
     }
+
+    async getParsedVersion() {
+        if (!this._kubeVersion) {
+            const kubeVersionRaw = await this.get();
+            this._kubeVersion = {
+                ...kubeVersionRaw.body,
+                major: formatters.parseInt(kubeVersionRaw.body.major, 1),
+                minor: formatters.parseInt(kubeVersionRaw.body.minor, 9)
+            };
+            this._kubeVersion.version = `${this._kubeVersion.major}.${this._kubeVersion.minor}`;
+        }
+        return this._kubeVersion;
+    }
 }
 
 module.exports = Versions;

package-lock.json

@@ -23,6 +23,7 @@
   "author": "Nassi Harel",
   "license": "MIT",
   "dependencies": {
+    "compare-versions": "^3.6.0",
     "kubernetes-client": "^6.12.1",
     "lodash.clonedeep": "^4.5.0",
     "object-path": "^0.11.4"

package.json

@@ -0,0 +1,17 @@
+const { expect } = require('chai');
+const formatters = require('../lib/formatters');
+
+describe('formatters', () => {
+    it('parse empty', () => {
+        const res = formatters.parseInt(undefined, 101)
+        expect(res).to.eql(101)
+    })
+    it('parse number', () => {
+        const res = formatters.parseInt(102, 101)
+        expect(res).to.eql(102)
+    })
+    it('parse error', () => {
+        const res = formatters.parseInt('foo', 101)
+        expect(res).to.eql(101)
+    })
+})

tests/formattersTest.js

@@ -3,10 +3,12 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const app = express();
 const pod = require('../stubs/pod.json');
+const version = require('../stubs/version.json');
 const configmaps = require('../stubs/configmaps.json');
 
 const map = {
     '/api/kube/api/v1/namespaces/default/pods/worker': pod,
+    '/api/kube/version': version,
     '/api/kube/api/v1/namespaces/default/configmaps/hkube-versions': configmaps,
     '/api/kube/api/v1/namespaces/default/resourcequotas/foo': {body: {name: 'foo'}}
 }

tests/mocks/kubernetes-server.mock.js

@@ -0,0 +1,39 @@
+const kubernetesServerMock = require('./mocks/kubernetes-server.mock');
+
+const kubeconfig = {
+    apiVersion: 'v1',
+    kind: 'Config',
+    'current-context': 'dev',
+    clusters: [{
+        name: 'dev',
+        cluster: {
+            server: "http://127.0.0.1:9001/api/kube"
+        }
+    }],
+    contexts: [{
+        name: 'dev',
+        context: {
+            cluster: 'dev',
+            user: 'dev-admin'
+        }
+    }],
+    users: [{
+        name: 'default-admin',
+        user: {}
+    }]
+}
+
+
+before(async () => {
+    const index = require('../index');
+    Client = index.Client;
+    utils = index.utils;
+    client = new Client({ isLocal: false, timeout: 5000, kubeconfig });
+    await kubernetesServerMock.start({ port: 9001 });
+
+    global.testParams = {
+        utils,
+        Client,
+        client
+    }
+});

tests/setup.js

@@ -0,0 +1,14 @@
+{
+    "statusCode": 200,
+    "body": {
+        "major": "1",
+        "minor": "19",
+        "gitVersion": "v1.19.7",
+        "gitCommit": "1dd5338295409edcfff11505e7bb246f0d325d15",
+        "gitTreeState": "clean",
+        "buildDate": "2021-01-13T13:15:20Z",
+        "goVersion": "go1.15.5",
+        "compiler": "gc",
+        "platform": "linux/amd64"
+    }
+}