add nodered_allow_nodeselector

Author: skadefro

OpenFlow/src/Config.ts

@@ -96,12 +96,13 @@ export class Config {
         Config.downloadtoken_expires_in = Config.getEnv("downloadtoken_expires_in", "15m");
         Config.personalnoderedtoken_expires_in = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-        Config.nodered_image = Config.getEnv("nodered_image", "openiap/openflownodered:edge");
+        Config.nodered_image = Config.getEnv("nodered_image", "openiap/nodered:edge");
         Config.saml_federation_metadata = Config.getEnv("saml_federation_metadata", "");
         Config.api_ws_url = Config.getEnv("api_ws_url", "ws://localhost:3000");
         Config.namespace = Config.getEnv("namespace", ""); // also sent to website 
         Config.nodered_domain_schema = Config.getEnv("nodered_domain_schema", ""); // also sent to website
         Config.nodered_initial_liveness_delay = parseInt(Config.getEnv("nodered_initial_liveness_delay", "60"));
+        Config.nodered_allow_nodeselector = Config.parseBoolean(Config.getEnv("nodered_allow_nodeselector", "false"));
     }
     public static db: DatabaseConnection = null;
     public static license_key: string = Config.getEnv("license_key", "");
@@ -184,12 +185,13 @@ export class Config {
     public static downloadtoken_expires_in: string = Config.getEnv("downloadtoken_expires_in", "15m");
     public static personalnoderedtoken_expires_in: string = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-    public static nodered_image: string = Config.getEnv("nodered_image", "openiap/openflownodered:edge");
+    public static nodered_image: string = Config.getEnv("nodered_image", "openiap/nodered:edge");
     public static saml_federation_metadata: string = Config.getEnv("saml_federation_metadata", "");
     public static api_ws_url: string = Config.getEnv("api_ws_url", "ws://localhost:3000");
     public static namespace: string = Config.getEnv("namespace", ""); // also sent to website 
     public static nodered_domain_schema: string = Config.getEnv("nodered_domain_schema", ""); // also sent to website
     public static nodered_initial_liveness_delay: number = parseInt(Config.getEnv("nodered_initial_liveness_delay", "60"));
+    public static nodered_allow_nodeselector: boolean = Config.parseBoolean(Config.getEnv("nodered_allow_nodeselector", "false"));
 
     public static baseurl(): string {
         let result: string = "";

OpenFlow/src/Messages/Message.ts

@@ -11,7 +11,7 @@ import { Readable, Stream } from "stream";
 import { GridFSBucket, ObjectID, Db, Cursor, MongoNetworkError } from "mongodb";
 import * as path from "path";
 import { DatabaseConnection } from "../DatabaseConnection";
-import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage } from "openflow-api";
+import { StripeMessage, EnsureStripeCustomerMessage, NoderedUtil, QueuedMessage, RegisterQueueMessage, QueueMessage, CloseQueueMessage, ListCollectionsMessage, DropCollectionMessage, QueryMessage, AggregateMessage, InsertOneMessage, UpdateOneMessage, Base, UpdateManyMessage, InsertOrUpdateOneMessage, DeleteOneMessage, MapReduceMessage, SigninMessage, TokenUser, User, Rights, EnsureNoderedInstanceMessage, DeleteNoderedInstanceMessage, DeleteNoderedPodMessage, RestartNoderedInstanceMessage, GetNoderedInstanceMessage, GetNoderedInstanceLogMessage, SaveFileMessage, WellknownIds, GetFileMessage, UpdateFileMessage, CreateWorkflowInstanceMessage, RegisterUserMessage, NoderedUser, WatchMessage, GetDocumentVersionMessage, DeleteManyMessage, InsertManyMessage, GetKubeNodeLabels } from "openflow-api";
 import { Billing, stripe_customer, stripe_base, stripe_list, StripeAddPlanMessage, StripeCancelPlanMessage, stripe_subscription, stripe_subscription_item, stripe_plan, stripe_coupon } from "openflow-api";
 import { V1ResourceRequirements, V1Deployment } from "@kubernetes/client-node";
 import { amqpwrapper } from "../amqpwrapper";
@@ -167,6 +167,9 @@ export class Message {
                 case "restartnoderedinstance":
                     this.RestartNoderedInstance(cli);
                     break;
+                case "getkubenodelabels":
+                    this.GetKubeNodeLabels(cli);
+                    break;
                 case "getnoderedinstance":
                     this.GetNoderedInstance(cli);
                     break;
@@ -951,7 +954,7 @@ export class Message {
         let msg: EnsureNoderedInstanceMessage;
         try {
             msg = EnsureNoderedInstanceMessage.assign(this.data);
-            await this._EnsureNoderedInstance(cli, msg._id, false);
+            await this._EnsureNoderedInstance(cli, msg._id, false, msg.labels);
         } catch (error) {
             this.data = "";
             cli._logger.error(error);
@@ -966,7 +969,7 @@ export class Message {
         }
         this.Send(cli);
     }
-    private async _EnsureNoderedInstance(cli: WebSocketServerClient, _id: string, skipcreate: boolean): Promise<void> {
+    private async _EnsureNoderedInstance(cli: WebSocketServerClient, _id: string, skipcreate: boolean, labels: any): Promise<void> {
         let user: NoderedUser;
         cli._logger.debug("[" + cli.user.username + "] EnsureNoderedInstance");
         if (_id === null || _id === undefined || _id === "") _id = cli.user._id;
@@ -1105,6 +1108,17 @@ export class Message {
                     }
                 }
             }
+            if (_deployment && labels && Config.nodered_allow_nodeselector) {
+                if (typeof labels === "string") {
+                    var item = JSON.parse(labels);
+                    var spec: any = _deployment.spec.template.spec;
+                    const keys = Object.keys(item);
+                    if (spec.nodeSelector == null) spec.nodeSelector = {};
+                    keys.forEach(key => {
+                        spec.nodeSelector[key] = item[key];
+                    })
+                }
+            }
             try {
                 await KubeUtil.instance().AppsV1Api.createNamespacedDeployment(namespace, (_deployment as any));
                 Audit.NoderedAction(TokenUser.From(cli.user), true, name, "createdeployment", Config.nodered_image, null);
@@ -1304,7 +1318,7 @@ export class Message {
                     }
                 }
             } else {
-                cli._logger.warn("[" + cli.user.username + "] GetNoderedInstance: found NO Namespaced Pods ???");
+                cli._logger.warn("[" + cli.user.username + "] DeleteNoderedPod: found NO Namespaced Pods ???");
                 Audit.NoderedAction(TokenUser.From(cli.user), false, null, "deletepod", image, msg.name);
             }
         } catch (error) {
@@ -1360,6 +1374,38 @@ export class Message {
         }
         this.Send(cli);
     }
+    private async GetKubeNodeLabels(cli: WebSocketServerClient): Promise<void> {
+        this.Reply();
+        let msg: GetKubeNodeLabels;
+        try {
+            cli._logger.debug("[" + cli.user.username + "] GetKubeNodeLabels");
+            msg = GetKubeNodeLabels.assign(this.data);
+            const list = await KubeUtil.instance().CoreV1Api.listNode();
+            const result: any = {};
+            if (list != null) {
+                list.body.items.forEach(node => {
+                    if (node.metadata && node.metadata.labels) {
+                        const keys = Object.keys(node.metadata.labels);
+                        keys.forEach(key => {
+                            result[key] = node.metadata.labels[key];
+                        });
+                    }
+                });
+            }
+            msg.result = result;
+        } catch (error) {
+            this.data = "";
+            cli._logger.error(error);
+            if (msg !== null && msg !== undefined) msg.error = error.message ? error.message : error
+        }
+        try {
+            this.data = JSON.stringify(msg);
+        } catch (error) {
+            this.data = "";
+            cli._logger.error(error);
+        }
+        this.Send(cli);
+    }
     private async GetNoderedInstance(cli: WebSocketServerClient): Promise<void> {
         this.Reply();
         let msg: GetNoderedInstanceMessage;
@@ -1435,7 +1481,7 @@ export class Message {
         this.Reply();
         let msg: GetNoderedInstanceLogMessage;
         try {
-            cli._logger.debug("[" + cli.user.username + "] GetNoderedInstance");
+            cli._logger.debug("[" + cli.user.username + "] GetNoderedInstanceLog");
             msg = GetNoderedInstanceLogMessage.assign(this.data);
             const name = await this.GetInstanceName(msg._id, cli.user._id, cli.user.username, cli.jwt);
             const namespace = Config.namespace;
@@ -1452,12 +1498,12 @@ export class Message {
 
                     }
                     if (!NoderedUtil.IsNullEmpty(msg.name) && item.metadata.name == msg.name && cli.user.HasRoleName("admins")) {
-                        cli._logger.debug("[" + cli.user.username + "] GetNoderedInstance:" + name + " found one as " + item.metadata.name);
+                        cli._logger.debug("[" + cli.user.username + "] GetNoderedInstanceLog:" + name + " found one as " + item.metadata.name);
                         const obj = await await KubeUtil.instance().CoreV1Api.readNamespacedPodLog(item.metadata.name, namespace, "", false);
                         msg.result = obj.body;
                         Audit.NoderedAction(TokenUser.From(cli.user), true, name, "readpodlog", image, item.metadata.name);
                     } else if (item.metadata.labels.app === name) {
-                        cli._logger.debug("[" + cli.user.username + "] GetNoderedInstance:" + name + " found one as " + item.metadata.name);
+                        cli._logger.debug("[" + cli.user.username + "] GetNoderedInstanceLog:" + name + " found one as " + item.metadata.name);
                         const obj = await await KubeUtil.instance().CoreV1Api.readNamespacedPodLog(item.metadata.name, namespace, "", false);
                         msg.result = obj.body;
                         Audit.NoderedAction(TokenUser.From(cli.user), true, name, "readpodlog", image, item.metadata.name);
@@ -2090,7 +2136,7 @@ export class Message {
             if (billing.memory != newmemory) {
                 billing.memory = newmemory;
                 billing = await Config.db._UpdateOne(null, billing, "users", 3, true, rootjwt);
-                this._EnsureNoderedInstance(cli, msg.userid, true);
+                this._EnsureNoderedInstance(cli, msg.userid, true, null);
             }
             if (customer != null && !NoderedUtil.IsNullEmpty(billing.coupon) && customer.discount != null) {
                 if (billing.coupon != customer.discount.coupon.name) {

OpenFlow/src/public/Controllers.ts

@@ -1360,58 +1360,6 @@ export class SocketCtrl {
             });
         });
     }
-
-    async EnsureNoderedInstance(_id: string, name: string) {
-        try {
-            await NoderedUtil.EnsureNoderedInstance(_id, false, null);
-            this.messages += "EnsureNoderedInstance completed" + "\n";
-        } catch (error) {
-            this.messages += error + "\n";
-            console.error(error);
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async DeleteNoderedInstance(_id: string, name: string) {
-        try {
-            await NoderedUtil.DeleteNoderedInstance(null, _id);
-            this.messages += "DeleteNoderedInstance completed" + "\n";
-        } catch (error) {
-            this.messages += error + "\n";
-            console.error(error);
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async RestartNoderedInstance(_id: string, name: string) {
-        try {
-            await NoderedUtil.RestartNoderedInstance(null, _id);
-            this.messages += "RestartNoderedInstance completed" + "\n";
-        } catch (error) {
-            this.messages += error + "\n";
-            console.error(error);
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async StartNoderedInstance(_id: string, name: string) {
-        try {
-            await NoderedUtil.StartNoderedInstance(null, _id);
-            this.messages += "StartNoderedInstance completed" + "\n";
-        } catch (error) {
-            this.messages += error + "\n";
-            console.error(error);
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-    async StopNoderedInstance(_id: string, name: string) {
-        try {
-            await NoderedUtil.StopNoderedInstance(null, _id);
-            this.messages += "StopNoderedInstance completed" + "\n";
-        } catch (error) {
-            this.messages += error + "\n";
-            console.error(error);
-        }
-        if (!this.$scope.$$phase) { this.$scope.$apply(); }
-    }
-
 }
 export class FilesCtrl extends entitiesCtrl<Base> {
     public file: string;
@@ -2698,6 +2646,9 @@ export class NoderedCtrl {
     public user: NoderedUser = null;
     public limitsmemory: string = "";
     public loading: boolean = false;
+    public labels: any[] = [];
+    public keys: string[] = [];
+    public label: any = null;
     constructor(
         public $scope: ng.IScope,
         public $location: ng.ILocationService,
@@ -2744,6 +2695,11 @@ export class NoderedCtrl {
             console.log(this.noderedurl);
             // // this.GetNoderedInstance();
             this.GetNoderedInstance();
+            this.labels = await NoderedUtil.GetKubeNodeLabels(null);
+            this.keys = Object.keys(this.labels);
+            this.loading = false;
+            if (!this.$scope.$$phase) { this.$scope.$apply(); }
+
         });
     }
     async save() {
@@ -2839,7 +2795,7 @@ export class NoderedCtrl {
     async EnsureNoderedInstance() {
         try {
             this.errormessage = "";
-            await NoderedUtil.EnsureNoderedInstance(this.userid, false, null);
+            await NoderedUtil.EnsureNoderedInstance(this.userid, false, this.label, null);
             this.messages = "EnsureNoderedInstance completed" + "\n" + this.messages;
             this.GetNoderedInstance();
         } catch (error) {

OpenFlow/src/public/Nodered.html

@@ -105,6 +105,17 @@ <h1 translate lib="web">nodered</h1>
     </div>
   </div>
 </section>
+<section>
+  <div class="form-group" ng-show="menuctrl.hasrole('admins') && ctrl.labels">
+    <label class="col-sm-3 control-label"><span translate lib="web">label</span>: </label>
+    <div class="col-sm-9">
+      <select class="form-control" ng-model="ctrl.label">
+        <option value="">No label</option>
+        <option ng-repeat="key in ctrl.keys">{{ '{"' + key + '":"' + ctrl.labels[key] + '"}'}}</option>
+      </select>
+    </div>
+  </div>
+</section>
 <section>
   <div class="form-group">
     <div class="col-sm-offset-3 col-sm-9">

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.110",
+  "version": "1.1.111",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.110
+1.1.111

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "openiap/openflow:1.1.110"
+    image: "openiap/openflow:1.1.111"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "openiap/openflownodered:1.1.110"
+    image: "openiap/nodered:1.1.111"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "openiap/openflow:1.1.110"
+    image: "openiap/openflow:1.1.111"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "openiap/openflownodered:1.1.110"
+    image: "openiap/nodered:1.1.111"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "openiap/openflow:1.1.110"
+    image: "openiap/openflow:1.1.111"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "openiap/openflownodered:1.1.110"
+    image: "openiap/nodered:1.1.111"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "openiap/openflow:1.1.110"
+    image: "openiap/openflow:1.1.111"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "openiap/openflownodered:1.1.110"
+    image: "openiap/nodered:1.1.111"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1