From deba8fa2ee88a5700a59656dd606ec5c29bdbb23 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Mon, 16 Aug 2021 12:04:59 -0700
Subject: [PATCH] vsphere -> rancher-vsphere (rancher/issues#33875)

---
 assets/translations/en-us.yaml               | 12 ++++++++++--
 edit/provisioning.cattle.io.cluster/rke2.vue | 10 +++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml
index d83ad9bde1..4ffcbec16c 100644
--- a/assets/translations/en-us.yaml
+++ b/assets/translations/en-us.yaml
@@ -884,13 +884,21 @@ cluster:
     rke2-kube-proxy: Kube Proxy Configuration
     rke2-metrics-server: Metrics Server Configuration
     rke2-multus: Multus Configuration
-
   agentEnvVars:
     label: Agent Environment
     detail: Add additional environment variables to the agent container.  This is most commonly useful for configuring a HTTP proxy.
     keyLabel: Variable Name
   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.'
   custom:
     nodeRole:
diff --git a/edit/provisioning.cattle.io.cluster/rke2.vue b/edit/provisioning.cattle.io.cluster/rke2.vue
index 2744440584..41906e7b32 100644
--- a/edit/provisioning.cattle.io.cluster/rke2.vue
+++ b/edit/provisioning.cattle.io.cluster/rke2.vue
@@ -431,7 +431,7 @@ export default {
       for ( const opt of this.agentArgs['cloud-provider-name'].options ) {
         if ( !preferred || opt === preferred || opt === 'external' ) {
           out.push({
-            label: opt,
+            label: this.$store.getters['i18n/withFallback'](`cluster.cloudProvider."${ opt }".label`, null, opt),
             value: opt,
           });
         }
@@ -600,7 +600,7 @@ export default {
       switch ( name ) {
       case 'none': return false;
       case 'aws': return false;
-      case 'vsphere': return false;
+      case 'rancher-vsphere': return false;
       default: return true;
       }
     },
@@ -612,7 +612,7 @@ export default {
 
       const name = this.agentConfig['cloud-provider-name'];
 
-      return name === 'vsphere';
+      return name === 'rancher-vsphere';
     },
 
     showCni() {
@@ -629,7 +629,7 @@ export default {
         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');
       }
 
@@ -1104,7 +1104,7 @@ export default {
           </div>
 
           <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 v-else-if="showCloudConfigYaml">
             <div class="spacer" />