11

Author: skadefro

OpenFlow/src/Config.ts

@@ -38,8 +38,6 @@ export class Config {
     public static aes_secret: string = Config.getEnv("aes_secret", "");
     public static skip_history_collections: string = Config.getEnv("skip_history_collections", "");
 
-    public static kubeconfig: string = Config.getEnv("kubeconfig", "");
-
     public static baseurl(): string {
         var result: string = "";
         if (Config.tls_crt != '' && Config.tls_key != '') {

OpenFlow/src/KubeUtil.ts

@@ -15,9 +15,8 @@ export class KubeUtil {
         return this._instance;
     }
     constructor() {
-        var config = Config.kubeconfig;
         const kc = new k8s.KubeConfig();
-        kc.loadFromString(config);
+        kc.loadFromCluster();
         this.CoreV1Api = kc.makeApiClient(k8s.CoreV1Api);
         this.AppsV1Api = kc.makeApiClient(k8s.AppsV1Api);
         this.ExtensionsV1beta1Api = kc.makeApiClient(k8s.ExtensionsV1beta1Api);

OpenFlow/src/index.ts

@@ -17,6 +17,7 @@ import { TokenUser } from "./TokenUser";
 import { Auth } from "./Auth";
 import { Role } from "./Role";
 import { Config } from "./Config";
+import { KubeUtil } from "./KubeUtil";
 
 const logger: winston.Logger = Logger.configure();
 Config.db = new DatabaseConnection(logger, Config.mongodb_url, Config.mongodb_db);
@@ -125,14 +126,18 @@ process.on('unhandledRejection', up => {
         WebSocketServer.configure(logger, server);
         logger.info("listening on " + Config.baseurl());
         logger.info("namespace: " + Config.namespace);
-        var fs = require('fs');
-        var contents = fs.readFileSync('/kubeconfig/kube.yaml', 'utf8');
-        var json = JSON.stringify(contents, null, 3);
-        console.log(json);
-        logger.info("kubeconfig: " + Config.kubeconfig);
         if (!await initDatabase()) {
             process.exit(404);
         }
+
+
+        var res = await KubeUtil.instance().GetDeployment("demo3", "api");
+        if (res != null) {
+            var json = JSON.stringify(res, null, 3);
+            console.log(json);
+        } else {
+            console.log("demo3/api not found!");
+        }
     } catch (error) {
         logger.error(error.message);
     }

VERSION

@@ -1 +1 @@
-0.0.177
+0.0.178