K8S-529 (fix uninstall add-on during upgrade) (#40)

SlavaKatiukha · dfateyev · commit 6c7bdbc2a139 · 2021-04-16T17:28:14.000+06:00
K8S-529 [K8s]: Cluster upgrade fails from 1.18.10 to 1.20.4
diff --git a/addons/upgrade.jps b/addons/upgrade.jps
@@ -273,7 +273,7 @@ actions:
                     jps = buildAddon(jps, newJps);
                     delete newAddons[app.app_id];
                 } else {
-                    resp = api.marketplace.jps.Uninstall(appid, session, app.uniqueName);
+                    resp = api.marketplace.jps.Uninstall({ appUniqueName: app.uniqueName, force: true });
                     if (resp.result != 0) return resp;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ actions:`
`273`	`273`	`jps = buildAddon(jps, newJps);`
`274`	`274`	`delete newAddons[app.app_id];`
`275`	`275`	`} else {`
`276`		`- resp = api.marketplace.jps.Uninstall(appid, session, app.uniqueName);`
	`276`	`+ resp = api.marketplace.jps.Uninstall({ appUniqueName: app.uniqueName, force: true });`
`277`	`277`	`if (resp.result != 0) return resp;`
`278`	`278`	`}`
`279`	`279`	`}`