@rancher/shell 0.2.5 → 0.3.1

package/models/cluster/node.js

@@ -14,26 +14,26 @@ export default class ClusterNode extends SteveModel {
     const normanAction = this.norman?.actions || {};
 
     const cordon = {
-      action:     'cordon',
-      enabled:    !!normanAction.cordon,
-      icon:       'icon icon-fw icon-pause',
-      label:      'Cordon',
-      total:      1,
-      bulkable:   true
+      action:   'cordon',
+      enabled:  !!normanAction.cordon,
+      icon:     'icon icon-fw icon-pause',
+      label:    'Cordon',
+      total:    1,
+      bulkable: true
     };
 
     const uncordon = {
-      action:     'uncordon',
-      enabled:    !!normanAction.uncordon,
-      icon:       'icon icon-fw icon-play',
-      label:      'Uncordon',
-      total:      1,
-      bulkable:   true
+      action:   'uncordon',
+      enabled:  !!normanAction.uncordon,
+      icon:     'icon icon-fw icon-play',
+      label:    'Uncordon',
+      total:    1,
+      bulkable: true
     };
 
     const drain = {
       action:     'drain',
-      enabled:     !!normanAction.drain,
+      enabled:    !!normanAction.drain,
       icon:       'icon icon-fw icon-dot-open',
       label:      this.t('drainNode.action'),
       bulkable:   true,
@@ -41,25 +41,25 @@ export default class ClusterNode extends SteveModel {
     };
 
     const stopDrain = {
-      action:     'stopDrain',
-      enabled:    !!normanAction.stopDrain,
-      icon:       'icon icon-fw icon-x',
-      label:      this.t('drainNode.actionStop'),
-      bulkable:   true,
+      action:   'stopDrain',
+      enabled:  !!normanAction.stopDrain,
+      icon:     'icon icon-fw icon-x',
+      label:    this.t('drainNode.actionStop'),
+      bulkable: true,
     };
 
     const openSsh = {
-      action:     'openSsh',
-      enabled:    !!this.provisionedMachine?.links?.shell,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      'SSH Shell',
+      action:  'openSsh',
+      enabled: !!this.provisionedMachine?.links?.shell,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   'SSH Shell',
     };
 
     const downloadKeys = {
-      action:     'downloadKeys',
-      enabled:    !!this.provisionedMachine?.links?.sshkeys,
-      icon:       'icon icon-fw icon-download',
-      label:      this.t('node.actions.downloadSSHKey'),
+      action:  'downloadKeys',
+      enabled: !!this.provisionedMachine?.links?.sshkeys,
+      icon:    'icon icon-fw icon-download',
+      label:   this.t('node.actions.downloadSSHKey'),
     };
 
     return [
@@ -201,7 +201,9 @@ export default class ClusterNode extends SteveModel {
   }
 
   get podConsumed() {
-    return this.pods.length;
+    const runningPods = this.pods.filter(pod => pod.state === 'running');
+
+    return runningPods.length || 0;
   }
 
   get podRequests() {
@@ -310,7 +312,13 @@ export default class ClusterNode extends SteveModel {
   }
 
   drain(resources) {
-    this.$dispatch('promptModal', { component: 'DrainNode', resources: [resources || [this], this.normanNodeId] });
+    this.$dispatch('promptModal', {
+      component:      'DrainNode',
+      componentProps: {
+        kubeNodes:    resources || [this],
+        normanNodeId: this.normanNodeId
+      }
+    });
   }
 
   async stopDrain(resources) {
@@ -336,12 +344,12 @@ export default class ClusterNode extends SteveModel {
   get details() {
     const details = [
       {
-        label:    this.t('node.detail.detailTop.version'),
-        content:  this.version
+        label:   this.t('node.detail.detailTop.version'),
+        content: this.version
       },
       {
-        label:    this.t('node.detail.detailTop.os'),
-        content:  this.status.nodeInfo.osImage
+        label:   this.t('node.detail.detailTop.os'),
+        content: this.status.nodeInfo.osImage
       },
       {
         label:         this.t('node.detail.detailTop.containerRuntime'),
@@ -352,17 +360,17 @@ export default class ClusterNode extends SteveModel {
 
     if (this.internalIp) {
       details.unshift({
-        label:         this.t('node.detail.detailTop.internalIP'),
-        formatter:     'CopyToClipboard',
-        content:       this.internalIp
+        label:     this.t('node.detail.detailTop.internalIP'),
+        formatter: 'CopyToClipboard',
+        content:   this.internalIp
       });
     }
 
     if (this.externalIp) {
       details.unshift({
-        label:         this.t('node.detail.detailTop.externalIP'),
-        formatter:     'CopyToClipboard',
-        content:       this.externalIp
+        label:     this.t('node.detail.detailTop.externalIP'),
+        formatter: 'CopyToClipboard',
+        content:   this.externalIp
       });
     }
 

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

@@ -58,23 +58,23 @@ export default class CapiMachine extends SteveModel {
     const out = super._availableActions;
 
     const openSsh = {
-      action:     'openSsh',
-      enabled:    !!this.links.shell && this.isRunning,
-      icon:       'icon icon-fw icon-chevron-right',
-      label:      'SSH Shell',
+      action:  'openSsh',
+      enabled: !!this.links.shell && this.isRunning,
+      icon:    'icon icon-fw icon-chevron-right',
+      label:   'SSH Shell',
     };
     const downloadKeys = {
-      action:     'downloadKeys',
-      enabled:    !!this.links.sshkeys,
-      icon:       'icon icon-fw icon-download',
-      label:      this.t('node.actions.downloadSSHKey'),
+      action:  'downloadKeys',
+      enabled: !!this.links.sshkeys,
+      icon:    'icon icon-fw icon-download',
+      label:   this.t('node.actions.downloadSSHKey'),
     };
     const forceRemove = {
-      action:     'toggleForceRemoveModal',
-      altAction:  'forceMachineRemove',
-      enabled:    !!this.isRemoveForceable,
-      label:      this.t('node.actions.forceDelete'),
-      icon:       'icon icon-trash',
+      action:    'toggleForceRemoveModal',
+      altAction: 'forceMachineRemove',
+      enabled:   !!this.isRemoveForceable,
+      label:     this.t('node.actions.forceDelete'),
+      icon:      'icon icon-trash',
     };
     const scaleDown = {
       action:     'toggleScaleDownModal',
@@ -114,8 +114,8 @@ export default class CapiMachine extends SteveModel {
 
   toggleForceRemoveModal(resources = this) {
     this.$dispatch('promptModal', {
-      resources,
-      component: 'ForceMachineRemoveDialog'
+      componentProps: { machine: resources },
+      component:      'ForceMachineRemoveDialog'
     });
   }
 
@@ -242,7 +242,29 @@ export default class CapiMachine extends SteveModel {
     return this.status?.phase === 'Running';
   }
 
-  get ipaddress() {
-    return this.status?.addresses?.find(({ type }) => type === ADDRESSES.INTERNAL_IP)?.address || '-';
+  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 externalIp() {
+    const external = this.status?.addresses?.find(({ type }) => {
+      return type === ADDRESSES.EXTERNAL_IP;
+    })?.address;
+
+    if (external) {
+      return external;
+    }
+
+    return this.t('generic.none');
   }
 }

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

@@ -6,6 +6,7 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 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';
 
 export default class CapiMachineDeployment extends SteveModel {
   get cluster() {
@@ -34,6 +35,10 @@ export default class CapiMachineDeployment extends SteveModel {
     return `${ this.$rootGetters['i18n/t']('resourceTable.groupLabel.machinePool', { name: escapeHtml(this.nameDisplay) }) }`;
   }
 
+  get infrastructureRefKind() {
+    return this.spec?.template?.spec?.infrastructureRef?.kind;
+  }
+
   get templateType() {
     return this.spec.template.spec.infrastructureRef.kind ? `rke-machine.cattle.io.${ this.spec.template.spec.infrastructureRef.kind.toLowerCase() }` : null;
   }
@@ -94,7 +99,7 @@ export default class CapiMachineDeployment extends SteveModel {
 
   // use this pool's definition in the cluster's rkeConfig to scale, not this.spec.replicas
   get inClusterSpec() {
-    const machineConfigName = this.template.metadata.annotations['rke.cattle.io/cloned-from-name'];
+    const machineConfigName = this.template?.metadata?.annotations['rke.cattle.io/cloned-from-name'];
     const machinePools = this.cluster.spec.rkeConfig.machinePools;
 
     return machinePools.find(pool => pool.machineConfigRef.name === machineConfigName);
@@ -147,7 +152,7 @@ export default class CapiMachineDeployment extends SteveModel {
 
   // 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) {
+    if (!this.canUpdate || this.inClusterSpec?.quantity === 0 || this.infrastructureRefKind === KIND.MACHINE_INV_SELECTOR_TEMPLATES) {
       return false;
     }
 
@@ -159,7 +164,12 @@ export default class CapiMachineDeployment extends SteveModel {
     return notOnlyOfRole(this, this.cluster.machines);
   }
 
+  // prevent scaling up pool for Elemental machines
   canScaleUpPool() {
+    if (this.infrastructureRefKind === KIND.MACHINE_INV_SELECTOR_TEMPLATES) {
+      return false;
+    }
+
     return true;
   }
 

package/models/constraints.gatekeeper.sh.constraint.js

@@ -56,7 +56,7 @@ export default class GateKeeperConstraint extends SteveModel {
     return violations.map((violation) => {
       return {
         ...violation,
-        resourceLink:     {
+        resourceLink: {
           text: violation.name,
           to:   {
             name:   'c-cluster-product-resource-id',

package/models/etcdbackup.js

@@ -3,10 +3,10 @@ import NormanModel from '@shell/plugins/steve/norman-class';
 export default class Rke1EtcdBackup extends NormanModel {
   get _availableActions() {
     const restore = {
-      action:     'promptRestore',
-      enabled:    true,
-      icon:       'icon icon-fw icon-backup-restore',
-      label:      'Restore'
+      action:  'promptRestore',
+      enabled: true,
+      icon:    'icon icon-fw icon-backup-restore',
+      label:   'Restore'
     };
 
     const baseActions = super._availableActions;

package/models/event.js

@@ -24,4 +24,11 @@ export default class K8sEvent extends SteveModel {
   get eventType() {
     return this._type;
   }
+
+  get lastSeen() {
+    const schema = this.$getters['schemaFor'](this.type);
+    const rowValueGetter = this.$rootGetters['type-map/rowValueGetter'];
+
+    return schema && rowValueGetter ? rowValueGetter(schema, 'Last Seen')(this) : null;
+  }
 }

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

@@ -9,27 +9,27 @@ export default class FleetCluster extends SteveModel {
     const out = super._availableActions;
 
     insertAt(out, 0, {
-      action:     'pause',
-      label:      'Pause',
-      icon:       'icon icon-pause',
-      bulkable:    true,
-      enabled:    !!this.links.update && !this.spec?.paused
+      action:   'pause',
+      label:    'Pause',
+      icon:     'icon icon-pause',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.paused
     });
 
     insertAt(out, 1, {
-      action:     'unpause',
-      label:      'Unpause',
-      icon:       'icon icon-play',
-      bulkable:    true,
-      enabled:    !!this.links.update && this.spec?.paused === true
+      action:   'unpause',
+      label:    'Unpause',
+      icon:     'icon icon-play',
+      bulkable: true,
+      enabled:  !!this.links.update && this.spec?.paused === true
     });
 
     insertAt(out, 2, {
-      action:     'forceUpdate',
-      label:      'Force Update',
-      icon:       'icon icon-refresh',
-      bulkable:   true,
-      enabled:    !!this.links.update
+      action:   'forceUpdate',
+      label:    'Force Update',
+      icon:     'icon icon-refresh',
+      bulkable: true,
+      enabled:  !!this.links.update
     });
 
     insertAt(out, 3, {

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

@@ -53,7 +53,7 @@ export default class FleetClusterGroup extends SteveModel {
     const out = [
       {
         label:   'Clusters Ready',
-        content:  `${ this.clusterInfo.ready } of ${ this.clusterInfo.total }`,
+        content: `${ this.clusterInfo.ready } of ${ this.clusterInfo.total }`,
       },
     ];
 

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

@@ -39,27 +39,27 @@ export default class GitRepo extends SteveModel {
     const out = super._availableActions;
 
     insertAt(out, 0, {
-      action:     'pause',
-      label:      'Pause',
-      icon:       'icon icon-pause',
-      bulkable:    true,
-      enabled:    !!this.links.update && !this.spec?.paused
+      action:   'pause',
+      label:    'Pause',
+      icon:     'icon icon-pause',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.paused
     });
 
     insertAt(out, 1, {
-      action:     'unpause',
-      label:      'Unpause',
-      icon:       'icon icon-play',
-      bulkable:    true,
-      enabled:    !!this.links.update && this.spec?.paused === true
+      action:   'unpause',
+      label:    'Unpause',
+      icon:     'icon icon-play',
+      bulkable: true,
+      enabled:  !!this.links.update && this.spec?.paused === true
     });
 
     insertAt(out, 2, {
-      action:     'forceUpdate',
-      label:      'Force Update',
-      icon:       'icon icon-refresh',
-      bulkable:    true,
-      enabled:    !!this.links.update
+      action:   'forceUpdate',
+      label:    'Force Update',
+      icon:     'icon icon-refresh',
+      bulkable: true,
+      enabled:  !!this.links.update
     });
 
     insertAt(out, 3, { divider: true });

package/models/group.principal.js

@@ -36,7 +36,7 @@ export default class Group extends Principal {
         action:  'goToEdit',
         label:   this.t('action.edit'),
         icon:    'icon icon-edit',
-        enabled:  true,
+        enabled: true,
       },
       {
         action:     'promptUnassignGroupRoles',

package/models/logging.banzaicloud.io.clusterflow.js

@@ -28,8 +28,8 @@ export default class LogClusterFlow extends Flow {
   get customValidationRules() {
     return [
       {
-        path:           'spec',
-        validators:     ['flowOutput'],
+        path:       'spec',
+        validators: ['flowOutput'],
       },
     ];
   }

package/models/logging.banzaicloud.io.flow.js

@@ -20,6 +20,10 @@ export function matchRuleIsPopulated(rule) {
     return true;
   }
 
+  if ( rule.namespaces?.length ) {
+    return true;
+  }
+
   return false;
 }
 
@@ -102,8 +106,8 @@ export default class LogFlow extends SteveModel {
   get customValidationRules() {
     return [
       {
-        path:           'spec',
-        validators:     ['flowOutput:verifyLocal'],
+        path:       'spec',
+        validators: ['flowOutput:verifyLocal'],
       },
     ];
   }

package/models/logging.banzaicloud.io.output.js

@@ -76,6 +76,18 @@ export const PROVIDERS = [
     labelKey: 'logging.outputProviders.newrelic',
     default:  { },
   },
+  {
+    name:     'opensearch',
+    labelKey: 'logging.outputProviders.opensearch',
+    default:  {},
+  },
+  {
+    name:     'redis',
+    labelKey: 'logging.outputProviders.redis',
+    default:  {
+      port: 6379, db_number: 0, ttl: 0
+    },
+  },
   {
     name:     'splunkHec',
     labelKey: 'logging.outputProviders.splunkHec',
@@ -142,7 +154,7 @@ export default class LogOutput extends SteveModel {
   get url() {
     return {
       name:   'c-cluster-product-resource-namespace-id',
-      params:   {
+      params: {
         resource:  this.type,
         id:        this.name,
         namespace: this.namespace
@@ -153,8 +165,8 @@ export default class LogOutput extends SteveModel {
   get customValidationRules() {
     return [
       {
-        path:           'spec.logdna',
-        validators:     ['logdna'],
+        path:       'spec.logdna',
+        validators: ['logdna'],
       }
     ];
   }

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

@@ -24,10 +24,10 @@ export default class AuthConfig extends SteveModel {
     const out = super._availableActions;
 
     insertAt(out, 0, {
-      action:     'disable',
-      label:      'Disable',
-      icon:       'icon icon-spinner',
-      enabled:    this.enabled === true,
+      action:  'disable',
+      label:   'Disable',
+      icon:    'icon icon-spinner',
+      enabled: this.enabled === true,
     });
 
     insertAt(out, 1, { divider: 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 { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
 import { LINUX, WINDOWS } from '@shell/store/catalog';
@@ -43,10 +43,10 @@ export default class MgmtCluster extends HybridModel {
     const out = super._availableActions;
 
     insertAt(out, 0, {
-      action:     'openShell',
-      label:      this.t('nav.shell'),
-      icon:       'icon icon-terminal',
-      enabled:    !!this.links.shell,
+      action:  'openShell',
+      label:   this.t('nav.shell'),
+      icon:    'icon icon-terminal',
+      enabled: !!this.links.shell,
     });
 
     insertAt(out, 1, {
@@ -59,11 +59,11 @@ export default class MgmtCluster extends HybridModel {
     });
 
     insertAt(out, 2, {
-      action:     'copyKubeConfig',
-      label:      this.t('cluster.copyConfig'),
-      bulkable:   false,
-      enabled:    this.$rootGetters['isRancher'] && this.hasAction('generateKubeconfig'),
-      icon:       'icon icon-copy',
+      action:   'copyKubeConfig',
+      label:    this.t('cluster.copyConfig'),
+      bulkable: false,
+      enabled:  this.$rootGetters['isRancher'] && this.hasAction('generateKubeconfig'),
+      icon:     'icon icon-copy',
     });
 
     return out;

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

@@ -2,7 +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';
+import { HARVESTER_NAME } from '@shell/config/features';
 
 export default class CRTB extends HybridModel {
   detailPageHeaderActionOverride(realMode) {
@@ -77,9 +77,9 @@ export default class CRTB extends HybridModel {
     const name = `c-cluster-product-resource-id`;
 
     const params = {
-      resource:  MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING,
-      id:        this.clusterName,
-      product:   'explorer',
+      resource: MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING,
+      id:       this.clusterName,
+      product:  'explorer',
     };
 
     return { name, params };
@@ -116,11 +116,11 @@ export default class CRTB extends HybridModel {
       const principalProperty = principal.principalType === 'group' ? 'groupPrincipalId' : 'userPrincipalId';
 
       return this.$dispatch(`rancher/create`, {
-        type:                  NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING,
-        roleTemplateId:        this.roleTemplateName,
-        [principalProperty]:   principal.id,
-        clusterId:             this.clusterName,
-        id:                    this.id?.replace('/', ':')
+        type:                NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING,
+        roleTemplateId:      this.roleTemplateName,
+        [principalProperty]: principal.id,
+        clusterId:           this.clusterName,
+        id:                  this.id?.replace('/', ':')
       }, { root: true });
     })();
   }

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

@@ -1,10 +1,11 @@
 import { DESCRIPTION } from '@shell/config/labels-annotations';
 import { SCHEMA, NORMAN } from '@shell/config/types';
-import { CATTLE_API_GROUP, SUBTYPE_MAPPING } from '@shell/models/management.cattle.io.roletemplate';
+import { CATTLE_API_GROUP, SUBTYPE_MAPPING, CREATE_VERBS } from '@shell/models/management.cattle.io.roletemplate';
 import { uniq } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
-import SteveModel from '@shell/plugins/steve/steve-class';
+import SteveDescriptionModel from '@shell/plugins/steve/steve-description-class';
 import Role from './rbac.authorization.k8s.io.role';
+import { AS, MODE, _CLONE, _UNFLAG } from '@shell/config/query-params';
 
 const BASE = 'user-base';
 const USER = 'user';
@@ -13,7 +14,7 @@ const SPECIAL = [BASE, ADMIN, USER];
 
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 
-export default class GlobalRole extends SteveModel {
+export default class GlobalRole extends SteveDescriptionModel {
   get customValidationRules() {
     return Role.customValidationRules();
   }
@@ -22,8 +23,8 @@ export default class GlobalRole extends SteveModel {
     const out = this._details;
 
     out.unshift({
-      label:         this.t('resourceDetail.detailTop.name'),
-      content:       get(this, 'name')
+      label:   this.t('resourceDetail.detailTop.name'),
+      content: get(this, 'name')
     });
 
     return out;
@@ -113,6 +114,26 @@ export default class GlobalRole extends SteveModel {
     })();
   }
 
+  get canCreate() {
+    const schema = this.$getters['schemaFor'](this.type);
+
+    return schema?.resourceMethods.find(verb => CREATE_VERBS.has(verb));
+  }
+
+  goToClone(moreQuery = {}) {
+    const location = this.detailLocation;
+
+    location.query = {
+      ...location.query,
+      [MODE]:      _CLONE,
+      [AS]:        _UNFLAG,
+      roleContext: GLOBAL,
+      ...moreQuery
+    };
+
+    this.currentRouter().push(location);
+  }
+
   async save() {
     const norman = await this.norman;