Fix azure required fields, rke templates option location

This commit is contained in:
Vincent Fiduccia 2019-08-30 17:49:12 -07:00
parent 11e68be1aa
commit 01b07bdd9a
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
6 changed files with 18 additions and 19 deletions

View File

@ -83,7 +83,7 @@ export default Component.extend({
}
});
return all(promises);
return all(promises).catch(() => resolve());
});
} else {
return resolve();

View File

@ -295,15 +295,6 @@ const rootNav = [
route: 'global-admin.clusters',
resource: ['cluster'],
resourceScope: 'global',
submenu: [
{
id: 'rke-template',
localizedLabel: 'nav.admin.clusters.rkeTemplate',
route: 'global-admin.cluster-templates',
resource: ['clustertemplate'],
resourceScope: 'global',
},
],
},
{
scope: 'global',
@ -402,6 +393,13 @@ const rootNav = [
// resource: ['globaldns'],
// resourceScope: 'global',
// },
{
id: 'rke-template',
localizedLabel: 'nav.admin.clusters.rkeTemplate',
route: 'global-admin.cluster-templates',
resource: ['clustertemplate'],
resourceScope: 'global',
},
],
},
// {

View File

@ -979,7 +979,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
const azureProvider = get(revision, 'clusterConfig.rancherKubernetesEngineConfig.cloudProvider.azureCloudProvider') || {};
if ( cloudProvider === 'azure' ) {
const azureQuestions = (get(revision, 'nuestions') || []).map((x) => x.variable.replace(/^rancherKubernetesEngineConfig\.cloudProvider\.azureCloudProvider\./, ''));
const azureQuestions = (get(revision, 'questions') || []).map((x) => x.variable.replace(/^rancherKubernetesEngineConfig\.cloudProvider\.azureCloudProvider\./, ''));
const requiredFields = Object.keys(AzureInfo).filter((k) => AzureInfo[k].required);
requiredFields.forEach((key) => {

View File

@ -129,6 +129,10 @@ export default Component.extend({
} else {
if (this.configName) {
next(() => {
if ( this.destroyed || this.destroying) {
return;
}
set(this, 'selectedCloudProvider', this.configName);
});
}
@ -136,6 +140,10 @@ export default Component.extend({
} else {
if (!this.configName) {
next(() => {
if ( this.destroyed || this.destroying) {
return;
}
set(this, 'selectedCloudProvider', this.selectedCloudProvider === 'generic' ? 'generic' : 'none');
});
}

View File

@ -1,10 +1,3 @@
<div class="banner bg-info">
<div class="banner-icon"><i class="icon icon-info"></i></div>
<div class="banner-message">
{{t 'cruClusterTemplate.infoBanner'}}
</div>
</div>
<div class="row">
<div class="col span-6">
<FormNameDescription

View File

@ -237,7 +237,7 @@ export default Component.extend({
(get(this, 'nodePools') || []).forEach((pool) => {
const templateId = get(pool, 'nodeTemplateId');
if ( !templates.findBy('id', templateId) ) {
if ( templateId && !templates.findBy('id', templateId) ) {
templates.push(get(this, 'globalStore').createRecord({
type: 'nodetemplate',
id: templateId,