Send NODE_ENV to nodered, auto detect kubernetes

Author: skadefro

OpenFlow/src/Config.ts

@@ -12,6 +12,8 @@ export class Config {
     public static db: DatabaseConnection = null;
     public static version: string = fs.readFileSync("VERSION", "utf8");
 
+    public static NODE_ENV: string = Config.getEnv("NODE_ENV", "development");
+
     public static auto_create_users: boolean = Config.parseBoolean(Config.getEnv("auto_create_users", "false"));
     public static auto_create_domains: string[] = Config.parseArray(Config.getEnv("auto_create_domains", ""));
     public static allow_user_registration: boolean = Config.parseBoolean(Config.getEnv("allow_user_registration", "false"));

OpenFlow/src/KubeUtil.ts

@@ -16,7 +16,21 @@ export class KubeUtil {
     }
     constructor() {
         const kc = new k8s.KubeConfig();
-        kc.loadFromCluster();
+        var success: boolean = false;
+        try {
+            kc.loadFromDefault();
+            success = true;
+        } catch (error) {
+            console.log(error);
+        }
+        if (success == false) {
+            try {
+                kc.loadFromCluster();
+                success = true;
+            } catch (error) {
+                console.log(error);
+            }
+        }
         this.CoreV1Api = kc.makeApiClient(k8s.CoreV1Api);
         this.AppsV1Api = kc.makeApiClient(k8s.AppsV1Api);
         this.ExtensionsV1beta1Api = kc.makeApiClient(k8s.ExtensionsV1beta1Api);

OpenFlow/src/Messages/Message.ts

@@ -824,6 +824,7 @@ export class Message {
                                             { name: "noderedusers", value: (name + "noderedusers") },
                                             { name: "noderedadmins", value: (name + "noderedadmins") },
                                             { name: "api_allow_anonymous", value: user.nodered.api_allow_anonymous.toString() },
+                                            { name: "NODE_ENV", value: Config.NODE_ENV },
                                         ],
                                         livenessProbe: {
                                             httpGet: {

OpenFlowNodeRED/src/Config.ts

@@ -9,6 +9,8 @@ export class Config {
     public static nodered_sa: string = Config.getEnv("nodered_sa", "");
     public static queue_prefix: string = Config.getEnv("queue_prefix", "");
 
+    public static NODE_ENV: string = Config.getEnv("NODE_ENV", "development");
+
     public static saml_federation_metadata: string = Config.getEnv("saml_federation_metadata", "");
     public static saml_issuer: string = Config.getEnv("saml_issuer", "");
     public static saml_entrypoint: string = Config.getEnv("saml_entrypoint", "");
@@ -23,9 +25,6 @@ export class Config {
     public static noderedusers: string = Config.getEnv("noderedusers", "");
     public static noderedadmins: string = Config.getEnv("noderedadmins", "");
 
-
-
-
     public static api_ws_url: string = Config.getEnv("api_ws_url", "ws://localhost:3000");
     public static amqp_url: string = Config.getEnv("amqp_url", "amqp://localhost");
 

VERSION

@@ -1 +1 @@
-0.0.543
+0.0.544