@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.3

package/models/base-cluster.x-k8s.io.js

@@ -0,0 +1,26 @@
+import { escapeHtml } from '@shell/utils/string';
+import SteveModel from '@shell/plugins/steve/steve-class';
+import { CAPI } from '@shell/config/types';
+
+export default class CapiMachineRoot extends SteveModel {
+  get cluster() {
+    if ( !this.spec.clusterName ) {
+      return null;
+    }
+
+    // This is used to get the cluster's human name
+    // Ideally we get this via the management cluster. To find it though we have to go via the provisioning cluster. So might as well just use that
+
+    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
+
+    return this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
+  }
+
+  get clusterName() {
+    return this.cluster?.nameDisplay || this.spec.clusterName;
+  }
+
+  get groupByLabel() {
+    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(this.clusterName) });
+  }
+}

package/models/catalog.cattle.io.app.js

@@ -78,28 +78,32 @@ export default class CatalogApp extends SteveModel {
       return [];
     }
 
-    // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
-    const thisHome = chart?.metadata?.home;
-    const bestMatches = matchingCharts.filter(({ versions }) => {
-      // First checking if the latest version has the same home value
-      if (thisHome === versions[0]?.home) {
-        return true;
-      }
+    if (!repoName || matchingCharts.length > 1) {
+      // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
+      const thisHome = chart?.metadata?.home;
+      const bestMatches = matchingCharts.filter(({ versions }) => {
+        // First checking if the latest version has the same home value
+        if (thisHome === versions[0]?.home) {
+          return true;
+        }
 
-      for (let i = 1; i < versions.length; i++) {
-        const { version, home } = versions[i];
+        for (let i = 1; i < versions.length; i++) {
+          const { version, home } = versions[i];
 
-        // Finding the exact version, if the version is not there, then most likely it's not a match
-        // if the exact version is found, then we can compare the home value
-        if (version === this.currentVersion && (home === thisHome)) {
-          return true;
+          // Finding the exact version, if the version is not there, then most likely it's not a match
+          // if the exact version is found, then we can compare the home value
+          if (version === this.currentVersion && (home === thisHome)) {
+            return true;
+          }
         }
-      }
 
-      return false;
-    });
+        return false;
+      });
+
+      return bestMatches;
+    }
 
-    return bestMatches;
+    return matchingCharts;
   }
 
   get currentVersion() {

package/models/catalog.cattle.io.clusterrepo.js

@@ -41,26 +41,54 @@ export default class ClusterRepo extends SteveModel {
       });
 
       insertAt(out, 0, {
-        action:   'refresh',
-        label:    this.t('action.refresh'),
-        icon:     'icon icon-refresh',
-        enabled:  !!this.links.update,
-        bulkable: true,
+        action:     'refresh',
+        label:      this.t('action.refresh'),
+        icon:       'icon icon-refresh',
+        enabled:    !!this.links.update,
+        bulkable:   true,
+        bulkAction: 'refreshBulk',
       });
     }
 
     return out;
   }
 
-  async refresh() {
-    const now = (new Date()).toISOString().replace(/\.\d+Z$/, 'Z');
+  /**
+   * Refreshes the repository by updating its forceUpdate annotation and waiting for it to become active.
+   * @param {boolean} dispatchLoad - Whether to dispatch the catalog/load action after refreshing. Defaults to true.
+   */
+  async refresh(dispatchLoad = true) {
+    try {
+      const now = (new Date()).toISOString().replace(/\.\d+Z$/, 'Z');
 
-    this.spec.forceUpdate = now;
-    await this.save();
+      this.spec.forceUpdate = now;
+      await this.save();
+
+      await this.waitForState('active', 10000, 1000);
 
-    await this.waitForState('active', 10000, 1000);
+      if (dispatchLoad) {
+        this.$dispatch('catalog/load', { force: true, repoKeys: [this._key] }, { root: true });
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', {
+        title: this.t('catalog.repo.error.refresh', {}, 'Error refreshing repository'),
+        err,
+      }, { root: true });
+    }
+  }
 
-    this.$dispatch('catalog/load', { force: true, reset: true }, { root: true });
+  /**
+   * Performs a bulk refresh on multiple repositories concurrently, bypassing individual
+   * catalog loads, and dispatches a single catalog/load for all repositories once they are active.
+   * @param {ClusterRepo[]} items - Array of repository instances to refresh.
+   */
+  async refreshBulk(items) {
+    await Promise.allSettled(items.map((item) => item.refresh(false)));
+
+    this.$dispatch('catalog/load', {
+      force:    true,
+      repoKeys: items.map((item) => item._key)
+    }, { root: true });
   }
 
   async disableClusterRepo() {

package/models/chart.js

@@ -5,8 +5,9 @@ import {
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { SHOW_PRE_RELEASE } from '@shell/store/prefs';
 import { getLatestCompatibleVersion } from '@shell/utils/chart';
+import { isMissingDate } from '@shell/utils/time';
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { CATALOG, ZERO_TIME } from '@shell/config/types';
+import { CATALOG } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import day from 'dayjs';
 
@@ -89,22 +90,33 @@ export default class Chart extends SteveModel {
   }
 
   /**
-   * Determines if the chart is installed by checking if exactly one matching installed app is found.
+   * Determines if the chart is installed by checking if at least one matching installed app is found.
    *
    * @returns {boolean} `true` if the chart is currently installed.
    */
   get isInstalled() {
-    return this.matchingInstalledApps.length === 1;
+    return this.matchingInstalledApps.length >= 1;
   }
 
   /**
-   * Determines if the installed app has a single available upgrade.
+   * Determines if at least one installed instance has an available upgrade.
    * Requires the chart to be installed.
    *
-   * @returns {boolean} `true` if the app is installed and has a single upgrade available.
+   * @returns {boolean} `true` if the app is installed and at least one instance has an upgrade available.
    */
   get upgradeable() {
-    return this.isInstalled && this.matchingInstalledApps[0].upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE;
+    return this.isInstalled && this.matchingInstalledApps.some(
+      (app) => app.upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE
+    );
+  }
+
+  /**
+   * Returns the number of installed instances of this chart.
+   *
+   * @returns {number} The count of installed instances.
+   */
+  get installedCount() {
+    return this.matchingInstalledApps.length;
   }
 
   /**
@@ -140,25 +152,19 @@ export default class Chart extends SteveModel {
     const subHeaderItems = [];
 
     if (latestVersion) {
-      const hasZeroTime = latestVersion.created === ZERO_TIME;
-
       subHeaderItems.push({
         icon:        'icon-version-alt',
         iconTooltip: { key: 'tableHeaders.version' },
         label:       latestVersion.version
       });
 
-      const lastUpdatedItem = {
-        icon:        'icon-refresh-alt',
-        iconTooltip: { key: 'tableHeaders.lastUpdated' },
-        label:       hasZeroTime ? this.t('generic.na') : day(latestVersion.created).format('MMM D, YYYY')
-      };
-
-      if (hasZeroTime) {
-        lastUpdatedItem.labelTooltip = this.t('catalog.charts.appChartCard.subHeaderItem.missingVersionDate');
+      if (!isMissingDate(latestVersion.created)) {
+        subHeaderItems.push({
+          icon:        'icon-refresh-alt',
+          iconTooltip: { key: 'tableHeaders.lastUpdated' },
+          label:       day(latestVersion.created).format('MMM D, YYYY')
+        });
       }
-
-      subHeaderItems.push(lastUpdatedItem);
     }
 
     const footerItems = [
@@ -206,10 +212,18 @@ export default class Chart extends SteveModel {
     }
 
     if (this.isInstalled) {
+      const hasMultipleInstances = this.installedCount > 1;
       const installedVersion = this.matchingInstalledApps[0]?.spec?.chart?.metadata?.version;
 
+      // When multiple instances, don't show version in tooltip since each may have different versions
+      let tooltipText = hasMultipleInstances ? this.t('generic.installedMultiple') : this.t('generic.installed');
+
+      if (!hasMultipleInstances) {
+        tooltipText = `${ tooltipText } (${ installedVersion })`;
+      }
+
       statuses.push({
-        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: `${ this.t('generic.installed') } (${ installedVersion })` }
+        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: tooltipText }
       });
     }
 

package/models/cluster.js

@@ -69,6 +69,6 @@ export default class NormanCluster extends NormanModel {
       const id = this.provisioningClusterId;
 
       return id && !!this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, id);
-    }, this.$rootGetters['i18n/t']('cluster.managementTimeout'), timeout, interval);
+    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: CAPI.RANCHER_CLUSTER, name: this.provisioningClusterId }), timeout, interval);
   }
 }

package/models/cluster.x-k8s.io.machine.js

@@ -2,11 +2,10 @@ import { ADDRESSES, CAPI, NODE } from '@shell/config/types';
 import { CAPI as CAPI_LABELS, MACHINE_ROLES } from '@shell/config/labels-annotations';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
-import { escapeHtml } from '@shell/utils/string';
 import { insertAt, findBy } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
 import { downloadUrl } from '@shell/utils/download';
-import SteveModel from '@shell/plugins/steve/steve-class';
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
 /**
  * Prevent scaling down control plane or etcd machines to zero
@@ -53,7 +52,8 @@ export function notOnlyOfRole(current, all) {
 
   return false;
 }
-export default class CapiMachine extends SteveModel {
+
+export default class CapiMachine extends CapiMachineRoot {
   get _availableActions() {
     const out = super._availableActions;
 
@@ -144,18 +144,6 @@ export default class CapiMachine extends SteveModel {
     return await this.$dispatch('find', { type: kind, id });
   }
 
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
-
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
   get poolName() {
     return this.metadata?.labels?.[ CAPI_LABELS.DEPLOYMENT_NAME ] || '';
   }
@@ -182,7 +170,7 @@ export default class CapiMachine extends SteveModel {
       return {
         name:   'c-cluster-product-resource-id',
         params: {
-          cluster:  this.cluster.status.clusterName,
+          cluster,
           product:  EXPLORER,
           resource: NODE,
           id:       kubeId
@@ -193,12 +181,6 @@ export default class CapiMachine extends SteveModel {
     return kubeId;
   }
 
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
-
   get labels() {
     return this.metadata?.labels || {};
   }

package/models/cluster.x-k8s.io.machinedeployment.js

@@ -1,33 +1,15 @@
 import { CAPI } from '@shell/config/types';
 import { escapeHtml } from '@shell/utils/string';
 import { sortBy } from '@shell/utils/sort';
-import SteveModel from '@shell/plugins/steve/steve-class';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { handleConflict } from '@shell/plugins/dashboard-store/normalize';
 import { CAPI as CAPI_ANNOTATIONS, MACHINE_ROLES } from '@shell/config/labels-annotations';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 import { KIND } from '../config/elemental-types';
 import { KIND as HARVESTER_KIND } from '../config/harvester-manager-types';
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
-export default class CapiMachineDeployment extends SteveModel {
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
-
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
-
+export default class CapiMachineDeployment extends CapiMachineRoot {
   get groupByPoolLabel() {
     return `${ this.$rootGetters['i18n/t']('resourceTable.groupLabel.machinePool', { name: escapeHtml(this.nameDisplay) }) }`;
   }

package/models/cluster.x-k8s.io.machineset.js

@@ -1,23 +1,5 @@
-import { CAPI } from '@shell/config/types';
-import { escapeHtml } from '@shell/utils/string';
-import SteveModel from '@shell/plugins/steve/steve-class';
 
-export default class CapiMachineSet extends SteveModel {
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
+export default class CapiMachineSet extends CapiMachineRoot {
 }

package/models/compliance.cattle.io.clusterscan.js

@@ -65,8 +65,29 @@ export default class ClusterScan extends SteveModel {
       total:   1,
     };
 
+    const downloadReportXCCDF = {
+      action:  'downloadLatestReportXCCDF',
+      enabled: this.hasReport,
+      icon:    'icon icon-download',
+      label:   t('compliance.downloadReportXCCDF'),
+      total:   1,
+    };
+
+    const downloadAllReportsXCCDF = {
+      action:  'downloadAllReportsXCCDF',
+      enabled: this.hasReport,
+      icon:    'icon icon-download',
+      label:   t('compliance.downloadAllReportsXCCDF'),
+      total:   1,
+    };
+
     if (this.hasReports) {
       out.unshift({ divider: true });
+      if (this.spec?.scheduledScanConfig?.cronSchedule) {
+        out.unshift(downloadAllReportsXCCDF);
+        downloadReportXCCDF.label = t('compliance.downloadLatestReportXCCDF');
+      }
+      out.unshift(downloadReportXCCDF);
       if (this.spec?.scheduledScanConfig?.cronSchedule) {
         out.unshift(downloadAllReports);
         downloadReport.label = t('compliance.downloadLatestReport');
@@ -121,7 +142,7 @@ export default class ClusterScan extends SteveModel {
 
       downloadFile(`${ labelFor(report) }.csv`, csv, 'application/csv');
     } catch (err) {
-      this.$dispatch('growl/fromError', { title: 'Error downloading file', err }, { root: true });
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
     }
   }
 
@@ -143,7 +164,7 @@ export default class ClusterScan extends SteveModel {
 
         toZip[`${ labelFor(report) }.csv`] = csv;
       } catch (err) {
-        this.$dispatch('growl/fromError', { title: 'Error downloading file', err }, { root: true });
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
       }
     });
     if (!isEmpty(toZip)) {
@@ -153,6 +174,113 @@ export default class ClusterScan extends SteveModel {
     }
   }
 
+  async _resolveBenchmark() {
+    const profileName = this.status?.lastRunScanProfileName;
+
+    if (!profileName) {
+      return null;
+    }
+    const profile = await this.$dispatch('find', { type: COMPLIANCE.CLUSTER_SCAN_PROFILE, id: profileName });
+    const benchmarkId = profile?.spec?.benchmarkVersion;
+
+    if (!benchmarkId) {
+      return null;
+    }
+
+    return this.$dispatch('find', { type: COMPLIANCE.BENCHMARK, id: benchmarkId });
+  }
+
+  async downloadLatestReportXCCDF() {
+    const reports = await this.getReports() || [];
+    const report = sortBy(reports, 'metadata.creationTimestamp', true)[0];
+
+    try {
+      const benchmark = await this._resolveBenchmark();
+      const { generateXCCDFPerNode } = await import(/* webpackChunkName: "xccdf" */'@shell/utils/xccdf');
+
+      const parsed = report.parsedReport || {};
+      const common = {
+        report:           parsed,
+        benchmarkVersion: parsed.version || benchmark?.spec?.benchmarkVersion || '',
+        metadata:         benchmark?.spec?.benchmarkMetadata || {},
+        stigChecks:       benchmark?.spec?.stigChecks || {},
+      };
+
+      const toZip = {};
+
+      if (!Object.entries(parsed.nodes || {}).length) {
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorNoParsedNodes') }, { root: true });
+      } else {
+        Object.entries(parsed.nodes || {}).forEach(([role, hosts]) => {
+          (hosts || []).forEach((hostname) => {
+            const xml = generateXCCDFPerNode({
+              ...common, hostname, role,
+            });
+
+            toZip[`${ labelFor(report) }--${ hostname }.xml`] = xml;
+          });
+        });
+
+        if (!isEmpty(toZip)) {
+          const zip = await generateZip(toZip);
+
+          downloadFile(`${ labelFor(report) }-per-node.zip`, zip, 'application/zip');
+        }
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+    }
+  }
+
+  async downloadAllReportsXCCDF() {
+    const toZip = {};
+    const reports = await this.getReports() || [];
+
+    try {
+      const benchmark = await this._resolveBenchmark();
+      const { generateXCCDFPerNode } = await import(/* webpackChunkName: "xccdf" */'@shell/utils/xccdf');
+
+      const hasParsedNodes = reports.some((report) => Object.entries(report.parsedReport?.nodes || {}).length);
+
+      if (!hasParsedNodes) {
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorNoParsedNodes') }, { root: true });
+      } else {
+        reports.forEach((report) => {
+          try {
+            const parsed = report.parsedReport || {};
+            const common = {
+              report:           parsed,
+              benchmarkVersion: parsed.version || benchmark?.spec?.benchmarkVersion || '',
+              metadata:         benchmark?.spec?.benchmarkMetadata || {},
+              stigChecks:       benchmark?.spec?.stigChecks || {},
+            };
+            const folder = labelFor(report);
+
+            Object.entries(parsed.nodes || {}).forEach(([role, hosts]) => {
+              (hosts || []).forEach((hostname) => {
+                const xml = generateXCCDFPerNode({
+                  ...common, hostname, role,
+                });
+
+                toZip[`${ folder }/${ hostname }.xml`] = xml;
+              });
+            });
+          } catch (err) {
+            this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+          }
+        });
+
+        if (!isEmpty(toZip)) {
+          generateZip(toZip).then((zip) => {
+            downloadFile(`${ this.id }-reports-xccdf-per-node.zip`, zip, 'application/zip');
+          });
+        }
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+    }
+  }
+
   get scanProfileLink() {
     if (this.status?.lastRunScanProfileName) {
       return {

package/models/ext.cattle.io.kubeconfig.ts

@@ -1,4 +1,4 @@
-import { CAPI, MANAGEMENT } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { Location } from 'vue-router';
 
@@ -49,16 +49,13 @@ export default class Kubeconfig extends SteveModel {
    */
   get referencedClusters(): ReferencedCluster[] {
     const clusterIds = this.spec?.clusters || [];
-    const provClusters = this.$rootGetters['management/all'](CAPI.RANCHER_CLUSTER) || [];
-    const mgmtClusters = this.$rootGetters['management/all'](MANAGEMENT.CLUSTER) || [];
 
     return clusterIds.map((id: string) => {
-      const provCluster = provClusters.find((c: any) => c.mgmt?.id === id || c.status?.clusterName === id);
-      const mgmtCluster = mgmtClusters.find((c: any) => c.id === id);
-      const cluster = provCluster || mgmtCluster;
+      const mgmtCluster = this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, id);
+      const provCluster = mgmtCluster?.provCluster;
 
       return {
-        label:    cluster?.nameDisplay || this.t('"ext.cattle.io.kubeconfig".deleted', { name: id }),
+        label:    mgmtCluster?.nameDisplay || this.t('"ext.cattle.io.kubeconfig".deleted', { name: id }),
         location: provCluster?.detailLocation || mgmtCluster?.detailLocation || null
       };
     });

package/models/fleet-application.js

@@ -7,6 +7,7 @@ import { addObject, addObjects, findBy } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { mapStateToEnum, primaryDisplayStatusFromCount, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import FleetUtils from '@shell/utils/fleet';
+import { HARVESTER_CONTAINER } from '@shell/store/features';
 
 function normalizeStateCounts(data) {
   if (isEmpty(data)) {
@@ -105,7 +106,7 @@ export default class FleetApplication extends SteveModel {
 
     for (const tgt of this.spec.targets) {
       if (tgt.clusterName) {
-        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
+        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName) || findBy(clusters, 'nameDisplay', tgt.clusterName);
 
         if (cluster) {
           addObject(out, cluster);
@@ -138,7 +139,8 @@ export default class FleetApplication extends SteveModel {
   }
 
   get targetInfo() {
-    const mode = FleetUtils.Application.getTargetMode(this.spec.targets || [], this.metadata.namespace);
+    const areHarvesterHostsVisible = this.$rootGetters['features/get'](HARVESTER_CONTAINER);
+    const mode = FleetUtils.Application.getTargetMode(this.spec.targets || [], this.metadata.namespace, areHarvesterHostsVisible);
 
     return {
       mode,

package/models/fleet.cattle.io.bundle.js

@@ -47,7 +47,7 @@ export default class FleetBundle extends SteveModel {
 
     for (const tgt of this.spec.targets) {
       if (tgt.clusterName) {
-        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
+        const cluster = findBy(clusters, 'metadata.name', tgt.clusterName) || findBy(clusters, 'nameDisplay', tgt.clusterName);
 
         if (cluster) {
           addObject(out, cluster);

package/models/kontainerdriver.js

@@ -5,6 +5,13 @@ export default class KontainerDriver extends Driver {
     return 'c-cluster-manager-driver-kontainerdriver';
   }
 
+  get parentLocationOverride() {
+    return {
+      name:   'c-cluster-manager-driver-kontainerdriver',
+      params: { cluster: this.$rootGetters['clusterId'] }
+    };
+  }
+
   get _availableActions() {
     const out = [
       {
@@ -54,6 +61,10 @@ export default class KontainerDriver extends Driver {
     return out;
   }
 
+  get isEmber() {
+    return !this.builtIn && !this.builtin;
+  }
+
   deactivate(resources = [this]) {
     this.$dispatch('promptModal', {
       componentProps: { drivers: resources, driverType: 'kontainerDrivers' },

package/models/management.cattle.io.authconfig.js

@@ -21,7 +21,11 @@ export const configType = {
   cognito:         'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };
+const imageOverrides = {
+  azuread:      'entraid',
+  keycloakoidc: 'keycloak',
+  genericoidc:  'openid',
+};
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {