K8S-529 new add-ons creation during the upgrade

Author: Slava Katiukha

addons/upgrade.jps

@@ -235,7 +235,7 @@ actions:
       script: |
         function deepCopy(obj) { return toNative(new org.json.JSONObject(String(obj))); }
         function applyIf(obj, config) { for (var prop in config) { if (typeof obj[prop] == "undefined" || obj[prop] == null) { obj[prop] = config[prop]; } } return obj; }
-        function schedule(jps, batch, settings) { batch.methods.push({ m : { script: "Install", params: { envName: envName, nodeGroup: nodeGroup, jps: jps, settings: settings || {}, skipEmail: true, tracked: false } } }); }
+        function schedule(jps, batch, settings, nodeGroup) { batch.methods.push({ m : { script: "Install", params: { envName: envName, nodeGroup: nodeGroup || "", jps: jps, settings: settings || {}, skipEmail: true, tracked: false } } }); }
         function buildAddon(jps, parent, install) {
             var globals = deepCopy(jps.globals || {}); jps.globals = applyIf(globals, deepCopy(parent.globals));
             var actions = deepCopy(jps.actions || {}); jps.actions = applyIf(actions, deepCopy(parent.actions));
@@ -247,7 +247,7 @@ actions:
         resp = resp.response || resp;
         if (resp.result != 0) return resp;
 
-        var apps = resp.apps, newAddons = {}, mainApp = {}, newJps, nodeGroup;
+        var apps = resp.apps, newAddons = {}, mainApp = {}, mainGroup = "k8sm", newJps;
 
         try {
             newJps = toNative(new org.yaml.snakeyaml.Yaml().load(new com.hivext.api.core.utils.Transport().get(manifestUrl)));
@@ -268,35 +268,33 @@ actions:
         for (var i = 0, n = apps.length; i < n; i++) {
             var app = apps[i], jps;
 
-            if (!app.isInstalled) continue;    
+            if (!app.isInstalled) continue;
             app.settings.data = app.settings.data || {};
             app.settings.data.version = version;
 
             if (app.app_id == "kubernetes" || app.app_id == "kubernetes-release") {
                 mainApp[app.app_id] = { jps: newJps, data: app.settings.data };
             } else {
                 jps = newAddons[app.app_id];
-                nodeGroup = "k8sm";
 
                 if (jps) {
                     jps = buildAddon(jps, newJps);
                     delete newAddons[app.app_id];
+
+                    schedule(jps, batch, app.settings.data, mainGroup);
                 } else {
                     resp = api.marketplace.jps.Uninstall({ appUniqueName: app.uniqueName, force: true });
                     if (resp.result != 0) return resp;
                 }
             }
-
-            if (jps) schedule(jps, batch, app.settings.data);
         }
 
         if (mainApp) {
             mainApp = mainApp["kubernetes-release"] || mainApp.kubernetes;
-            nodeGroup = "";
             schedule(mainApp.jps, batch, mainApp.data);
         } else return { result: com.hivext.api.Response.OBJECT_FORMAT_ERROR, error: "Kubernetes manifest is not found!", data: ex};
 
-        for (var appId in newAddons) schedule(buildAddon(newAddons[appId], newJps, true), batch);
+        for (var appId in newAddons) schedule(buildAddon(newAddons[appId], newJps, true), batch, null, mainGroup);
 
         if (batch.methods.length > 0) {
             var batchResp = api.utils.batch.Call(appid, toJSON(batch), false);