@rancher/shell 1.2.3 → 2.0.1

package/models/cloudcredential.js

@@ -32,8 +32,16 @@ export default class CloudCredential extends NormanModel {
     };
   }
 
+  get secretName() {
+    return this.id.replace(':', '/');
+  }
+
   get secret() {
-    return this.$rootGetters['management/byId'](SECRET, this.id.replace(':', '/'));
+    return this.$rootGetters['management/byId'](SECRET, this.secretName);
+  }
+
+  async getSecret() {
+    await this.$dispatch('management/find', { type: SECRET, id: this.secretName }, { root: true });
   }
 
   get configKey() {

package/models/cluster/node.js

@@ -187,7 +187,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get cpuCapacity() {
-    return parseSi(this.status.allocatable.cpu);
+    return parseSi(this.status.allocatable?.cpu);
   }
 
   get cpuUsagePercentage() {
@@ -203,7 +203,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get ramCapacity() {
-    return parseSi(this.status.capacity.memory);
+    return parseSi(this.status.capacity?.memory);
   }
 
   get ramUsagePercentage() {
@@ -219,7 +219,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podUsage() {
-    return calculatePercentage(this.status.allocatable.pods, this.status.capacity.pods);
+    return calculatePercentage(this.status.allocatable?.pods, this.status.capacity?.pods);
   }
 
   get podConsumedUsage() {
@@ -227,7 +227,7 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podCapacity() {
-    return Number.parseInt(this.status.capacity.pods);
+    return Number.parseInt(this.status.capacity?.pods);
   }
 
   get podConsumed() {
@@ -450,6 +450,10 @@ export default class ClusterNode extends SteveModel {
   get provider() {
     return this.$rootGetters['currentCluster'].provisioner.toLowerCase();
   }
+
+  get displayTaintsAndLabels() {
+    return !!this.spec.taints?.length || !!this.customLabelCount;
+  }
 }
 
 function calculatePercentage(allocatable, capacity) {

package/models/cluster/schema.js

@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the cluster store
+ */
+export default class ClusterStoreSchema extends SteveSchema { }

package/models/cluster.js

@@ -0,0 +1,33 @@
+import NormanModel from '@shell/plugins/steve/norman-class';
+
+export const LABEL_CONTAINS_PROTECTED = [
+  'io.cattle.lifecycle',
+  'kubernetes.io',
+  'cattle.io',
+  'k3s.io',
+];
+
+export const ANNOTATIONS_CONTAINS_PROTECTED = [
+  'coreos.com',
+  'cattle.io',
+  'k3s.io',
+  'kubernetes.io',
+  'k3s.io',
+];
+export default class NormanCluster extends NormanModel {
+  get systemLabels() {
+    return Object.keys(this.labels || {}).filter((key) => LABEL_CONTAINS_PROTECTED.find((label) => key.includes(label)));
+  }
+
+  get systemAnnotations() {
+    return Object.keys(this.annotations || {}).filter((key) => ANNOTATIONS_CONTAINS_PROTECTED.find((annotation) => key.includes(annotation)));
+  }
+
+  get hasSystemLabels() {
+    return !!(this.systemLabels || []).length;
+  }
+
+  get hasSystemAnnotations() {
+    return !!(this.systemAnnotations || []).length;
+  }
+}

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

@@ -231,7 +231,7 @@ export default class CapiMachine extends SteveModel {
       return false;
     }
 
-    return notOnlyOfRole(this, this.cluster.machines);
+    return notOnlyOfRole(this, this.cluster?.machines);
   }
 
   get roles() {

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

@@ -7,6 +7,7 @@ import { handleConflict } from '@shell/plugins/dashboard-store/normalize';
 import { 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';
 
 export default class CapiMachineDeployment extends SteveModel {
   get cluster() {
@@ -69,6 +70,19 @@ export default class CapiMachineDeployment extends SteveModel {
     return this.template?.providerSize || this.t('node.list.poolDescription.noSize');
   }
 
+  get providerSummary() {
+    if (this.template) {
+      switch (this.infrastructureRefKind) {
+      case HARVESTER_KIND.MACHINE_TEMPLATE:
+        return null;
+      default:
+        return `${ this.providerDisplay } \u2013  ${ this.providerLocation } / ${ this.providerSize } (${ this.providerName })`;
+      }
+    }
+
+    return null;
+  }
+
   get desired() {
     return this.spec?.replicas || 0;
   }

package/models/driver.js

@@ -0,0 +1,63 @@
+import { DESCRIPTION } from '@shell/config/labels-annotations';
+import NormanModel from '@shell/plugins/steve/norman-class';
+import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+import capitalize from 'lodash/capitalize';
+
+export default class Driver extends NormanModel {
+  get canViewYaml() {
+    return false;
+  }
+
+  get driverName() {
+    if (!this.builtIn) {
+      // if the driver is not built in, there's a good change its a custom one
+      // custom drivers have a random id, so shouldn't be used as the type
+      // instead use the status.displayName. this will map to the name extracted from the binary
+      const driverName = this.status?.displayName?.toLowerCase();
+
+      if (driverName) {
+        // some drivers are built in but don't have the builtIn flag. ensure we pass these through K_TO_D
+        return KONTAINER_TO_DRIVER[driverName] || driverName;
+      }
+    }
+
+    return KONTAINER_TO_DRIVER[this.id] || this.name || this.id;
+  }
+
+  get nameDisplay() {
+    const path = `cluster.provider.${ this.driverName }`;
+    const label = capitalize(this.driverName);
+
+    return this.$rootGetters['i18n/withFallback'](path, label);
+  }
+
+  get description() {
+    if (!!this.builtIn || !!this.builtin) {
+      return this.$rootGetters['i18n/withFallback']('tableHeaders.builtIn');
+    } else {
+      return this.url;
+    }
+  }
+
+  /**
+   * Set description based on the type of model available with private fallback
+   */
+  set description(value) {
+    if (this.annotations) {
+      this.annotations[DESCRIPTION] = value;
+    }
+
+    this._description = value;
+  }
+
+  cleanForSave(data, forNew) {
+    const val = super.cleanForSave(data, forNew);
+
+    if (forNew) {
+      val.active = true;
+    }
+    delete val.metadata;
+
+    return val;
+  }
+}

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

@@ -107,6 +107,10 @@ export default class FleetCluster extends SteveModel {
     return this.metadata?.labels?.[FLEET_LABELS.CLUSTER_DISPLAY_NAME] || this.metadata?.name || this.id;
   }
 
+  get name() {
+    return this.metadata?.name || this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME];
+  }
+
   get state() {
     if (this.spec?.paused === true) {
       return 'paused';
@@ -115,17 +119,6 @@ export default class FleetCluster extends SteveModel {
     return this.metadata?.state?.name || 'unknown';
   }
 
-  get nodeInfo() {
-    const ready = this.status?.agent?.readyNodes || 0;
-    const unready = this.status?.agent?.nonReadyNodes || 0;
-
-    return {
-      ready,
-      unready,
-      total: ready + unready,
-    };
-  }
-
   get repoInfo() {
     const ready = this.status?.readyGitRepos || 0;
     const total = this.status?.desiredReadyGitRepos || 0;
@@ -137,6 +130,29 @@ export default class FleetCluster extends SteveModel {
     };
   }
 
+  get bundleInfo() {
+    const bundlesData = {
+      ready: 0,
+      total: 0
+    };
+    const readyBundles = this.status?.display?.readyBundles;
+
+    if (readyBundles && readyBundles.includes('/')) {
+      const dataArr = readyBundles.split('/');
+
+      if (dataArr.length === 2 && parseInt(dataArr[0]) >= 0 && parseInt(dataArr[1]) >= 0) {
+        bundlesData.ready = parseInt(dataArr[0]);
+        bundlesData.total = parseInt(dataArr[1]);
+
+        return bundlesData;
+      }
+    }
+
+    bundlesData.noValidData = true;
+
+    return bundlesData;
+  }
+
   get mgmt() {
     const mgmt = this.$getters['byId'](MANAGEMENT.CLUSTER, this.metadata?.labels?.[FLEET_LABELS.CLUSTER_NAME]);
 

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

@@ -7,7 +7,9 @@ import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addObject, addObjects, findBy, insertAt } from '@shell/utils/array';
 import { set } from '@shell/utils/object';
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { STATES_ENUM, colorForState, stateDisplay, stateSort } from '@shell/plugins/dashboard-store/resource-class';
+import {
+  STATES_ENUM, colorForState, mapStateToEnum, primaryDisplayStatusFromCount, stateDisplay, stateSort
+} from '@shell/plugins/dashboard-store/resource-class';
 import { NAME } from '@shell/config/product/explorer';
 
 function quacksLikeAHash(str) {
@@ -103,6 +105,8 @@ export default class GitRepo extends SteveModel {
     const groups = workspace?.clusterGroups || [];
 
     if (workspace?.id === 'fleet-local') {
+      // should we be getting the clusters from workspace.clusters instead of having to rely on the groups,
+      // which takes an additional request to be done on the Fleet dashboard screen?
       const local = findBy(groups, 'id', 'fleet-local/default');
 
       if (local) {
@@ -203,17 +207,6 @@ export default class GitRepo extends SteveModel {
     return hash;
   }
 
-  get clusterInfo() {
-    const ready = this.status?.readyClusters || 0;
-    const total = this.status?.desiredReadyClusters || 0;
-
-    return {
-      ready,
-      unready: total - ready,
-      total,
-    };
-  }
-
   get targetInfo() {
     let mode = null;
     let cluster = null;
@@ -323,6 +316,14 @@ export default class GitRepo extends SteveModel {
     return 0;
   }
 
+  get targetClustersReady() {
+    if (this.targetClusters && this.targetClusters.length) {
+      return this.targetClusters.filter((cluster) => cluster.state === 'active');
+    }
+
+    return 0;
+  }
+
   get bundleDeployments() {
     const bds = this.$getters['all'](FLEET.BUNDLE_DEPLOYMENT);
 
@@ -384,8 +385,9 @@ export default class GitRepo extends SteveModel {
           namespace:              r.namespace,
           name:                   r.name,
           clusterId:              c.id,
+          clusterLabel:           c.metadata.labels[FLEET_ANNOTATIONS.CLUSTER_NAME],
           clusterName:            c.nameDisplay,
-          state,
+          state:                  mapStateToEnum(state),
           stateBackground:        color,
           stateDisplay:           display,
           stateSort:              stateSort(color, display),
@@ -401,6 +403,57 @@ export default class GitRepo extends SteveModel {
     return out;
   }
 
+  get clusterInfo() {
+    const ready = this.status?.readyClusters || 0;
+    const total = this.status?.desiredReadyClusters || 0;
+
+    return {
+      ready,
+      unready: total - ready,
+      total,
+    };
+  }
+
+  get clusterResourceStatus() {
+    const clusterStatuses = this.resourcesStatuses.reduce((prev, curr) => {
+      const { clusterId, clusterLabel } = curr;
+
+      const state = curr.state;
+
+      if (!prev[clusterId]) {
+        prev[clusterId] = {
+          clusterLabel,
+          resourceCounts: { [state]: 0, desiredReady: 0 }
+
+        };
+      }
+
+      if (!prev[clusterId].resourceCounts[state]) {
+        prev[clusterId].resourceCounts[state] = 0;
+      }
+
+      prev[clusterId].resourceCounts[state] += 1;
+      prev[clusterId].resourceCounts.desiredReady += 1;
+
+      return prev;
+    }, {});
+
+    const values = Object.keys(clusterStatuses).map((key) => {
+      const { clusterLabel, resourceCounts } = clusterStatuses[key];
+
+      return {
+        clusterId: key,
+        clusterLabel, // FLEET LABEL
+        status:    {
+          displayStatus:  primaryDisplayStatusFromCount(resourceCounts),
+          resourceCounts: { ...resourceCounts }
+        }
+      };
+    });
+
+    return values;
+  }
+
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }

package/models/helm.cattle.io.projecthelmchart.js

@@ -22,7 +22,7 @@ export default class ProjectHelmChart extends SteveModel {
     const clusterId = this.$rootGetters['currentCluster']?.id;
     const project = this.$rootGetters['management/byId'](MANAGEMENT.PROJECT, `${ clusterId }/${ this.projectId }`);
 
-    return project.spec.displayName;
+    return project?.spec.displayName;
   }
 
   get namespaces() {

package/models/kontainerdriver.js

@@ -0,0 +1,85 @@
+import Driver from '@shell/models/driver';
+
+export default class KontainerDriver extends Driver {
+  get doneRoute() {
+    return 'c-cluster-manager-driver-kontainerdriver';
+  }
+
+  get _availableActions() {
+    const out = [
+      {
+        action:     'activate',
+        label:      this.t('action.activate'),
+        icon:       'icon icon-play',
+        bulkable:   true,
+        bulkAction: 'activateBulk',
+        enabled:    !!this.links.update && !this.active
+      },
+      {
+        action:     'deactivate',
+        label:      this.t('action.deactivate'),
+        icon:       'icon icon-pause',
+        bulkable:   true,
+        bulkAction: 'deactivateBulk',
+        enabled:    !!this.links.update && !!this.active,
+        weight:     -1
+      },
+      { divider: true },
+      {
+        action:  'viewInApi',
+        enabled: true,
+        icon:    'icon icon-external-link',
+        label:   this.t('action.viewInApi'),
+      },
+      { divider: true },
+      {
+        action:   'goToEdit',
+        label:    this.t('action.edit'),
+        icon:     'icon icon-edit',
+        bulkable: false,
+        enabled:  !!this.links.update && !this.builtin,
+      },
+      {
+        action:     'promptRemove',
+        altAction:  'remove',
+        bulkAction: 'promptRemove',
+        label:      this.t('action.remove'),
+        bulkable:   true,
+        icon:       'icon icon-delete',
+        enabled:    !!this.links.remove,
+        weight:     -10,
+      }
+    ];
+
+    return out;
+  }
+
+  deactivate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  deactivateBulk(resources) {
+    this.$dispatch('promptModal', {
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  activate() {
+    return this.$dispatch('rancher/request', {
+      url:    `v3/kontainerDrivers/${ escape(this.id) }?action=activate`,
+      method: 'post',
+    }, { root: true });
+  }
+
+  async activateBulk(resources) {
+    await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
+      url:    `v3/kontainerDrivers/${ escape(resource.id) }?action=activate`,
+      method: 'post',
+    }, { root: true }
+    )));
+  }
+}

package/models/management/schema.js

@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the management store
+ */
+export default class ManagementStoreSchema extends SteveSchema { }

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

@@ -14,10 +14,11 @@ export const configType = {
   googleoauth:     'oauth',
   local:           '',
   github:          'oauth',
-  keycloakoidc:    'oidc'
+  keycloakoidc:    'oidc',
+  genericoidc:     'oidc',
 };
 
-const imageOverrides = { keycloakoidc: 'keycloak' };
+const imageOverrides = { keycloakoidc: 'keycloak', genericoidc: 'openid' };
 
 export default class AuthConfig extends SteveModel {
   get _availableActions() {

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

@@ -1,4 +1,3 @@
-import Vue from 'vue';
 import { CATALOG, CLUSTER_BADGE } from '@shell/config/labels-annotations';
 import { NODE, FLEET, MANAGEMENT, CAPI } from '@shell/config/types';
 import { insertAt, addObject, removeObject } from '@shell/utils/array';
@@ -15,6 +14,7 @@ import HybridModel from '@shell/plugins/steve/hybrid-class';
 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';
 
 // See translation file cluster.providers for list of providers
 // If the logo is not named with the provider name, add an override here
@@ -88,6 +88,10 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get provisioner() {
+    if (this.status?.provider ) {
+      return this.status.provider;
+    }
+
     // For imported K3s clusters, this.status.driver is 'k3s.'
     return this.status?.driver ? this.status.driver : 'imported';
   }
@@ -295,9 +299,10 @@ export default class MgmtCluster extends HybridModel {
 
   // Custom badge to show for the Cluster (if the appropriate annotations are set)
   get badge() {
-    const text = this.metadata?.annotations?.[CLUSTER_BADGE.TEXT];
+    const icon = this.metadata?.annotations?.[CLUSTER_BADGE.ICON_TEXT];
+    const comment = this.metadata?.annotations?.[CLUSTER_BADGE.TEXT];
 
-    if (!text) {
+    if (!icon && !comment) {
       return undefined;
     }
 
@@ -305,10 +310,10 @@ export default class MgmtCluster extends HybridModel {
     const iconText = this.metadata?.annotations[CLUSTER_BADGE.ICON_TEXT] || '';
 
     return {
-      text,
+      text:      comment || undefined,
       color,
       textColor: textColor(parseColor(color)),
-      iconText:  iconText.substr(0, 2)
+      iconText:  iconText.substr(0, 3)
     };
   }
 
@@ -404,9 +409,13 @@ export default class MgmtCluster extends HybridModel {
   }
 
   async copyKubeConfig() {
-    const config = await this.generateKubeConfig();
+    try {
+      const config = await this.generateKubeConfig();
 
-    Vue.prototype.$copyText(config);
+      if (config) {
+        await copyTextToClipboard(config);
+      }
+    } catch {}
   }
 
   async fetchNodeMetrics() {

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

@@ -37,6 +37,7 @@ export default class GlobalRole extends SteveDescriptionModel {
   }
 
   get nameDisplay() {
+    // i18n-uses rbac.globalRoles.role.*.label
     const path = `rbac.globalRoles.role.${ this.id }.label`;
     const label = this.displayName || this.metadata?.name || this.id;
 
@@ -46,6 +47,7 @@ export default class GlobalRole extends SteveDescriptionModel {
   get descriptionDisplay() {
     return this.description ||
     this.metadata?.annotations?.[DESCRIPTION] ||
+    // i18n-uses rbac.globalRoles.role.*.description
     this.$rootGetters['i18n/withFallback'](`rbac.globalRoles.role.${ this.id }.description`, this.t(`rbac.globalRoles.unknownRole.description`));
   }
 

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

@@ -1,6 +1,7 @@
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 
 const HIDDEN = ['rke', 'rancherkubernetesengine'];
+
 const V2 = ['amazoneks', 'googlegke', 'azureaks'];
 const IMPORTABLE = ['amazoneks', 'googlegke', 'azureaks'];
 

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

@@ -8,6 +8,7 @@ import { insertAt } from '@shell/utils/array';
 import { downloadUrl } from '@shell/utils/download';
 import findLast from 'lodash/findLast';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 
 export default class MgmtNode extends HybridModel {
   get _availableActions() {
@@ -21,11 +22,12 @@ export default class MgmtNode extends HybridModel {
     };
 
     const scaleDown = {
-      action:   'scaleDown',
-      enabled:  !!this.canScaleDown,
-      icon:     'icon icon-minus icon-fw',
-      label:    this.t('node.actions.scaleDown'),
-      bulkable: true,
+      action:     'scaleDown',
+      bulkAction: 'scaleDown',
+      enabled:    !!this.canScaleDown,
+      icon:       'icon icon-minus icon-fw',
+      label:      this.t('node.actions.scaleDown'),
+      bulkable:   true,
     };
 
     insertAt(out, 0, { divider: true });
@@ -105,12 +107,12 @@ export default class MgmtNode extends HybridModel {
     }
   }
 
-  async scaleDown(resources) {
-    const safeResources = Array.isArray(resources) ? resources : [this];
-
-    await Promise.all(safeResources.map((node) => {
-      return node.norman?.doAction('scaledown');
-    }));
+  async scaleDown(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component:  'ScaleMachineDownDialog',
+      modalWidth: '450px'
+    });
   }
 
   get provisioningCluster() {
@@ -166,10 +168,12 @@ export default class MgmtNode extends HybridModel {
   }
 
   get canScaleDown() {
-    const isInOnlyPool = this.pool?.provisioningCluster?.pools?.length === 1;
-    const isOnlyNode = this.pool?.nodes?.length === 1;
+    if (!this.isEtcd && !this.isControlPlane) {
+      return true;
+    }
+
     const hasAction = this.norman?.actions?.scaledown;
 
-    return hasAction && (!isInOnlyPool || !isOnlyNode);
+    return hasAction && notOnlyOfRole(this, this.provisioningCluster?.nodes);
   }
 }