rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix undefined errors when no cluster config exists 

rancher/rancher#21816
This commit is contained in:
Westly Wright 2019-07-29 12:48:26 -07:00
parent 5a97de9bfe
commit 9c315341fa
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/global-admin/addon/cluster-templates/new-revision/route.js
View File

@ -1,7 +1,8 @@
import Route from '@ember/routing/route'; import Route from '@ember/routing/route';
import { inject as service } from '@ember/service'; import { inject as service } from '@ember/service';
import { get } from '@ember/object'; import { get, set } from '@ember/object';
import { hash } from 'rsvp'; import { hash } from 'rsvp';
import { isEmpty } from '@ember/utils';
export default Route.extend({ export default Route.extend({
globalStore: service(), globalStore: service(),
@ -22,6 +23,10 @@ export default Route.extend({
tempId = template.defaultRevisionId; tempId = template.defaultRevisionId;
} }
if (isEmpty(tempRevision.clusterConfig.rancherKubernetesEngineConfig)) {
set(tempRevision, 'clusterConfig.rancherKubernetesEngineConfig', this.globalStore.createRecord({ type: 'rancherKubernetesEngineConfig' }));
}
return hash({ return hash({
clusterTemplate: template, clusterTemplate: template,
clusterTemplateRevision: tempRevision, clusterTemplateRevision: tempRevision,
@ -37,6 +42,10 @@ export default Route.extend({
tempId = get(revisions, 'firstObject').defaultRevisionId; tempId = get(revisions, 'firstObject').defaultRevisionId;
} }
if (isEmpty(tempRevision.clusterConfig.rancherKubernetesEngineConfig)) {
set(tempRevision, 'clusterConfig.rancherKubernetesEngineConfig', this.globalStore.createRecord({ type: 'rancherKubernetesEngineConfig' }));
}
return hash({ return hash({
clusterTemplate: template, clusterTemplate: template,
clusterTemplateRevision: tempRevision, clusterTemplateRevision: tempRevision,

2
lib/shared/addon/components/form-versions/component.js
View File

@ -71,7 +71,7 @@ export default Component.extend({
let maxVersion = maxSatisfying(versions, defaultK8sVersionRange); let maxVersion = maxSatisfying(versions, defaultK8sVersionRange);
if (applyClusterTemplate || clusterTemplateCreate) { if (applyClusterTemplate || clusterTemplateCreate) {
var overrideMatch = clusterTemplateQuestions.findBy('variable', 'rancherKubernetesEngineConfig.kubernetesVersion'); var overrideMatch = ( clusterTemplateQuestions || [] ).findBy('variable', 'rancherKubernetesEngineConfig.kubernetesVersion');
if (overrideMatch && !isEmpty(overrideMatch.satisfies)) { if (overrideMatch && !isEmpty(overrideMatch.satisfies)) {
supportedVersionsRange = overrideMatch.satisfies; supportedVersionsRange = overrideMatch.satisfies;