From 9621b09fb0830d9c22de17fb1fe1259a63c0622b Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 11 Sep 2019 01:55:34 -0700 Subject: [PATCH] Don't overwrite cluster config with answers on edit (rancher/rancher#22085) --- app/authenticated/cluster/edit/route.js | 3 ++- .../addon/components/cluster-driver/driver-rke/component.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/authenticated/cluster/edit/route.js b/app/authenticated/cluster/edit/route.js index 37e57167d..c1ff5802c 100644 --- a/app/authenticated/cluster/edit/route.js +++ b/app/authenticated/cluster/edit/route.js @@ -57,7 +57,8 @@ export default Route.extend({ if (ctr) { set(model, 'clusterTemplateRevision', ctr); - this.clusterTemplateService.cloneAndPopulateClusterConfig(cluster, ctr); + // This is breaking fields that already have values that don't match the template, like kubernetesVersion with 1.14.x + // this.clusterTemplateService.cloneAndPopulateClusterConfig(cluster, ctr); } else { // user does not have access to the template that was used to launch a cluster // create a fake cluster that we'll use to turn into a "temaplate Revision" to be passed down to components 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 47fc65ebc..7278eca2a 100644 --- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js +++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js @@ -1449,7 +1449,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, { clusterTemplateQuestions.forEach((question) => { let path = question.variable; - if (!question.variable.includes('uiOverride') && question.default) { + if (!this.isEdit && !question.variable.includes('uiOverride') && question.default) { deepSet(primaryResource, path, question.default); }