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

Tweaks

This commit is contained in:
Neil MacDougall 2021-05-05 15:43:03 +01:00
parent 84410eb570
commit 355ab6705b
3 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/images/providers/azure.svg Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
<style type="text/css">
.st0{fill:#00AAF2;}
</style>
<g>
<path class="st0" d="M75,63.2c0,3.5,0,7,0,10.5c0,1.2-0.4,1.5-1.5,1.3c-7.9-1.2-15.7-2.3-23.6-3.3c-1.4-0.2-1.9-0.7-1.9-2.2
c0.1-5.6,0.1-11.2,0-16.8c0-1.2,0.4-1.6,1.6-1.6c7.9,0,15.9,0,23.8,0c1.3,0,1.6,0.5,1.6,1.6C75,56.1,75,59.6,75,63.2z"/>
<path class="st0" d="M61.6,48.9c-4,0-8,0-11.9,0c-1.2,0-1.7-0.3-1.7-1.7c0.1-5.7,0.1-11.3,0-17c-0.2-0.7,0.3-1.5,1-1.6
c0.1,0,0.3,0,0.4,0c8.1-1.1,16.3-2.3,24.4-3.5c1.4-0.2,1.2,0.8,1.2,1.5c0,5.1,0,10.2,0,15.2c0,1.9,0,3.7,0,5.6
c0,1.1-0.4,1.5-1.5,1.5C69.5,48.9,65.6,48.9,61.6,48.9z"/>
<path class="st0" d="M35.3,51c3,0,6,0,8.9,0c0.6-0.2,1.2,0.2,1.4,0.8c0,0.2,0.1,0.4,0,0.5c0,5.8,0,11.7,0,17.5c0,1-0.5,1.1-1.3,1
c-5.9-0.9-11.8-1.7-17.7-2.5c-0.8,0.1-1.5-0.6-1.6-1.4c0-0.1,0-0.3,0-0.4c0.1-4.7,0.1-9.3,0-14c0-1.1,0.3-1.5,1.5-1.5
C29.4,51.1,32.4,51,35.3,51z"/>
<path class="st0" d="M35.3,48.9c-2.9,0-5.8,0-8.8,0c-1.1,0-1.5-0.4-1.5-1.5c0-4.6,0-9.2,0-13.8c-0.2-0.7,0.3-1.5,1-1.6
c0.1,0,0.3,0,0.4,0c5.9-0.8,11.8-1.6,17.6-2.6c1.4-0.2,1.5,0.3,1.5,1.3c0,5.6,0,11.2,0,16.8c0,1.2-0.5,1.4-1.6,1.4L35.3,48.9z"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

10
assets/translations/en-us.yaml
View File

@ -128,7 +128,6 @@ product:
clusterManagement: Cluster Management
monitoring: Monitoring
suffix:
percent: "%"
cpus: CPUs
@ -159,10 +158,8 @@ accountAndKeys:
change: Change Password
apiKeys:
title: API Keys
notAllowed: You do not have permission to manage API Keys
add:
description:
label: Description
notAllowed: You do no
n
placeholder: Optionally enter a description to help you identify this API Key
label: Create API Key
expiry:
@ -871,7 +868,8 @@ cluster:
providerGroup:
create-custom: Use existing nodes and create a cluster using RKE
create-kontainer: Create a cluster in a hosted Kuberetes provider
create-machine: Provision new nodes and create a cluster using RKE
create-machine: Provision new nodes and create a cluster using RKE2
create-machine1: Provision new nodes and create a cluster using RKE
create-template: Use a Catalog Template to create a cluster
register-custom: Import any Kubernetes cluster
rke2:

13
edit/provisioning.cattle.io.cluster/index.vue
View File

@ -26,6 +26,12 @@ const SORT_GROUPS = {
custom1: 5,
};
// Map some provider IDs to icon names where they don't directly match
const ICON_MAPPINGS = {
//azure: 'azureaks',
linode: 'linodelke',
}
export default {
name: 'CruCluster',
@ -120,13 +126,12 @@ export default {
const rkeMachineTypes = [];
// 'amazonec2', 'azure', 'digitalocean', 'linode', 'vsphere'];
// TODO: Sort
// TODO: Can list refresh when the node drivers are activated/deactivated in another session?
this.nodeDrivers.forEach((nd) => {
if (nd.spec.active) {
rkeMachineTypes.push(nd.id);
}
});
rkeMachineTypes.sort();
kontainerTypes.forEach((id) => {
addType(id, 'kontainer', true);
@ -165,9 +170,11 @@ export default {
const description = getters['i18n/withFallback'](`cluster.providerDescription."${ id }"`, null, '');
let icon = require('~/assets/images/generic-driver.svg');
const iconID = ICON_MAPPINGS[id] || id;
if ( group !== 'template' ) {
try {
icon = require(`~/assets/images/providers/${ id }.svg`);
icon = require(`~/assets/images/providers/${ iconID }.svg`);
} catch (e) {}
}