mirror of https://github.com/rancher/ui.git
Merge pull request #4270 from westlywright/feature.rancherd.displaydriver
RancherD Display Provider
This commit is contained in:
commit
084bc17488
|
|
@ -231,10 +231,9 @@ export default Resource.extend(Grafana, ResourceUsage, {
|
||||||
return 'custom';
|
return 'custom';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return firstPool.driver || get(firstPool, 'nodeTemplate.driver') || null;
|
return firstPool.driver || get(firstPool, 'nodeTemplate.driver') || null;
|
||||||
default:
|
default:
|
||||||
if (get(this, 'driver') && get(this, 'configName')) {
|
if (get(this, 'driver')) {
|
||||||
return get(this, 'driver');
|
return get(this, 'driver');
|
||||||
} else {
|
} else {
|
||||||
return 'import';
|
return 'import';
|
||||||
|
|
@ -247,6 +246,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
|
||||||
const pools = get(this, 'nodePools');
|
const pools = get(this, 'nodePools');
|
||||||
const firstPool = (pools || []).objectAt(0);
|
const firstPool = (pools || []).objectAt(0);
|
||||||
const configName = get(this, 'configName');
|
const configName = get(this, 'configName');
|
||||||
|
const driverName = get(this, 'driver');
|
||||||
|
|
||||||
switch ( configName ) {
|
switch ( configName ) {
|
||||||
case 'amazonElasticContainerServiceConfig':
|
case 'amazonElasticContainerServiceConfig':
|
||||||
|
|
@ -280,8 +280,13 @@ export default Resource.extend(Grafana, ResourceUsage, {
|
||||||
return intl.t('clusterNew.custom.shortLabel');
|
return intl.t('clusterNew.custom.shortLabel');
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
if (get(this, 'driver') && get(this, 'configName')) {
|
if (driverName) {
|
||||||
return get(this, 'driver').capitalize();
|
switch (driverName) {
|
||||||
|
case 'rancherd':
|
||||||
|
return intl.t('clusterNew.rancherd.shortLabel');
|
||||||
|
default:
|
||||||
|
return driverName.capitalize();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return intl.t('clusterNew.import.shortLabel');
|
return intl.t('clusterNew.import.shortLabel');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4182,6 +4182,8 @@ clusterNew:
|
||||||
quick: Quick Create
|
quick: Quick Create
|
||||||
custom: Custom Create
|
custom: Custom Create
|
||||||
existing: Existing
|
existing: Existing
|
||||||
|
rancherd:
|
||||||
|
shortLabel: RancherD
|
||||||
|
|
||||||
rke:
|
rke:
|
||||||
upgradeStrategy:
|
upgradeStrategy:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue