@rancher/shell 3.0.8-rc.9 → 3.0.9-rc.1

package/edit/workload/__tests__/index.test.ts

@@ -4,100 +4,138 @@ import Workload from '@shell/edit/workload/index.vue';
 jest.mock('@shell/models/secret', () => ({ onmessage: jest.fn() }));
 
 describe('component: Workload', () => {
-  it.each([
-    [
-      `pods \"test\" is forbidden: violates PodSecurity \"restricted:latest\": allowPrivilegeEscalation != false (container \"container-0\" must set securityContext.allowPrivilegeEscalation=false), unrestricted capabilities (container \"container-0\" must set securityContext.capabilities.drop=[\"ALL\"]), runAsNonRoot != true (container \"container-0\" must not set securityContext.runAsNonRoot=false), seccompProfile (pod or container \"container-0\" must set securityContext.seccompProfile.type to \"RuntimeDefault\" or \"Localhost\")`,
-      `workload.error, \"test\",\"restricted:latest\"`
-    ]
-  ])('should map error message into object', (oldMessage, newMessage) => {
-    const mockedValidationMixin = {
-      methods: {
-        fvFormIsValid:           jest.fn(),
-        type:                    jest.fn(),
-        fvGetAndReportPathRules: jest.fn(),
-      },
-      computed: { fvUnreportedValidationErrors: jest.fn().mockReturnValue([]) }
-    };
-    const mockedCREMixin = {};
-    const mockedWorkloadMixin = {
-      methods: {
-        doneRoute:                   jest.fn(),
-        workloadSubTypes:            jest.fn(),
-        applyHooks:                  jest.fn(),
-        save:                        jest.fn(),
-        selectType:                  jest.fn(),
-        isCronJob:                   jest.fn(),
-        spec:                        jest.fn(),
-        isReplicable:                jest.fn(),
-        isStatefulSet:               jest.fn(),
-        headlessServices:            jest.fn(),
-        defaultTab:                  jest.fn(),
-        allContainers:               jest.fn(),
-        isPod:                       jest.fn(),
-        tabWeightMap:                jest.fn(),
-        podLabels:                   jest.fn(),
-        podTemplateSpec:             jest.fn(),
-        isLoadingSecondaryResources: jest.fn(),
-        allNodes:                    jest.fn(),
-        allNodeObjects:              jest.fn(),
-        clearPvcFormState:           jest.fn(),
-        savePvcHookName:             jest.fn(),
-        namespacedConfigMaps:        jest.fn(),
-        podAnnotations:              jest.fn(),
-        isJob:                       jest.fn(),
-        podFsGroup:                  jest.fn(),
-        namespacedSecrets:           jest.fn(),
-        registerBeforeHook:          jest.fn(),
-        pvcs:                        jest.fn(),
-        // tabWeightMap:     jest.fn(),
-      }
-    };
+  const baseMockedValidationMixin = {
+    methods: {
+      fvFormIsValid:           jest.fn(),
+      type:                    jest.fn(),
+      fvGetAndReportPathRules: jest.fn(),
+    },
+    computed: { fvUnreportedValidationErrors: jest.fn().mockReturnValue([]) }
+  };
+  const baseMockedCREMixin = {};
+  const baseMockedWorkloadMixin = {
+    methods: {
+      doneRoute:                   jest.fn(),
+      workloadSubTypes:            jest.fn(),
+      applyHooks:                  jest.fn(),
+      save:                        jest.fn(),
+      selectType:                  jest.fn(),
+      isCronJob:                   jest.fn(),
+      spec:                        jest.fn(),
+      isReplicable:                jest.fn(),
+      isStatefulSet:               jest.fn(),
+      headlessServices:            jest.fn(),
+      defaultTab:                  jest.fn(),
+      allContainers:               jest.fn(),
+      isPod:                       jest.fn(),
+      tabWeightMap:                jest.fn(),
+      podLabels:                   jest.fn(),
+      podTemplateSpec:             jest.fn(),
+      isLoadingSecondaryResources: jest.fn(),
+      allNodes:                    jest.fn(),
+      clearPvcFormState:           jest.fn(),
+      savePvcHookName:             jest.fn(),
+      namespacedConfigMaps:        jest.fn(),
+      podAnnotations:              jest.fn(),
+      isJob:                       jest.fn(),
+      podFsGroup:                  jest.fn(),
+      namespacedSecrets:           jest.fn(),
+      registerBeforeHook:          jest.fn(),
+      pvcs:                        jest.fn(),
+    }
+  };
 
-    const MockedWorkload = { ...Workload, mixins: [mockedValidationMixin, mockedCREMixin, mockedWorkloadMixin] };
-    const wrapper = shallowMount(MockedWorkload, {
-      props: {
-        value:         { metadata: {}, spec: { template: {} } },
-        params:        {},
-        fvFormIsValid: {}
-      },
+  describe('component: Workload', () => {
+    it.each([
+      [
+        `pods \"test\" is forbidden: violates PodSecurity \"restricted:latest\": allowPrivilegeEscalation != false (container \"container-0\" must set securityContext.allowPrivilegeEscalation=false), unrestricted capabilities (container \"container-0\" must set securityContext.capabilities.drop=[\"ALL\"]), runAsNonRoot != true (container \"container-0\" must not set securityContext.runAsNonRoot=false), seccompProfile (pod or container \"container-0\" must set securityContext.seccompProfile.type to \"RuntimeDefault\" or \"Localhost\")`,
+        `workload.error, \"test\",\"restricted:latest\"`
+      ]
+    ])('should map error message into object', (oldMessage, newMessage) => {
+    // For this test, allNodeObjects is just a jest.fn() in the base mixin
+      const MockedWorkload = { ...Workload, mixins: [baseMockedValidationMixin, baseMockedCREMixin, { ...baseMockedWorkloadMixin, computed: { allNodeObjects: jest.fn() } }] };
+      const wrapper = shallowMount(MockedWorkload, {
+        props: {
+          value:         { metadata: {}, spec: { template: {} } },
+          params:        {},
+          fvFormIsValid: {}
+        },
 
-      global: {
-        mocks: {
-          $route:      { params: {}, query: {} },
-          $router:     { applyQuery: jest.fn() },
-          $fetchState: { pending: false },
-          $store:      {
-            getters: {
-              'cluster/schemaFor': jest.fn(),
-              'type-map/labelFor': jest.fn(),
-              'i18n/t':            (text: string, v: {[key:string]: string}) => {
-                return `${ text }, ${ Object.values(v || {}) }`;
+        global: {
+          mocks: {
+            $route:      { params: {}, query: {} },
+            $router:     { applyQuery: jest.fn() },
+            $fetchState: { pending: false },
+            $store:      {
+              getters: {
+                'cluster/schemaFor': jest.fn(),
+                'type-map/labelFor': jest.fn(),
+                'i18n/t':            (text: string, v: {[key:string]: string}) => {
+                  return `${ text }, ${ Object.values(v || {}) }`;
+                },
               },
             },
           },
-        },
 
-        stubs: {
-          Tab:                 true,
-          LabeledInput:        true,
-          VolumeClaimTemplate: true,
-          Networking:          true,
-          Job:                 true,
-          NodeScheduling:      true,
-          PodAffinity:         true,
-          Tolerations:         true,
-          Storage:             true,
-          Tabbed:              true,
-          LabeledSelect:       true,
-          NameNsDescription:   true,
-          CruResource:         true,
-          KeyValue:            true
+          stubs: {
+            Tab:                 true,
+            LabeledInput:        true,
+            VolumeClaimTemplate: true,
+            Networking:          true,
+            Job:                 true,
+            NodeScheduling:      true,
+            PodAffinity:         true,
+            Tolerations:         true,
+            Storage:             true,
+            Tabbed:              true,
+            LabeledSelect:       true,
+            NameNsDescription:   true,
+            CruResource:         true,
+            KeyValue:            true
+          },
         },
-      },
+      });
+
+      const result = (wrapper.vm as any).mapError(oldMessage).message;
+
+      expect(result).toStrictEqual(newMessage);
     });
 
-    const result = (wrapper.vm as any).mapError(oldMessage).message;
+    describe('secondaryResourceDataConfig', () => {
+      it('should filter out nodes with control-plane or etcd taints from workerNodes parsingFunc', () => {
+        const allNodeObjects = [
+          {
+            id:   'node-1',
+            spec: { taints: [{ key: 'node-role.kubernetes.io/control-plane', effect: 'NoSchedule' }] }
+          },
+          {
+            id:   'node-2',
+            spec: { taints: [{ key: 'node-role.kubernetes.io/etcd', effect: 'NoSchedule' }] }
+          },
+          {
+            id:   'node-3',
+            spec: { taints: [{ key: 'node-role.kubernetes.io/worker', effect: 'NoSchedule' }] }
+          },
+          {
+            id:   'node-4',
+            spec: { taints: [] }
+          },
+          {
+            id:   'node-5',
+            spec: {}
+          },
+          {
+            id:   'node-6',
+            spec: null
+          }
+        ];
+
+        const { data } = (Workload.mixins[2] as any).methods.secondaryResourceDataConfig.apply({ value: { metadata: { namespace: 'test' } } });
+        const workerNodesParsingFunc = data.node.applyTo.find((r: any) => r.var === 'workerNodes').parsingFunc;
+        const result = workerNodesParsingFunc(allNodeObjects);
 
-    expect(result).toStrictEqual(newMessage);
+        expect(result).toStrictEqual(['node-3', 'node-4', 'node-5', 'node-6']);
+      });
+    });
   });
 });

package/edit/workload/index.vue

@@ -155,7 +155,7 @@ export default {
         :default-tab="defaultTab || defaultWorkloadTab"
         :flat="true"
         :use-hash="useTabbedHash"
-
+        :showExtensionTabs="false"
         data-testid="workload-horizontal-tabs"
         @changed="changed"
       >
@@ -494,7 +494,7 @@ export default {
               <NodeScheduling
                 :mode="mode"
                 :value="podTemplateSpec"
-                :nodes="allNodes"
+                :nodes="workerNodes"
                 :loading="isLoadingSecondaryResources"
               />
             </Tab>

package/edit/workload/mixins/workload.js

@@ -258,6 +258,7 @@ export default {
       secondaryResourceData:      this.secondaryResourceDataConfig(),
       namespacedConfigMaps:       [],
       allNodes:                   null,
+      workerNodes:                null,
       allNodeObjects:             [],
       namespacedSecrets:          [],
       imagePullNamespacedSecrets: [],
@@ -647,7 +648,24 @@ export default {
                 parsingFunc: (data) => {
                   return data.map((node) => node.id);
                 }
-              }
+              },
+              {
+                var:         'workerNodes',
+                parsingFunc: (data) => {
+                  const keys = [
+                    `node-role.kubernetes.io/control-plane`,
+                    `node-role.kubernetes.io/etcd`
+                  ];
+
+                  return data
+                    .filter((node) => {
+                      const taints = node?.spec?.taints || [];
+
+                      return taints.every((taint) => !keys.includes(taint.key));
+                    })
+                    .map((node) => node.id);
+                }
+              },
             ]
           },
           [SERVICE]: {

package/initialize/install-plugins.js

@@ -19,13 +19,12 @@ import { InstallCodeMirror } from 'codemirror-editor-vue3';
 import * as intNumber from '@shell/directives/int-number';
 import dashboardClientInit from '@shell/plugins/dashboard-client-init';
 import plugin from '@shell/plugins/plugin';
-import plugins from '@shell/core/plugins.js';
 import pluginsLoader from '@shell/core/plugins-loader.js';
 import replaceAll from '@shell/plugins/replaceall';
 import steveCreateWorker from '@shell/plugins/steve-create-worker';
 import emberCookie from '@shell/plugins/ember-cookie';
 import ShortKey from '@shell/plugins/shortkey';
-import internalApiPlugin from '@shell/plugins/internal-api';
+import { initUiApis } from '@shell/apis/impl/apis';
 
 import 'floating-vue/dist/style.css';
 import { floatingVueOptions } from '@shell/plugins/floating-vue';
@@ -51,7 +50,7 @@ export async function installInjectedPlugins(app, vueApp) {
   const pluginDefinitions = [
     config,
     axios,
-    plugins,
+    initUiApis,
     pluginsLoader,
     axiosShell,
     intNumber,
@@ -61,7 +60,6 @@ export async function installInjectedPlugins(app, vueApp) {
     plugin,
     steveCreateWorker,
     emberCookie,
-    internalApiPlugin,
     dynamicContent,
   ];
 
@@ -69,7 +67,8 @@ export async function installInjectedPlugins(app, vueApp) {
     if (typeof pluginDefinition === 'function') {
       await pluginDefinition(
         app.context,
-        (key, value) => inject(key, value, app.context, vueApp)
+        (key, value) => inject(key, value, app.context, vueApp),
+        vueApp
       );
     }
   });

package/machine-config/azure.vue

@@ -37,7 +37,7 @@ const defaultConfig = {
   faultDomainCount:      '3',
   image:                 'canonical:ubuntu-24_04-lts:server-gen1:latest',
   location:              'westus',
-  managedDisks:          false,
+  managedDisks:          true,
   noPublicIp:            false,
   nsg:                   null,
   privateIpAddress:      null,

package/machine-config/components/GCEImage.vue

@@ -8,7 +8,7 @@ import { getGKEImageFamilies, getGKEFamiliesFromProject } from '@shell/component
 import debounce from 'lodash/debounce';
 import { mapGetters } from 'vuex';
 
-const DEFAULT_PROJECTS = 'suse-cloud, ubuntu-os-cloud, rhel-cloud';
+const DEFAULT_PROJECTS = 'ubuntu-os-cloud';
 const DEFAULT_MIN_DISK = 10;
 
 export default {

package/mixins/__tests__/brand.spec.ts

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { CATALOG, MANAGEMENT } from '@shell/config/types';
 import Brand from '@shell/mixins/brand';
+import CspAdapterUtils from '@shell/utils/cspAdaptor';
 
 describe('brandMixin', () => {
   const createWrapper = (vaiOn = false) => {
@@ -54,45 +55,47 @@ describe('brandMixin', () => {
         data:   () => data,
         global: { mocks: { $store: store } }
       });
-    const spyManagementFindAll = jest.spyOn(store, 'dispatch');
+    const spyManagementDispatch = jest.spyOn(store, 'dispatch');
+
+    CspAdapterUtils.resetState();
 
     return {
       wrapper,
       store,
-      spyManagementFindAll,
+      spyManagementDispatch,
     };
   };
 
   describe('should make correct requests', () => {
     it('vai off', async() => {
-      const { wrapper, spyManagementFindAll } = createWrapper(false);
+      const { wrapper, spyManagementDispatch } = createWrapper(false);
 
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm);
 
       // wrapper.vm.$nextTick();
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(1, 'management/findAll', {
         type: MANAGEMENT.SETTING,
         opt:  {
           load: 'multi', redirectUnauthorized: false, url: `/v1/${ MANAGEMENT.SETTING }s`
         }
       });
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findAll', { type: CATALOG.APP });
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(2, 'management/findAll', { type: CATALOG.APP });
     });
 
     it('vai on', async() => {
-      const { wrapper, spyManagementFindAll } = createWrapper(true);
+      const { wrapper, spyManagementDispatch } = createWrapper(true);
 
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm);
 
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(1, 'management/findAll', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(1, 'management/findAll', {
         type: MANAGEMENT.SETTING,
         opt:  {
           load: 'multi', url: `/v1/${ MANAGEMENT.SETTING }s`, redirectUnauthorized: false
         }
       });
-      expect(spyManagementFindAll).toHaveBeenNthCalledWith(2, 'management/findPage', {
+      expect(spyManagementDispatch).toHaveBeenNthCalledWith(2, 'management/findPage', {
         type: CATALOG.APP,
         opt:  {
           pagination: {
@@ -110,7 +113,9 @@ describe('brandMixin', () => {
             pageSize:             null,
             projectsOrNamespaces: [],
             sort:                 []
-          }
+          },
+          transient: true,
+          watch:     false
         }
       });
     });
@@ -120,7 +125,7 @@ describe('brandMixin', () => {
     it('should have correct csp values (off)', async() => {
       const { wrapper, store } = createWrapper();
 
-      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+      const spyManagementDispatch = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
         const { type } = options as any;
 
         if (type === MANAGEMENT.SETTING) {
@@ -136,7 +141,7 @@ describe('brandMixin', () => {
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
 
-      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+      expect(spyManagementDispatch).toHaveBeenCalledTimes(2);
 
       expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
       expect(wrapper.vm.cspAdapter).toBeFalsy();
@@ -145,7 +150,7 @@ describe('brandMixin', () => {
     it.each(['rancher-csp-adapter', 'rancher-csp-billing-adapter'])('should have correct csp values (on - %p )', async(chartName) => {
       const { wrapper, store } = createWrapper();
 
-      const spyManagementFindAll = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
+      const spyManagementDispatch = jest.spyOn(store, 'dispatch').mockImplementation((_, options) => {
         const { type } = options as any;
 
         if (type === MANAGEMENT.SETTING) {
@@ -161,7 +166,7 @@ describe('brandMixin', () => {
       // NOTE - wrapper.vm.$options.fetch() doesn't work
       await wrapper.vm.$options.fetch.apply(wrapper.vm, []);
 
-      expect(spyManagementFindAll).toHaveBeenCalledTimes(2);
+      expect(spyManagementDispatch).toHaveBeenCalledTimes(2);
 
       expect(wrapper.vm.canCalcCspAdapter).toBeTruthy();
       expect(wrapper.vm.cspAdapter).toBeTruthy();

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -69,6 +69,22 @@ describe('class ProvCluster', () => {
         },
         expected: true
       },
+      {
+        description: 'should return true for an imported k3s cluster in waiting state',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: undefined, driver: 'k3s' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return true for an imported rke2 cluster in waiting state',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: undefined, driver: 'rke2' } }
+        },
+        expected: true
+      },
       {
         description: 'should return false for a provisioned k3s cluster',
         clusterData: {

package/models/chart.js

@@ -136,91 +136,87 @@ export default class Chart extends SteveModel {
    * @returns {Object} Card content object with `subHeaderItems`, `footerItems`, and `statuses` arrays.
    */
   get cardContent() {
-    if (!this._cardContent) {
-      const latestVersion = this.latestCompatibleVersion;
-      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');
-        }
-
-        subHeaderItems.push(lastUpdatedItem);
-      }
+    const latestVersion = this.latestCompatibleVersion;
+    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')
+      };
 
-      const footerItems = [
-        {
-          type:         REPO,
-          icon:         'icon-repository-alt',
-          iconTooltip:  { key: 'tableHeaders.repoName' },
-          labels:       [this.repoNameDisplay],
-          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.repo') }, true)
-        }
-      ];
-
-      if (this.categories.length) {
-        footerItems.push( {
-          type:         CATEGORY,
-          icon:         'icon-category-alt',
-          iconTooltip:  { key: 'generic.category' },
-          labels:       this.categories,
-          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.category') }, true)
-        });
+      if (hasZeroTime) {
+        lastUpdatedItem.labelTooltip = this.t('catalog.charts.appChartCard.subHeaderItem.missingVersionDate');
       }
 
-      if (this.tags.length) {
-        footerItems.push({
-          type:         TAG,
-          icon:         'icon-tag-alt',
-          iconTooltip:  { key: 'generic.tags' },
-          labels:       this.tags,
-          labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.tag') }, true)
-        });
+      subHeaderItems.push(lastUpdatedItem);
+    }
+
+    const footerItems = [
+      {
+        type:         REPO,
+        icon:         'icon-repository-alt',
+        iconTooltip:  { key: 'tableHeaders.repoName' },
+        labels:       [this.repoNameDisplay],
+        labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.repo') }, true)
       }
+    ];
+
+    if (this.categories.length) {
+      footerItems.push( {
+        type:         CATEGORY,
+        icon:         'icon-category-alt',
+        iconTooltip:  { key: 'generic.category' },
+        labels:       this.categories,
+        labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.category') }, true)
+      });
+    }
 
-      const statuses = [];
+    if (this.tags.length) {
+      footerItems.push({
+        type:         TAG,
+        icon:         'icon-tag-alt',
+        iconTooltip:  { key: 'generic.tags' },
+        labels:       this.tags,
+        labelTooltip: this.t('catalog.charts.findSimilar.message', { type: this.t('catalog.charts.findSimilar.types.tag') }, true)
+      });
+    }
 
-      if (this.deprecated) {
-        statuses.push({
-          icon: 'icon-alert-alt', color: 'error', tooltip: { key: 'generic.deprecated' }
-        });
-      }
+    const statuses = [];
 
-      if (this.upgradeable) {
-        statuses.push({
-          icon: 'icon-upgrade-alt', color: 'info', tooltip: { key: 'generic.upgradeable' }
-        });
-      }
+    if (this.deprecated) {
+      statuses.push({
+        icon: 'icon-alert-alt', color: 'error', tooltip: { key: 'generic.deprecated' }
+      });
+    }
 
-      if (this.isInstalled) {
-        const installedVersion = this.matchingInstalledApps[0]?.spec?.chart?.metadata?.version;
+    if (this.upgradeable) {
+      statuses.push({
+        icon: 'icon-upgrade-alt', color: 'info', tooltip: { key: 'generic.upgradeable' }
+      });
+    }
 
-        statuses.push({
-          icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: `${ this.t('generic.installed') } (${ installedVersion })` }
-        });
-      }
+    if (this.isInstalled) {
+      const installedVersion = this.matchingInstalledApps[0]?.spec?.chart?.metadata?.version;
 
-      this._cardContent = {
-        subHeaderItems,
-        footerItems,
-        statuses
-      };
+      statuses.push({
+        icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: `${ this.t('generic.installed') } (${ installedVersion })` }
+      });
     }
 
-    return this._cardContent;
+    return {
+      subHeaderItems,
+      footerItems,
+      statuses
+    };
   }
 }

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

@@ -255,7 +255,7 @@ export default class MgmtCluster extends SteveModel {
       dispatch:   this.$dispatch,
       getters:    this.$getters,
       axios:      this.$axios,
-      $extension: this.$plugin,
+      $extension: this.$extension,
       t:          (...args) => this.t.apply(this, args),
     };