@rancher/shell 0.1.2 → 0.1.4

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

@@ -1,9 +1,9 @@
 import { escapeHtml, ucFirst } from '@shell/utils/string';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import typeHelper from '@shell/utils/type-helpers';
-import { addObject, addObjects, findBy } from '~shell/utils/array';
-import { FLEET } from '~shell/config/types';
-import { convertSelectorObj, matching } from '~shell/utils/selector';
+import { addObject, addObjects, findBy } from '@shell/utils/array';
+import { FLEET } from '@shell/config/types';
+import { convertSelectorObj, matching } from '@shell/utils/selector';
 
 export default class FleetBundle extends SteveModel {
   get deploymentInfo() {
@@ -13,12 +13,12 @@ export default class FleetBundle extends SteveModel {
     return {
       ready,
       unready: total - ready,
-      total,
+      total
     };
   }
 
   get lastUpdateTime() {
-    return this.status.conditions[0].lastUpdateTime;
+    return this.status?.conditions?.[0].lastUpdateTime;
   }
 
   get bundleType() {
@@ -34,45 +34,48 @@ export default class FleetBundle extends SteveModel {
   }
 
   get targetClusters() {
-    const workspace = this.$getters['byId'](FLEET.WORKSPACE, this.metadata.namespace);
+    const workspace = this.$getters['byId'](
+      FLEET.WORKSPACE,
+      this.metadata.namespace
+    );
     const clusters = workspace?.clusters || [];
     const groups = workspace?.clusterGroups || [];
     const out = [];
 
-    if ( workspace.id === 'fleet-local' ) {
+    if (workspace.id === 'fleet-local') {
       const local = findBy(groups, 'id', 'fleet-local/default');
 
-      if ( local ) {
+      if (local) {
         return local.targetClusters;
       }
 
       return [];
     }
 
-    for ( const tgt of this.spec.targets ) {
-      if ( tgt.clusterName ) {
+    for (const tgt of this.spec.targets) {
+      if (tgt.clusterName) {
         const cluster = findBy(clusters, 'metadata.name', tgt.clusterName);
 
-        if ( cluster ) {
+        if (cluster) {
           addObject(out, cluster);
         }
-      } else if ( tgt.clusterGroup ) {
+      } else if (tgt.clusterGroup) {
         const group = findBy(groups, {
           'metadata.namespace': this.metadata.namespace,
-          'metadata.name':      tgt.clusterGroup,
+          'metadata.name':      tgt.clusterGroup
         });
 
-        if ( group ) {
+        if (group) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterGroupSelector ) {
+      } else if (tgt.clusterGroupSelector) {
         const expressions = convertSelectorObj(tgt.clusterGroupSelector);
         const matchingGroups = matching(groups, expressions);
 
-        for ( const group of matchingGroups ) {
+        for (const group of matchingGroups) {
           addObjects(out, group.targetClusters);
         }
-      } else if ( tgt.clusterSelector ) {
+      } else if (tgt.clusterSelector) {
         const expressions = convertSelectorObj(tgt.clusterSelector);
         const matchingClusters = matching(clusters, expressions);
 
@@ -106,7 +109,9 @@ export default class FleetBundle extends SteveModel {
        *    "type": "Ready"
        *    },
        */
-      const hasErrorMessage = message?.toLowerCase().includes('errapplied') || message?.toLowerCase().includes('error');
+      const hasErrorMessage =
+        message?.toLowerCase().includes('errapplied') ||
+        message?.toLowerCase().includes('error');
 
       return errState && hasErrorMessage;
     });
@@ -123,10 +128,12 @@ export default class FleetBundle extends SteveModel {
   get groupByLabel() {
     const name = this.metadata.namespace;
 
-    if ( name ) {
+    if (name) {
       return this.$rootGetters['i18n/t']('resourceTable.groupLabel.workspace', { name: escapeHtml(name) });
     } else {
-      return this.$rootGetters['i18n/t']('resourceTable.groupLabel.notInAWorkspace');
+      return this.$rootGetters['i18n/t'](
+        'resourceTable.groupLabel.notInAWorkspace'
+      );
     }
   }
 }

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

@@ -1,11 +1,10 @@
 import Vue from 'vue';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-import { DEFAULT_WORKSPACE } from '@shell/config/types';
-export default class HciCluster extends ProvCluster {
-  get availableActions() {
-    return this._availableActions;
-  }
+import { DEFAULT_WORKSPACE, HCI, MANAGEMENT } from '@shell/config/types';
+import { HARVESTER_NAME, HARVESTER_NAME as VIRTUAL } from '@shell/config/product/harvester-manager';
+import { SETTING } from '@shell/config/settings';
 
+export default class HciCluster extends ProvCluster {
   get stateObj() {
     return this._stateObj;
   }
@@ -30,4 +29,200 @@ export default class HciCluster extends ProvCluster {
   get canEdit() {
     return false;
   }
+
+  cachedHarvesterClusterVersion = '';
+
+  _uiInfo = undefined;
+
+  /**
+   * Fetch and cache the response for /ui-info
+   *
+   * Storing this in a cache means any changes to `ui-info` require a dashboard refresh... but it cuts out a http request every time we
+   * go to a cluster
+   *
+   * @param {string} clusterId
+   */
+  async _getUiInfo(clusterId) {
+    if (!this._uiInfo) {
+      try {
+        const infoUrl = `/k8s/clusters/${ clusterId }/v1/harvester/ui-info`;
+
+        this._uiInfo = await this.$dispatch('request', { url: infoUrl });
+      } catch (e) {
+        console.info(`Failed to fetch harvester ui-info from ${ this.nameDisplay }, this may be an older cluster that cannot provide one`); // eslint-disable-line no-console
+      }
+    }
+
+    return this._uiInfo;
+  }
+
+  /**
+   * Determine the harvester plugin's package name and url for legacy clusters that don't provide the package (i.e. it's coming from
+   * outside the cluster)
+   */
+  _legacyClusterPkgDetails() {
+    let uiOfflinePreferred = this.$rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_OFFLINE_PREFERRED)?.value;
+    // options: ['dynamic', 'true', 'false']
+
+    if (uiOfflinePreferred === 'dynamic') {
+      // We shouldn't need to worry about the version of the dashboard when embedded in harvester (aka in isSingleProduct)
+      const version = this.$rootGetters['management/byId'](MANAGEMENT.SETTING, 'server-version')?.value;
+
+      if (version.endsWith('-head')) {
+        uiOfflinePreferred = 'false';
+      } else {
+        uiOfflinePreferred = 'true';
+      }
+    }
+
+    // This is the version that's embedded in the dashboard
+    const pkgName = `${ HARVESTER_NAME }-1.0.3`;
+
+    if (uiOfflinePreferred === 'true') {
+      // Embedded (aka give me the embedded plugin that was in the last rancher release)
+      const embeddedPath = `${ pkgName }/${ pkgName }.umd.min.js`;
+
+      return {
+        pkgUrl: process.env.dev ? `${ process.env.api }/dashboard/${ embeddedPath }` : embeddedPath,
+        pkgName
+      };
+    }
+
+    if (uiOfflinePreferred === 'false') {
+      // Remote (aka give me the latest version of the embedded plugin that might not have been released yet)
+      const uiDashboardHarvesterRemotePlugin = this.$rootGetters['management/byId'](MANAGEMENT.SETTING, SETTING.UI_DASHBOARD_HARVESTER_LEGACY_PLUGIN)?.value;
+      const parts = uiDashboardHarvesterRemotePlugin?.replace('.umd.min.js', '').split('/');
+      const pkgNameFromUrl = parts?.length > 1 ? parts[parts.length - 1] : null;
+
+      if (!pkgNameFromUrl) {
+        throw new Error(`Unable to determine harvester plugin name from '${ uiDashboardHarvesterRemotePlugin }'`);
+      }
+
+      return {
+        pkgUrl:  uiDashboardHarvesterRemotePlugin,
+        pkgName: pkgNameFromUrl
+      };
+    }
+
+    throw new Error(`Unsupported value for ${ SETTING.UI_OFFLINE_PREFERRED }: 'uiOfflinePreferred'`);
+  }
+
+  /**
+   * Determine the harvester plugin's package name and url for clusters that provide the plugin
+   */
+  _supportedClusterPkgDetails(uiInfo, clusterId) {
+    let pkgName = `${ HARVESTER_NAME }-${ uiInfo['ui-plugin-bundled-version'] }`;
+    const fileName = `${ pkgName }.umd.min.js`;
+    let pkgUrl;
+
+    if (uiInfo['ui-source'] === 'bundled' ) { // offline bundled
+      pkgUrl = `/k8s/clusters/${ clusterId }/v1/harvester/plugin-assets/${ fileName }`;
+    } else if (uiInfo['ui-source'] === 'external') {
+      if (uiInfo['ui-plugin-index']) {
+        pkgUrl = uiInfo['ui-plugin-index'];
+
+        // When using an external address, the pkgName should also be get from the url
+        const names = pkgUrl.split('/');
+        const jsName = names[names.length - 1];
+
+        pkgName = jsName?.split('.umd.min.js')[0];
+      } else {
+        throw new Error('Harvester cluster requested the plugin at `ui-plugin-index` is used, however did not provide a value for it');
+      }
+    }
+
+    return {
+      pkgUrl,
+      pkgName
+    };
+  }
+
+  _overridePkgDetails() {
+    // Support loading the pkg from a locally, or other, address
+    // This helps testing of the harvester plugin when packaged up, instead of directly imported
+    const harvesterPkgUrl = process.env.harvesterPkgUrl;
+
+    if (!harvesterPkgUrl) {
+      return;
+    }
+    const parts = harvesterPkgUrl.replace('.umd.min.js', '').split('/');
+    const pkgNameFromUrl = parts.length > 1 ? parts[parts.length - 1] : null;
+
+    if (pkgNameFromUrl) {
+      return {
+        pkgUrl:  harvesterPkgUrl,
+        pkgName: pkgNameFromUrl
+      };
+    }
+  }
+
+  async _pkgDetails() {
+    const overridePkgDetails = this._overridePkgDetails();
+
+    if (overridePkgDetails) {
+      return overridePkgDetails;
+    }
+
+    const clusterId = this.mgmt.id;
+    const uiInfo = await this._getUiInfo(clusterId);
+
+    return uiInfo ? this._supportedClusterPkgDetails(uiInfo, clusterId) : this._legacyClusterPkgDetails();
+  }
+
+  async loadClusterPlugin() {
+    // Skip loading if it's built in
+    const plugins = this.$rootState.$plugin.getPlugins();
+    const loadedPkgs = Object.keys(plugins);
+
+    if (loadedPkgs.find(pkg => pkg === HARVESTER_NAME)) {
+      console.info('Harvester plugin built is built in, skipping load from external sources'); // eslint-disable-line no-console
+
+      return;
+    }
+
+    // Determine the plugin name and the url it can be fetched from
+    const { pkgUrl, pkgName } = await this._pkgDetails();
+
+    console.info('Harvester plugin details: ', pkgName, pkgUrl); // eslint-disable-line no-console
+
+    // Skip loading if we've previously loaded the correct one
+    if (!!plugins[pkgName]) {
+      console.info('Harvester plugin already loaded, no need to load', pkgName); // eslint-disable-line no-console
+
+      return;
+    }
+
+    console.info('Attempting to load Harvester plugin', pkgName); // eslint-disable-line no-console
+
+    const res = await this.$rootState.$plugin.loadAsync(pkgName, pkgUrl);
+
+    console.info('Loaded Harvester plugin', pkgName); // eslint-disable-line no-console
+
+    return res;
+  }
+
+  goToCluster() {
+    this.loadClusterPlugin()
+      .then(() => {
+        this.currentRouter().push({
+          name:   `${ VIRTUAL }-c-cluster-resource`,
+          params: {
+            cluster:  this.status.clusterName,
+            product:  VIRTUAL,
+            resource: HCI.DASHBOARD // Go directly to dashboard to avoid blip of components on screen
+          }
+        });
+      })
+      .catch((err) => {
+        const message = typeof error === 'object' ? JSON.stringify(err) : err;
+
+        console.error('Failed to load harvester package: ', message); // eslint-disable-line no-console
+
+        this.$dispatch('growl/error', {
+          title:   this.t('harvesterManager.plugins.loadError'),
+          message,
+          timeout: 5000
+        }, { root: true });
+      });
+  }
 }

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

@@ -9,7 +9,7 @@ import jsyaml from 'js-yaml';
 import { eachLimit } from '@shell/utils/promise';
 import { addParams } from '@shell/utils/url';
 import { isEmpty } from '@shell/utils/object';
-import { NAME as HARVESTER } from '@shell/config/product/harvester';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';

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

@@ -2,6 +2,7 @@ import { CREATOR_ID } from '@shell/config/labels-annotations';
 import { _CREATE } from '@shell/config/query-params';
 import { MANAGEMENT, NORMAN } from '@shell/config/types';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { HARVESTER_NAME } from '@shell/config/product/harvester-manager';
 
 export default class CRTB extends HybridModel {
   detailPageHeaderActionOverride(realMode) {
@@ -65,6 +66,9 @@ export default class CRTB extends HybridModel {
     return this.cluster ? this.cluster.nameDisplay : this.clusterName;
   }
 
+  /**
+   * This is used in a table formatter on the management.cattle.io.user detail view which exists outside harvester so no override on this route as there is with listLocation
+   */
   get clusterDetailLocation() {
     if (this.cluster) {
       return this.cluster.detailLocation;
@@ -82,6 +86,11 @@ export default class CRTB extends HybridModel {
   }
 
   get listLocation() {
+    // Harvester uses these resource directly... but has different routes
+    if (this.$rootGetters['currentProduct'].inStore === HARVESTER_NAME) {
+      return { name: `${ HARVESTER_NAME }-c-cluster-members` };
+    }
+
     return { name: 'c-cluster-product-members' };
   }
 

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

@@ -2,6 +2,7 @@ import { DEFAULT_PROJECT, SYSTEM_PROJECT } from '@shell/config/labels-annotation
 import { MANAGEMENT, NAMESPACE, NORMAN } from '@shell/config/types';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import isEmpty from 'lodash/isEmpty';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 
 function clearUnusedResourceQuotas(spec, types) {
   types.forEach((type) => {
@@ -61,10 +62,30 @@ export default class Project extends HybridModel {
     });
   }
 
+  get doneOverride() {
+    return this.listLocation;
+  }
+
   get listLocation() {
+    // Harvester uses these resource directly... but has different routes. listLocation covers routes leading back to route
+    if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
+      return { name: `${ HARVESTER }-c-cluster-projectsnamespaces` };
+    }
+
     return { name: 'c-cluster-product-projectsnamespaces' };
   }
 
+  get _detailLocation() {
+    // Harvester uses these resource directly... but has different routes. detailLocation covers routes leading to resource (like edit)
+    const _detailLocation = super._detailLocation;
+
+    if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
+      _detailLocation.name = `${ HARVESTER }-${ _detailLocation.name }`.replace('-product', '');
+    }
+
+    return _detailLocation;
+  }
+
   get parentLocationOverride() {
     return this.listLocation;
   }
@@ -81,9 +102,9 @@ export default class Project extends HybridModel {
     try {
       await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
     } catch (err) {
-      if (err.status === 409) {
+      if ( err.status === 409 || err.status === 403 ) {
         // The backend updates each new project soon after it is created,
-        // so there is a chance of a resource conflict error. If that happens,
+        // so there is a chance of a resource conflict or forbidden error. If that happens,
         // retry the action.
         await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
       } else {

package/models/namespace.js

@@ -9,6 +9,7 @@ import { escapeHtml } from '@shell/utils/string';
 import { insertAt, isArray } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import Vue from 'vue';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
 
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
@@ -172,11 +173,26 @@ export default class Namespace extends SteveModel {
   }
 
   get listLocation() {
-    if (this.$rootGetters['isSingleProduct']) {
-      return { name: 'c-cluster-product-resource' };
+    const listLocation = { name: this.$rootGetters['isRancher'] ? 'c-cluster-product-projectsnamespaces' : 'c-cluster-product-resource' };
+
+    // Harvester uses these resource directly... but has different routes. listLocation covers routes leading back to route
+    if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
+      listLocation.name = `${ HARVESTER }-${ listLocation.name }`.replace('-product', '');
+      listLocation.params = { resource: 'namespace' };
+    }
+
+    return listLocation;
+  }
+
+  get _detailLocation() {
+    const _detailLocation = super._detailLocation;
+
+    // Harvester uses these resource directly... but has different routes. detailLocation covers routes leading to resource (like edit)
+    if (this.$rootGetters['currentProduct'].inStore === HARVESTER) {
+      _detailLocation.name = `${ HARVESTER }-${ _detailLocation.name }`.replace('-product', '');
     }
 
-    return { name: this.$rootGetters['isRancher'] ? 'c-cluster-product-projectsnamespaces' : 'c-cluster-product-namespaces' };
+    return _detailLocation;
   }
 
   get parentLocationOverride() {

package/models/pod.js

@@ -1,8 +1,8 @@
 import { insertAt } from '@shell/utils/array';
 import { colorForState, stateDisplay } from '@shell/plugins/dashboard-store/resource-class';
 import { NODE, WORKLOAD_TYPES } from '@shell/config/types';
-import SteveModel from '@shell/plugins/steve/steve-class';
 import { escapeHtml, shortenedImage } from '@shell/utils/string';
+import WorkloadService from '@shell/models/workload.service';
 
 export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.DEPLOYMENT]:             1,
@@ -14,7 +14,7 @@ export const WORKLOAD_PRIORITY = {
   [WORKLOAD_TYPES.REPLICATION_CONTROLLER]: 7,
 };
 
-export default class Pod extends SteveModel {
+export default class Pod extends WorkloadService {
   get _availableActions() {
     const out = super._availableActions;
 
@@ -180,4 +180,21 @@ export default class Pod extends SteveModel {
 
     return 0;
   }
+
+  save() {
+    const { metadata, spec } = this.spec.template;
+
+    this.spec = {
+      ...this.spec,
+      metadata: {
+        ...this.metadata,
+        ...metadata
+      },
+      ...spec
+    };
+
+    delete this.spec.template;
+
+    return this._save(...arguments);
+  }
 }

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

@@ -197,12 +197,10 @@ export default class ProvCluster extends SteveModel {
     return super.canEditYaml;
   }
 
-  get isAKS() {
-    return this.provisioner === 'AKS';
-  }
+  get isHostedKubernetesProvider() {
+    const providers = ['AKS', 'EKS', 'GKE'];
 
-  get isEKS() {
-    return this.provisioner === 'EKS';
+    return providers.includes(this.provisioner);
   }
 
   get isImported() {
@@ -230,13 +228,17 @@ export default class ProvCluster extends SteveModel {
   get isImportedK3s() {
     // As of Rancher v2.6.7, this returns false for imported K3s clusters,
     // in which this.provisioner is `k3s`.
-    return this.isImported && this.mgmt?.status?.provider === 'k3s';
+    return this.isImported && this.isK3s;
   }
 
   get isImportedRke2() {
     return this.isImported && this.mgmt?.status?.provider?.startsWith('rke2');
   }
 
+  get isK3s() {
+    return this.mgmt?.status?.provider === 'k3s';
+  }
+
   get isRke2() {
     return !!this.spec?.rkeConfig;
   }
@@ -269,6 +271,10 @@ export default class ProvCluster extends SteveModel {
     return !!this.mgmt?.isReady;
   }
 
+  get eksNodeGroups() {
+    return this.mgmt?.spec?.eksConfig?.nodeGroups;
+  }
+
   waitForProvisioner(timeout, interval) {
     return this.waitForTestFn(() => {
       return !!this.provisioner;
@@ -760,4 +766,8 @@ export default class ProvCluster extends SteveModel {
       await this.$dispatch('ws.resource.remove', { data: this });
     }
   }
+
+  get hasError() {
+    return this.status?.conditions?.some(condition => condition.error === true);
+  }
 }