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

vsphere -> rancher-vsphere (rancher/issues#33875)

This commit is contained in:
Vincent Fiduccia 2021-08-16 12:04:59 -07:00
parent 4b9e95fd38
commit deba8fa2ee
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -884,13 +884,21 @@ cluster:
rke2-kube-proxy: Kube Proxy Configuration rke2-kube-proxy: Kube Proxy Configuration
rke2-metrics-server: Metrics Server Configuration rke2-metrics-server: Metrics Server Configuration
rke2-multus: Multus Configuration rke2-multus: Multus Configuration
agentEnvVars: agentEnvVars:
label: Agent Environment label: Agent Environment
detail: Add additional environment variables to the agent container. This is most commonly useful for configuring a HTTP proxy. detail: Add additional environment variables to the agent container. This is most commonly useful for configuring a HTTP proxy.
keyLabel: Variable Name keyLabel: Variable Name
cloudProvider: cloudProvider:
vsphere: aws:
label: Amazon
azure:
label: Azure
external:
label: External
gcp:
label: Google
rancher-vsphere:
label: vSphere
note: '<b>Important:</b> Configure the vSphere Cloud Provider and Storage Provider options in the Add-On Config tab.' note: '<b>Important:</b> Configure the vSphere Cloud Provider and Storage Provider options in the Add-On Config tab.'
custom: custom:
nodeRole: nodeRole:

10
edit/provisioning.cattle.io.cluster/rke2.vue
View File

@ -431,7 +431,7 @@ export default {
for ( const opt of this.agentArgs['cloud-provider-name'].options ) { for ( const opt of this.agentArgs['cloud-provider-name'].options ) {
if ( !preferred || opt === preferred || opt === 'external' ) { if ( !preferred || opt === preferred || opt === 'external' ) {
out.push({ out.push({
label: opt, label: this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ opt }".label`, null, opt),
value: opt, value: opt,
}); });
} }
@ -600,7 +600,7 @@ export default {
switch ( name ) { switch ( name ) {
case 'none': return false; case 'none': return false;
case 'aws': return false; case 'aws': return false;
case 'vsphere': return false; case 'rancher-vsphere': return false;
default: return true; default: return true;
} }
}, },
@ -612,7 +612,7 @@ export default {
const name = this.agentConfig['cloud-provider-name']; const name = this.agentConfig['cloud-provider-name'];
return name === 'vsphere'; return name === 'rancher-vsphere';
}, },
showCni() { showCni() {
@ -629,7 +629,7 @@ export default {
names.push(...parts); names.push(...parts);
} }
if ( this.agentConfig['cloud-provider-name'] === 'vsphere' ) { if ( this.agentConfig['cloud-provider-name'] === 'rancher-vsphere' ) {
names.push('rancher-vsphere-cpi', 'rancher-vsphere-csi'); names.push('rancher-vsphere-cpi', 'rancher-vsphere-csi');
} }
@ -1104,7 +1104,7 @@ export default {
</div> </div>
<template v-if="showVsphereNote"> <template v-if="showVsphereNote">
<Banner color="warning" label-key="cluster.cloudProvider.vsphere.note" /> <Banner color="warning" label-key="cluster.cloudProvider.rancher-vsphere.note" />
</template> </template>
<template v-else-if="showCloudConfigYaml"> <template v-else-if="showCloudConfigYaml">
<div class="spacer" /> <div class="spacer" />