Skip to content

Commit 40ce14a

Browse files
SlavaKatiukhaSlava Katiukha
authored andcommitted
K8S-529
K8S-529 [K8s]: Cluster upgrade fails from 1.18.10 to 1.20.6
1 parent 6c7bdbc commit 40ce14a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

addons/upgrade.jps

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ actions:
238238
resp = resp.response || resp;
239239
if (resp.result != 0) return resp;
240240

241-
var apps = resp.apps, newAddons = {}, mainApp = {}, newJps;
241+
var apps = resp.apps, newAddons = {}, mainApp = {}, newJps, nodeGroup;
242242

243243
try {
244244
newJps = toNative(new org.yaml.snakeyaml.Yaml().load(new com.hivext.api.core.utils.Transport().get(manifestUrl)));
@@ -257,7 +257,7 @@ actions:
257257
var batch = { alias : { m : "Development.Scripting.Eval" }, global : { appid: "appstore", session: session }, methods: [] };
258258

259259
for (var i = 0, n = apps.length; i < n; i++) {
260-
var app = apps[i], nodeGroup = "", jps;
260+
var app = apps[i], jps;
261261

262262
if (!app.isInstalled) continue;
263263
app.settings.data = app.settings.data || {};
@@ -283,6 +283,7 @@ actions:
283283

284284
if (mainApp) {
285285
mainApp = mainApp["kubernetes-release"] || mainApp.kubernetes;
286+
nodeGroup = "";
286287
schedule(mainApp.jps, batch, mainApp.data);
287288
} else return { result: com.hivext.api.Response.OBJECT_FORMAT_ERROR, error: "Kubernetes manifest is not found!", data: ex};
288289

0 commit comments

Comments
 (0)