From fb8eee430e5593166973ab09917a04df0be7cf91 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 14 Apr 2020 13:22:59 +0000 Subject: [PATCH] Use default-worker instead of production_group At present, resize cluster invocation via the magnum-ui fails because it tries to resize production_group nodegroup which is not a thing. Until we support ability to specify nodegroups, we ought to use the default of default-worker nodegroup. Change-Id: I3e9553e6d337ab1580c0e3bb3d1a88e8b97f2f23 --- .../container-infra/clusters/resize/resize.service.js | 2 +- .../clusters/rolling-upgrade/upgrade.service.js | 2 +- .../dashboard/container-infra/magnum.service.spec.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/magnum_ui/static/dashboard/container-infra/clusters/resize/resize.service.js b/magnum_ui/static/dashboard/container-infra/clusters/resize/resize.service.js index 24856b21..1874c3b7 100644 --- a/magnum_ui/static/dashboard/container-infra/clusters/resize/resize.service.js +++ b/magnum_ui/static/dashboard/container-infra/clusters/resize/resize.service.js @@ -181,7 +181,7 @@ function onModalSubmit() { var postRequestObject = { node_count: formModel.node_count, - nodegroup: 'production_group' + nodegroup: 'default-worker' }; if (formModel.node_count < formModel.original_node_count && diff --git a/magnum_ui/static/dashboard/container-infra/clusters/rolling-upgrade/upgrade.service.js b/magnum_ui/static/dashboard/container-infra/clusters/rolling-upgrade/upgrade.service.js index 66098290..f1e0a8ee 100644 --- a/magnum_ui/static/dashboard/container-infra/clusters/rolling-upgrade/upgrade.service.js +++ b/magnum_ui/static/dashboard/container-infra/clusters/rolling-upgrade/upgrade.service.js @@ -203,7 +203,7 @@ return magnum.upgradeCluster(formModel.id, { cluster_template: formModel.cluster_template_id, max_batch_size: formModel.max_batch_size, - nodegroup: 'production_group' + nodegroup: 'default-worker' }).then(onRequestSuccess); } diff --git a/magnum_ui/static/dashboard/container-infra/magnum.service.spec.js b/magnum_ui/static/dashboard/container-infra/magnum.service.spec.js index b4417573..dc8fe4ad 100644 --- a/magnum_ui/static/dashboard/container-infra/magnum.service.spec.js +++ b/magnum_ui/static/dashboard/container-infra/magnum.service.spec.js @@ -82,7 +82,7 @@ "data": { "node_count": 2, "nodes_to_remove": ["456"], - "nodegroup": "production_group" + "nodegroup": "default-worker" }, "error": "Unable to resize given cluster id: 123.", "testInput": [ @@ -90,7 +90,7 @@ { "node_count": 2, "nodes_to_remove": ["456"], - "nodegroup": "production_group" + "nodegroup": "default-worker" } ] }, @@ -109,7 +109,7 @@ "data": { "cluster_template": "ABC", "max_batch_size": 1, - "node_group": "production_group" + "node_group": "default-worker" }, "error": "Unable to perform rolling upgrade.", "testInput": [ @@ -117,7 +117,7 @@ { "cluster_template": "ABC", "max_batch_size": 1, - "node_group": "production_group" + "node_group": "default-worker" } ] },