Tidy up checking of virtual cluster

nwmac · May 20, 2024 · 4708b10 · 4708b10
1 parent fe1c02a
commit 4708b10
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/pkg/virtual-clusters/provisioner.ts b/pkg/virtual-clusters/provisioner.ts
@@ -48,6 +48,10 @@ export class VClustersProvisioner implements IClusterProvisioner {
     return 'vCluster';
   }
 
+  parentCluster(cluster: ICluster): string {
+    return cluster.metadata?.annotations?.['ui.rancher/parent-cluster'];
+  }
+
   async postDelete(cluster: ICluster): Promise<any> {
     const parentClusterId = cluster.metadata?.annotations?.['ui.rancher/parent-cluster'];
     const namespace = cluster.metadata?.annotations?.['ui.rancher/vcluster-namespace'];

diff --git a/shell/models/provisioning.cattle.io.cluster.js b/shell/models/provisioning.cattle.io.cluster.js
@@ -16,6 +16,11 @@ import { CAPI as CAPI_ANNOTATIONS } from '@shell/config/labels-annotations';
  * @extends SteveModel
  */
 export default class ProvCluster extends SteveModel {
+  /**
+   * customProvisionerHelper returns a custom helper if applicable for this cluster
+   * 
+   * This is cached after the first time
+   */
   get customProvisionerHelper() {
     const fromAnnotation = this.annotations?.[CAPI_ANNOTATIONS.UI_CUSTOM_PROVIDER];
 
@@ -39,6 +44,7 @@ export default class ProvCluster extends SteveModel {
       }
     }
 
+    // Helper, of undefined if no helper for this cluster
     return this.customProvisionerHelperObject;
   }
 
@@ -935,36 +941,23 @@ export default class ProvCluster extends SteveModel {
     }
 
     // If this cluster has a custom provisioner, allow it to do custom deletion
-    const customProvisionerCls = this.$rootState.$plugin.getDynamic('provisioner', this.machineProvider);
-
-    if (customProvisionerCls) {
-      const context = {
-        dispatch: this.$dispatch,
-        getters:  this.$getters,
-        $plugin:  this.$rootState.$plugin,
-        $t:       this.t
-      };
-
-      const customProv = new customProvisionerCls(context);
-
-      if (customProv?.postDelete) {
-        await customProv.postDelete(this);
-      }
+    if (this.customProvisionerHelper?.postDelete) {
+      return this.customProvisionerHelper?.postDelete(this);
     }
   }
 
   get groupByParent() {
-    return this.metadata.annotations?.['ui.rancher/parent-cluster'];
+    // Customer helper can report if the cluster has a parent cluster
+    return this.customProvisionerHelper?.parentCluster(this);
   }
 
   get groupByLabel() {
     const name = this.groupByParent;
 
     if (name) {
-      // return this.$rootGetters['i18n/t']('resourceTable.groupLabel.project', { name: escapeHtml(name) });
-      return `Cluster: ${ name }`;
+      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
     } else {
-      return 'Real Clusters';
+      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.realCluster');
     }
   }