From caab493d9abddbe11ab30b681f41559251a966cf Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 9 Mar 2022 11:29:58 +0000 Subject: [PATCH 1/2] Fix issue where we keep adding a % char to the maxWorkersUnavailable field --- .../addon/components/cluster-driver/driver-rke/component.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js index 7c8916d1d..6affe3b7a 100644 --- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js @@ -1139,6 +1139,12 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, { cluster.clearProvidersExcept(field); } } + } else { + // If validation fails, we stay on the form, so we need to undo the formatting of the max unavailable worker + // otherwise we keep adding a '%' to the input field + const maxUnavailableWorker = get(this, 'upgradeStrategy.maxUnavailableWorker'); + + set(this, 'upgradeStrategy.maxUnavailableWorker', maxUnavailableWorker.replace('%', '')); } return ok; From 2041405f21ddd1368845b82559bed1bee0ef0397 Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 9 Mar 2022 13:45:48 +0000 Subject: [PATCH 2/2] Remove trailing spaces --- .../addon/components/cluster-driver/driver-rke/component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js index 6affe3b7a..8edee55f3 100644 --- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js @@ -1144,7 +1144,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, { // otherwise we keep adding a '%' to the input field const maxUnavailableWorker = get(this, 'upgradeStrategy.maxUnavailableWorker'); - set(this, 'upgradeStrategy.maxUnavailableWorker', maxUnavailableWorker.replace('%', '')); + set(this, 'upgradeStrategy.maxUnavailableWorker', maxUnavailableWorker.replace('%', '')); } return ok;