@rancher/shell 3.0.7 → 3.0.8-rc.10

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

@@ -1,24 +1,28 @@
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-
+jest.mock('@shell/utils/provider', () => ({
+  isHostedProvider: jest.fn().mockImplementation((context, provider) => {
+    return ['GKE', 'EKS', 'AKS'].includes(provider);
+  })
+}));
 describe('class ProvCluster', () => {
   const gkeClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'GKE',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { gkeConfig: { privateClusterConfig: { enablePrivateEndpoint: true } } } }
   };
 
   const eksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'EKS',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { eksConfig: { privateAccess: true } } }
   };
 
   const aksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'AKS',
-    spec:        { rkeConfig: {} },
+    spec:        { },
     mgmt:        { spec: { aksConfig: { privateCluster: true } } }
   };
 
@@ -44,12 +48,115 @@ describe('class ProvCluster', () => {
         clusterData.provisioner
       );
 
-      expect(cluster.isRke2).toBe(expected);
+      expect(cluster.isRke2).toBe(false);
       expect(cluster.isHostedKubernetesProvider).toBe(expected);
       expect(cluster.isPrivateHostedProvider).toBe(expected);
       resetMocks();
     });
   });
+  describe('isImported', () => {
+    const testCases = [
+      {
+        description: 'should return false for a local cluster',
+        clusterData: { isLocal: true },
+        expected:    false
+      },
+      {
+        description: 'should return true for an imported k3s cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'k3s', driver: 'k3s' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned k3s cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'k3s', driver: 'imported' } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for an imported rke2 cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'rke2', driver: 'rke2' } }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned rke2 cluster',
+        clusterData: {
+          isLocal: false,
+          mgmt:    { status: { provider: 'rke2', driver: 'imported' } }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for an imported hosted cluster',
+        clusterData: {
+          isLocal:                    false,
+          isHostedKubernetesProvider: true,
+          providerConfig:             { imported: true }
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a provisioned hosted cluster',
+        clusterData: {
+          isLocal:                    false,
+          isHostedKubernetesProvider: true,
+          providerConfig:             { imported: false }
+        },
+        expected: false
+      },
+      {
+        description: 'should return true for a generic imported cluster',
+        clusterData: {
+          isLocal:     false,
+          provisioner: 'imported'
+        },
+        expected: true
+      },
+      {
+        description: 'should return false for a generic provisioned cluster',
+        clusterData: {
+          isLocal:     false,
+          provisioner: 'rke2'
+        },
+        expected: false
+      }
+    ];
+    const resetMocks = () => {
+      // Clear all mock function calls:
+      jest.clearAllMocks();
+    };
+
+    it.each(testCases)('$description', ({ clusterData, expected }) => {
+      const cluster = new ProvCluster({});
+
+      // Mock getters
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
+        clusterData.mgmt
+      );
+      if (clusterData.isLocal !== undefined) {
+        jest.spyOn(cluster, 'isLocal', 'get').mockReturnValue(clusterData.isLocal);
+      }
+      if (clusterData.isHostedKubernetesProvider !== undefined) {
+        jest.spyOn(cluster, 'isHostedKubernetesProvider', 'get').mockReturnValue(clusterData.isHostedKubernetesProvider);
+      }
+      if (clusterData.providerConfig !== undefined) {
+        jest.spyOn(cluster, 'providerConfig', 'get').mockReturnValue(clusterData.providerConfig);
+      }
+      if (clusterData.provisioner !== undefined) {
+        jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(clusterData.provisioner);
+      }
+
+      expect(cluster.isImported).toBe(expected);
+      resetMocks();
+    });
+  });
 
   describe('hasError', () => {
     const conditionsWithoutError = [

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

@@ -323,7 +323,7 @@ export default class CatalogApp extends SteveModel {
 
   get relatedResourcesToRemove() {
     return async() => {
-      const crd = this.spec.chart.metadata.annotations[CATALOG_ANNOTATIONS.AUTO_INSTALL].replace('=match', '');
+      const crd = this.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.AUTO_INSTALL]?.replace('=match', '');
 
       return await this.$dispatch('find', {
         type: CATALOG.APP,

package/models/chart.js

@@ -1,8 +1,10 @@
-import { compatibleVersionsFor, APP_UPGRADE_STATUS } from '@shell/store/catalog';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import {
   REPO_TYPE, REPO, CHART, VERSION, _FLAGGED, HIDE_SIDE_NAV, CATEGORY, TAG, DEPRECATED as DEPRECATED_QUERY
 } from '@shell/config/query-params';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+import { SHOW_PRE_RELEASE } from '@shell/store/prefs';
+import { getLatestCompatibleVersion } from '@shell/utils/chart';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { CATALOG, ZERO_TIME } from '@shell/config/types';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
@@ -10,17 +12,7 @@ import day from 'dayjs';
 
 export default class Chart extends SteveModel {
   queryParams(from, hideSideNav) {
-    let version;
-    const chartVersions = this.versions;
-    const currentCluster = this.$rootGetters['currentCluster'];
-    const workerOSs = currentCluster?.workerOSs;
-    const compatibleVersions = compatibleVersionsFor(this, workerOSs);
-
-    if (compatibleVersions.length) {
-      version = compatibleVersions[0].version;
-    } else {
-      version = chartVersions[0].version;
-    }
+    const version = this.latestCompatibleVersion.version;
 
     const out = {
       [REPO_TYPE]: this.repoType,
@@ -115,6 +107,26 @@ export default class Chart extends SteveModel {
     return this.isInstalled && this.matchingInstalledApps[0].upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE;
   }
 
+  /**
+   * Retrieves the latest chart version that is compatible with the current cluster's OS and user's pre-release preference.
+   * It caches the result for efficiency.
+   *
+   * @returns {Object} The latest compatible chart version object.
+   */
+  get latestCompatibleVersion() {
+    if (this._latestCompatibleVersion) {
+      return this._latestCompatibleVersion;
+    }
+
+    const currentCluster = this.$rootGetters['currentCluster'];
+    const workerOSs = currentCluster?.workerOSs;
+    const showPrerelease = this.$rootGetters['prefs/get'](SHOW_PRE_RELEASE);
+
+    this._latestCompatibleVersion = getLatestCompatibleVersion(this, workerOSs, showPrerelease);
+
+    return this._latestCompatibleVersion;
+  }
+
   /**
    * Builds structured metadata for display in RcItemCard.vue:
    * - Sub-header (version and last updated)
@@ -125,7 +137,7 @@ export default class Chart extends SteveModel {
    */
   get cardContent() {
     if (!this._cardContent) {
-      const latestVersion = this.versions?.[0] || {};
+      const latestVersion = this.latestCompatibleVersion;
       const subHeaderItems = [];
 
       if (latestVersion) {
@@ -195,8 +207,10 @@ export default class Chart extends SteveModel {
       }
 
       if (this.isInstalled) {
+        const installedVersion = this.matchingInstalledApps[0]?.spec?.chart?.metadata?.version;
+
         statuses.push({
-          icon: 'icon-confirmation-alt', color: 'success', tooltip: { key: 'generic.installed' }
+          icon: 'icon-confirmation-alt', color: 'success', tooltip: { text: `${ this.t('generic.installed') } (${ installedVersion })` }
         });
       }
 

package/models/cluster/node.js

@@ -4,7 +4,6 @@ import {
   CAPI, MANAGEMENT, METRIC, NORMAN, POD
 } from '@shell/config/types';
 import { parseSi } from '@shell/utils/units';
-import findLast from 'lodash/findLast';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { LOCAL } from '@shell/config/query-params';
@@ -96,15 +95,23 @@ export default class ClusterNode extends SteveModel {
     return this.status?.addresses || [];
   }
 
-  get internalIp() {
-    return findLast(this.addresses, (address) => address.type === 'InternalIP')?.address;
+  get internalIps() {
+    return this.addresses.filter((address) => address.type === 'InternalIP').map((address) => address.address);
   }
 
-  get externalIp() {
+  get externalIps() {
     const annotationAddress = this.metadata.annotations[RKE.EXTERNAL_IP];
-    const statusAddress = findLast(this.addresses, (address) => address.type === 'ExternalIP')?.address;
+    const statusAddresses = this.addresses.filter((address) => address.type === 'ExternalIP').map((address) => address.address);
+
+    return statusAddresses.concat(annotationAddress || []);
+  }
 
-    return statusAddress || annotationAddress;
+  get internalIp() {
+    return this.internalIps[0];
+  }
+
+  get externalIp() {
+    return this.externalIps[0];
   }
 
   get labels() {

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

@@ -244,29 +244,19 @@ export default class CapiMachine extends SteveModel {
     return this.status?.phase === 'Running';
   }
 
-  get internalIp() {
-    // This shows in the IP address column for RKE2 nodes in the
-    // list of nodes in the cluster detail page of Cluster Management.
-    const internal = this.status?.addresses?.find(({ type }) => {
-      return type === ADDRESSES.INTERNAL_IP;
-    })?.address;
-
-    if (internal) {
-      return internal;
-    }
-
-    return this.t('generic.none');
+  get internalIps() {
+    return this.status?.addresses?.filter(({ type }) => type === ADDRESSES.INTERNAL_IP).map((addr) => addr.address) || [];
   }
 
-  get externalIp() {
-    const external = this.status?.addresses?.find(({ type }) => {
-      return type === ADDRESSES.EXTERNAL_IP;
-    })?.address;
+  get externalIps() {
+    return this.status?.addresses?.filter(({ type }) => type === ADDRESSES.EXTERNAL_IP).map((addr) => addr.address) || [];
+  }
 
-    if (external) {
-      return external;
-    }
+  get internalIp() {
+    return this.internalIps[0];
+  }
 
-    return this.t('generic.none');
+  get externalIp() {
+    return this.externalIps[0];
   }
 }

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

@@ -4,7 +4,7 @@ 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 { MACHINE_ROLES } from '@shell/config/labels-annotations';
+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';
@@ -173,6 +173,10 @@ export default class CapiMachineDeployment extends SteveModel {
     }, 1000);
   }
 
+  get isAutoscalerEnabled() {
+    return this.annotations?.[CAPI_ANNOTATIONS.AUTOSCALER_MACHINE_POOL_MIN_SIZE] || this.annotations?.[CAPI_ANNOTATIONS.AUTOSCALER_MACHINE_POOL_MAX_SIZE];
+  }
+
   // prevent scaling pool to 0 if it would scale down the only etcd or control plane node
   canScaleDownPool() {
     if (!this.canUpdate || this.inClusterSpec?.quantity === 0 || this.infrastructureRefKind === KIND.MACHINE_INV_SELECTOR_TEMPLATES) {

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

@@ -11,7 +11,7 @@ export default class ComplianceProfile extends SteveModel {
   get numberTestsSkipped() {
     const { skipTests = [] } = this.spec;
 
-    return skipTests.length;
+    return skipTests?.length || 0;
   }
 
   get benchmarkVersionLink() {

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

@@ -14,6 +14,7 @@ export const configType = {
   googleoauth:     'oauth',
   local:           '',
   github:          'oauth',
+  githubapp:       'oauth',
   keycloakoidc:    'oidc',
   genericoidc:     'oidc',
   cognito:         'oidc',

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

@@ -15,6 +15,7 @@ import { LINUX, WINDOWS } from '@shell/store/catalog';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
 import { PINNED_CLUSTERS } from '@shell/store/prefs';
 import { copyTextToClipboard } from '@shell/utils/clipboard';
+import { isHostedProvider } from '@shell/utils/provider';
 
 const DEFAULT_BADGE_COLOR = '#707070';
 
@@ -171,9 +172,20 @@ export default class MgmtCluster extends SteveModel {
     return this.isCondition('Ready');
   }
 
+  get config() {
+    if (!this.spec?.[`${ this.provisioner }Config`]) {
+      const allKeys = Object.keys(this.spec);
+      const configKey = allKeys.find( (k) => k.endsWith('Config'));
+
+      return this.spec[configKey];
+    }
+
+    return this.spec?.[`${ this.provisioner }Config`];
+  }
+
   get kubernetesVersionRaw() {
     const fromStatus = this.status?.version?.gitVersion;
-    const fromSpec = this.spec?.[`${ this.provisioner }Config`]?.kubernetesVersion;
+    const fromSpec = this.config?.kubernetesVersion;
 
     return fromStatus || fromSpec;
   }
@@ -239,9 +251,15 @@ export default class MgmtCluster extends SteveModel {
   }
 
   get isHostedKubernetesProvider() {
-    const providers = ['AKS', 'EKS', 'GKE'];
+    const context = {
+      dispatch:   this.$dispatch,
+      getters:    this.$getters,
+      axios:      this.$axios,
+      $extension: this.$plugin,
+      t:          (...args) => this.t.apply(this, args),
+    };
 
-    return providers.includes(this.provisioner);
+    return isHostedProvider(context, this.provisioner);
   }
 
   get providerLogo() {

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

@@ -41,6 +41,7 @@ export const DRIVER_TO_IMPORT = {
   googlegke: 'gke',
   amazoneks: 'eks',
   azureaks:  'aks',
+  alibaba:   'alibabacloud'
 };
 
 export default class KontainerDriver extends HybridModel {