@rancher/shell 0.2.5 → 0.3.1

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

@@ -6,6 +6,7 @@ import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
 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';
 
 export default class MgmtNode extends HybridModel {
@@ -13,18 +14,18 @@ export default class MgmtNode extends HybridModel {
     const out = super._availableActions;
 
     const downloadKeys = {
-      action:     'downloadKeys',
-      enabled:    !!this.norman?.links?.nodeConfig,
-      icon:       'icon icon-fw icon-download',
-      label:      this.t('node.actions.downloadNodeConfig'),
+      action:  'downloadKeys',
+      enabled: !!this.norman?.links?.nodeConfig,
+      icon:    'icon icon-fw icon-download',
+      label:   this.t('node.actions.downloadNodeConfig'),
     };
 
     const scaleDown = {
-      action:     'scaleDown',
-      enabled:    !!this.canScaleDown,
-      icon:       'icon icon-minus icon-fw',
-      label:      this.t('node.actions.scaleDown'),
-      bulkable:   true,
+      action:   'scaleDown',
+      enabled:  !!this.canScaleDown,
+      icon:     'icon icon-minus icon-fw',
+      label:    this.t('node.actions.scaleDown'),
+      bulkable: true,
     };
 
     insertAt(out, 0, { divider: true });
@@ -124,8 +125,42 @@ export default class MgmtNode extends HybridModel {
     return false;
   }
 
-  get ipaddress() {
-    return this.status.internalNodeStatus?.addresses?.find(({ type }) => type === ADDRESSES.INTERNAL_IP)?.address || '-';
+  get internalIp() {
+    // This shows in the IP address column for RKE1 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;
+    });
+
+    if (internal) {
+      return internal.address;
+    }
+
+    // For RKE1 clusters in EC2, node addresses are
+    // under status.rkeNode.address and status.rkeNode.internalAddress
+    if (!internal && this.status.rkeNode) {
+      return this.status.rkeNode.internalAddress;
+    }
+
+    return this.t('generic.none');
+  }
+
+  get externalIp() {
+    const addresses = this.status?.addresses || [];
+    const statusAddress = findLast(addresses, address => address.type === 'ExternalIP')?.address;
+
+    if (statusAddress) {
+      return statusAddress;
+    }
+
+    // For RKE1 clusters in EC2, node addresses are
+    // under status.rkeNode.address and status.rkeNode.internalAddress
+    if (!statusAddress && this.status.rkeNode) {
+      return this.status.rkeNode.address;
+    }
+
+    return this.t('generic.none');
   }
 
   get canScaleDown() {

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

@@ -79,9 +79,9 @@ export default class MgmtNodePool extends HybridModel {
     // These are used in `stateParts` which is show in the same context as `stateParts` for machine deployments (rke2 pools))
     // Using actual states here would look strange when against bucket states for RKE2
     const res = {
-      pending:      0,
-      unavailable:  0,
-      ready:        0,
+      pending:     0,
+      unavailable: 0,
+      ready:       0,
     };
 
     if (!this.nodes) {

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

@@ -3,8 +3,8 @@ import HybridModel from '@shell/plugins/steve/hybrid-class';
 
 const CONFIG_KEYS = [
   {
-    driver:           'aliyunecs',
-    size:      { key: 'instanceType' },
+    driver:   'aliyunecs',
+    size:     { key: 'instanceType' },
     location: {
       getDisplayProperty(that) {
         return `${ that.providerConfig?.region }${ that.providerConfig?.zone }`;
@@ -12,8 +12,8 @@ const CONFIG_KEYS = [
     }
   },
   {
-    driver:           'amazonec2',
-    size:      { key: 'instanceType' },
+    driver:   'amazonec2',
+    size:     { key: 'instanceType' },
     location: {
       getDisplayProperty(that) {
         return `${ that.providerConfig?.region }${ that.providerConfig?.zone }`;
@@ -21,47 +21,47 @@ const CONFIG_KEYS = [
     }
   },
   {
-    driver:           'azure',
-    size:      { key: 'size' },
+    driver:   'azure',
+    size:     { key: 'size' },
     location: { key: 'location' }
   },
   {
-    driver:           'digitalocean',
-    size:      { key: 'size' },
+    driver:   'digitalocean',
+    size:     { key: 'size' },
     location: { key: 'region' }
   },
   {
-    driver:           'exoscale',
-    size:      { key: 'instanceProfile' },
+    driver:   'exoscale',
+    size:     { key: 'instanceProfile' },
     location: { key: 'availabilityZone' }
   },
   {
-    driver:           'linode',
-    size:      { key: 'instanceType' },
+    driver:   'linode',
+    size:     { key: 'instanceType' },
     location: { key: 'region' }
   },
   {
-    driver:           'oci',
-    size:      { key: 'nodeShape' },
+    driver:   'oci',
+    size:     { key: 'nodeShape' },
     location: {}
   },
   {
-    driver:           'packet',
-    size:      { key: 'plan' },
+    driver:   'packet',
+    size:     { key: 'plan' },
     location: { key: 'facilityCode' }
   },
   {
-    driver:           'pnap',
-    size:      { key: 'serverType' },
+    driver:   'pnap',
+    size:     { key: 'serverType' },
     location: { key: 'serverLocation' }
   },
   {
-    driver:           'rackspace',
-    size:      { key: 'flavorId' },
+    driver:   'rackspace',
+    size:     { key: 'flavorId' },
     location: { key: 'region' }
   },
   {
-    driver:           'vmwarevsphere',
+    driver: 'vmwarevsphere',
     size:   {
       getDisplayProperty(that) {
         const size = formatSi(that.providerConfig?.memorySize * 1048576, 1024, 'iB');

package/models/management.cattle.io.podsecurityadmissionconfigurationtemplate.ts

@@ -0,0 +1,4 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+
+export default class PodSecurityAdmissionTemplate extends SteveModel {
+}

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

@@ -2,7 +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';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 
 function clearUnusedResourceQuotas(spec, types) {
   types.forEach((type) => {
@@ -99,18 +99,36 @@ export default class Project extends HybridModel {
     // and the PUT request should have a query param _replace=true.
     const newValue = await norman.save({ replace: forceReplaceOnReq });
 
-    try {
-      await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
-    } catch (err) {
-      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 or forbidden error. If that happens,
-        // retry the action.
+    let retryCount = 0;
+
+    const finishProjectCreation = async() => {
+      try {
         await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
-      } else {
-        throw err;
+      } catch (err) {
+        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 409 resource conflict or forbidden error. If that happens,
+          // retry the action.
+
+          // The 403 permission error can happen due to the user requesting
+          // the project before the project is fully created and the project
+          // permissions are assigned to the user so we allow some
+          // time for that process to complete.
+
+          if (retryCount < 3) {
+            retryCount++;
+            await setTimeout(() => {
+              // Delay for three seconds to avoid another failure due to latency.
+              finishProjectCreation();
+            }, '3000');
+          } else {
+            throw err;
+          }
+        }
       }
-    }
+    };
+
+    await finishProjectCreation();
 
     return newValue;
   }
@@ -153,8 +171,8 @@ export default class Project extends HybridModel {
   get normanEditProject() {
     return (async() => {
       const normanProject = await this.$dispatch('rancher/find', {
-        type:       NORMAN.PROJECT,
-        id:         this.id.replace('/', ':'),
+        type: NORMAN.PROJECT,
+        id:   this.id.replace('/', ':'),
       }, { root: true });
 
       const clearedResourceQuotas = clearUnusedResourceQuotas(this.spec, ['resourceQuota', 'namespaceDefaultResourceQuota']);
@@ -163,6 +181,7 @@ export default class Project extends HybridModel {
       normanProject.setLabels(this.metadata.labels);
       normanProject.setResourceQuotas(clearedResourceQuotas);
       normanProject.description = this.spec.description;
+      normanProject.name = this.spec.displayName;
       normanProject.containerDefaultResourceLimit = this.spec.containerDefaultResourceLimit;
 
       return normanProject;

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

@@ -80,9 +80,9 @@ export default class PRTB extends HybridModel {
     const name = `c-cluster-product-resource-id`;
 
     const params = {
-      resource:  MANAGEMENT.PROJECT,
-      id:        this.projectId,
-      product:   'explorer',
+      resource: MANAGEMENT.PROJECT,
+      id:       this.projectId,
+      product:  'explorer',
     };
 
     return { name, params };
@@ -96,9 +96,9 @@ export default class PRTB 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 };

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

@@ -4,44 +4,45 @@ import { DESCRIPTION } from '@shell/config/labels-annotations';
 import { NORMAN } from '@shell/config/types';
 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';
 
 export const CATTLE_API_GROUP = '.cattle.io';
 
 export const SUBTYPE_MAPPING = {
-  GLOBAL:    {
-    key:            'GLOBAL',
-    type:           'management.cattle.io.globalrole',
-    defaultKey:     'newUserDefault',
-    id:             'GLOBAL',
-    labelKey:          'rbac.roletemplate.subtypes.GLOBAL.label',
+  GLOBAL: {
+    key:        'GLOBAL',
+    type:       'management.cattle.io.globalrole',
+    defaultKey: 'newUserDefault',
+    id:         'GLOBAL',
+    labelKey:   'rbac.roletemplate.subtypes.GLOBAL.label',
   },
-  CLUSTER:   {
-    key:            'CLUSTER',
-    type:           'management.cattle.io.roletemplate',
-    context:        'cluster',
-    defaultKey:     'clusterCreatorDefault',
-    id:             'CLUSTER',
-    labelKey:          'rbac.roletemplate.subtypes.CLUSTER.label',
+  CLUSTER: {
+    key:        'CLUSTER',
+    type:       'management.cattle.io.roletemplate',
+    context:    'cluster',
+    defaultKey: 'clusterCreatorDefault',
+    id:         'CLUSTER',
+    labelKey:   'rbac.roletemplate.subtypes.CLUSTER.label',
   },
   NAMESPACE: {
-    key:            'NAMESPACE',
-    type:           'management.cattle.io.roletemplate',
-    context:        'project',
-    defaultKey:     'projectCreatorDefault',
-    id:             'NAMESPACE',
-    labelKey:          'rbac.roletemplate.subtypes.NAMESPACE.label',
+    key:        'NAMESPACE',
+    type:       'management.cattle.io.roletemplate',
+    context:    'project',
+    defaultKey: 'projectCreatorDefault',
+    id:         'NAMESPACE',
+    labelKey:   'rbac.roletemplate.subtypes.NAMESPACE.label',
   },
   RBAC_ROLE: {
-    key:            'RBAC_ROLE',
-    type:           'rbac.authorization.k8s.io.role',
-    id:             'RBAC_ROLE',
-    labelKey:          'rbac.roletemplate.subtypes.RBAC_ROLE.label',
+    key:      'RBAC_ROLE',
+    type:     'rbac.authorization.k8s.io.role',
+    id:       'RBAC_ROLE',
+    labelKey: 'rbac.roletemplate.subtypes.RBAC_ROLE.label',
   },
   RBAC_CLUSTER_ROLE: {
-    key:            'RBAC_CLUSTER_ROLE',
-    type:           'rbac.authorization.k8s.io.clusterrole',
-    id:             'RBAC_CLUSTER_ROLE',
-    labelKey:          'rbac.roletemplate.subtypes.RBAC_CLUSTER_ROLE.label',
+    key:      'RBAC_CLUSTER_ROLE',
+    type:     'rbac.authorization.k8s.io.clusterrole',
+    id:       'RBAC_CLUSTER_ROLE',
+    labelKey: 'rbac.roletemplate.subtypes.RBAC_CLUSTER_ROLE.label',
   }
 };
 
@@ -55,6 +56,8 @@ export const VERBS = [
   'watch',
 ];
 
+export const CREATE_VERBS = new Set(['PUT', 'blocked-PUT']);
+
 export default class RoleTemplate extends SteveDescriptionModel {
   get customValidationRules() {
     return Role.customValidationRules();
@@ -64,13 +67,13 @@ export default class RoleTemplate extends SteveDescriptionModel {
     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')
     },
     // API returns a blank description property, this overrides our own link to the description
     {
-      label:         this.t('resourceDetail.detailTop.description'),
-      content:       this.metadata?.annotations?.[DESCRIPTION]
+      label:   this.t('resourceDetail.detailTop.description'),
+      content: this.metadata?.annotations?.[DESCRIPTION]
     });
 
     return out;
@@ -159,6 +162,26 @@ export default class RoleTemplate extends SteveDescriptionModel {
     })();
   }
 
+  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: this.subtype,
+      ...moreQuery
+    };
+
+    this.currentRouter().push(location);
+  }
+
   async save() {
     const norman = await this.norman;
 

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

@@ -12,7 +12,7 @@ export default class Setting extends HybridModel {
     let out = super._availableActions;
 
     // Some settings are not editable
-    if ( settingMetadata?.readOnly || this.fromEnv ) {
+    if ( settingMetadata?.readOnly ) {
       toFilter.push('goToEdit');
     }
 

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

@@ -1,7 +1,25 @@
 import { NORMAN } from '@shell/config/types';
-import HybridModel from '@shell/plugins/steve/hybrid-class';
+import HybridModel, { cleanHybridResources } from '@shell/plugins/steve/hybrid-class';
 
 export default class User extends HybridModel {
+  // Preserve description
+  constructor(data, ctx, rehydrateNamespace = null, setClone = false) {
+    const _description = data.description;
+
+    super(data, ctx, rehydrateNamespace, setClone);
+    this.description = _description;
+  }
+
+  // Clean the Norman properties, but keep description
+  cleanResource(data) {
+    const desc = data.description;
+    const clean = cleanHybridResources(data);
+
+    clean._description = desc;
+
+    return clean;
+  }
+
   get isSystem() {
     for ( const p of this.principalIds || [] ) {
       if ( p.startsWith('system://') ) {
@@ -89,6 +107,24 @@ export default class User extends HybridModel {
     return this.metadata?.state?.name || 'unknown';
   }
 
+  get description() {
+    return this._description;
+  }
+
+  set description(value) {
+    this._description = value;
+  }
+
+  // Ensure when we clone that we preserve the description
+  toJSON() {
+    const data = super.toJSON();
+
+    data.description = this._description;
+    delete data._description;
+
+    return data;
+  }
+
   async save(opt) {
     const clone = await this.$dispatch('clone', { resource: this });
 
@@ -123,7 +159,7 @@ export default class User extends HybridModel {
 
   async refreshGroupMembership() {
     const user = await this.$dispatch('rancher/find', {
-      type:       NORMAN.USER,
+      type: NORMAN.USER,
       id:   this.id,
     }, { root: true });
 
@@ -158,9 +194,9 @@ export default class User extends HybridModel {
         weight:     1
       },
       {
-        action:     'refreshGroupMembership',
-        label:      this.t('authGroups.actions.refresh'),
-        icon:       'icon icon-refresh',
+        action:  'refreshGroupMembership',
+        label:   this.t('authGroups.actions.refresh'),
+        icon:    'icon icon-refresh',
         enabled: this.canRefreshAccess
       },
       { divider: true },

package/models/monitoring.coreos.com.alertmanagerconfig.js

@@ -102,9 +102,9 @@ export default class AlertmanagerConfig extends SteveModel {
         alertmanagerconfigid: this.id
       },
       query: {
-        mode:         queryMode || _VIEW,
+        mode:        queryMode || _VIEW,
         receiverName,
-        currentView:  _YAML
+        currentView: _YAML
       }
     };
   }
@@ -117,9 +117,9 @@ export default class AlertmanagerConfig extends SteveModel {
         alertmanagerconfigid: this.id
       },
       query: {
-        mode:         queryMode || _VIEW,
+        mode:        queryMode || _VIEW,
         receiverName,
-        currentView:  _CONFIG
+        currentView: _CONFIG
       }
     };
   }

package/models/monitoring.coreos.com.receiver.js

@@ -36,13 +36,13 @@ export const RECEIVERS_TYPES = [
     logo:  require(`~shell/assets/images/vendor/email.svg`)
   },
   {
-    name:         'webhook',
-    label:        'monitoringReceiver.webhook.label',
-    title:        'monitoringReceiver.webhook.title',
-    key:          'webhook_configs',
-    logo:         require(`~shell/assets/images/vendor/webhook.svg`),
-    banner:       'webhook.banner',
-    addButton:    'webhook.add'
+    name:      'webhook',
+    label:     'monitoringReceiver.webhook.label',
+    title:     'monitoringReceiver.webhook.title',
+    key:       'webhook_configs',
+    logo:      require(`~shell/assets/images/vendor/webhook.svg`),
+    banner:    'webhook.banner',
+    addButton: 'webhook.add'
   },
   {
     name:  'custom',

package/models/monitoring.coreos.com.route.js

@@ -150,8 +150,8 @@ export default class Route extends SteveModel {
 
   get receiverLink() {
     return {
-      text:    this.spec.receiver,
-      to:      {
+      text: this.spec.receiver,
+      to:   {
         name:   'c-cluster-product-resource-id',
         params: {
           resource: MONITORING.SPOOFED.RECEIVER, product: MONITORING_PRODUCT, id: this.spec.receiver

package/models/namespace.js

@@ -9,7 +9,9 @@ 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';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+import { hasPSALabels, getPSATooltipsDescription, getPSALabels } from '@shell/utils/pod-security-admission';
+import { PSAIconsDisplay, PSALabelsNamespaceVersion } from '@shell/config/pod-security-admission';
 
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
@@ -185,11 +187,10 @@ export default class Namespace extends SteveModel {
   }
 
   get _detailLocation() {
-    const _detailLocation = super._detailLocation;
+    let _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', '');
+    if (this.$rootGetters['currentProduct'].hideNamespaceLocation) {
+      _detailLocation = false;
     }
 
     return _detailLocation;
@@ -210,4 +211,53 @@ export default class Namespace extends SteveModel {
   set resourceQuota(value) {
     Vue.set(this.metadata.annotations, RESOURCE_QUOTA, JSON.stringify(value));
   }
+
+  get detailTopTooltips() {
+    return this.psaTooltipsDescription;
+  }
+
+  get detailTopIcons() {
+    return PSAIconsDisplay;
+  }
+
+  /**
+   * Check if resource contains PSA labels
+   */
+  get hasSystemLabels() {
+    return hasPSALabels(this);
+  }
+
+  get filteredSystemLabels() {
+    return Object.entries(this.labels).reduce((res, [key, value]) => {
+      if (!PSALabelsNamespaceVersion.includes(key)) {
+        res[key] = value;
+      }
+
+      return res;
+    }, {});
+  }
+
+  /**
+   * Generate list of present keys which can be filtered based on existing label keys and system keys
+   */
+  get systemLabels() {
+    return getPSALabels(this);
+  }
+
+  get psaTooltipsDescription() {
+    return getPSATooltipsDescription(this);
+  }
+
+  // Preserve the project label - ensures we preserve project when cloning a namespace
+  cleanForNew() {
+    const project = this.metadata?.labels?.[PROJECT];
+
+    super.cleanForNew();
+
+    if (project) {
+      this.metadata = this.metadata || {};
+      this.metadata.labels = this.metadata.labels || {};
+      this.metadata.labels[PROJECT] = project;
+    }
+  }
 }

package/models/persistentvolume.js

@@ -112,10 +112,22 @@ export const LONGHORN_DRIVER = 'driver.longhorn.io';
 export const LONGHORN_PLUGIN = VOLUME_PLUGINS.find(plugin => plugin.value === 'longhorn');
 
 export default class PV extends SteveModel {
+  // plugin display value table
   get source() {
-    const plugin = this.isLonghorn ? LONGHORN_PLUGIN : VOLUME_PLUGINS.find(plugin => this.spec[plugin.value]);
+    const csiDriver = this.spec?.csi?.driver;
+    const fallback = `${ csiDriver } ${ this.t('persistentVolume.csi.drivers.suffix') }`;
 
-    return this.t(plugin.labelKey);
+    if (csiDriver) {
+      return this.$rootGetters['i18n/withFallback'](`persistentVolume.csi.drivers.${ csiDriver.replaceAll('.', '-') }`, null, fallback);
+    }
+    const pluginDef = VOLUME_PLUGINS.find(plugin => this.spec[plugin.value]);
+
+    if (pluginDef) {
+      return this.t(pluginDef.labelKey);
+    }
+
+    // every source should be a csi driver or listed in VOLUME_PLUGIN but just in case..
+    return this.t('generic.unknown');
   }
 
   get isLonghorn() {