@rancher/shell 0.1.0 → 0.1.1

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

@@ -62,7 +62,7 @@ export default class MgmtCluster extends HybridModel {
       action:     'copyKubeConfig',
       label:      this.t('cluster.copyConfig'),
       bulkable:   false,
-      enabled:    true,
+      enabled:    this.$rootGetters['isRancher'] && this.hasAction('generateKubeconfig'),
       icon:       'icon icon-copy',
     });
 
@@ -80,6 +80,7 @@ export default class MgmtCluster extends HybridModel {
   }
 
   get provisioner() {
+    // For imported K3s clusters, this.status.driver is 'k3s.'
     return this.status?.driver ? this.status.driver : 'imported';
   }
 
@@ -99,11 +100,9 @@ export default class MgmtCluster extends HybridModel {
     return this.spec?.clusterTemplateRevisionName;
   }
 
-  get emberEditPath() {
+  get providerForEmberParam() {
     // Ember wants one word called provider to tell what component to show, but has much indirect mapping to figure out what it is.
     let provider;
-    let clusterTemplateRevision;
-
     // Provisioner is the "<something>Config" in the model
     const provisioner = KONTAINER_TO_DRIVER[(this.provisioner || '').toLowerCase()] || this.provisioner;
 
@@ -114,13 +113,6 @@ export default class MgmtCluster extends HybridModel {
       } else {
         provider = 'custom';
       }
-
-      // If the RKE1 cluster is created from an RKE template, we need
-      // to get the template version to pass into the Ember UI for
-      // the iFramed edit cluster form
-      if (this.rkeTemplateVersion) {
-        clusterTemplateRevision = this.rkeTemplateVersion;
-      }
     } else if ( this.driver ) {
       provider = this.driver;
     } else if ( provisioner && provisioner.endsWith('v2') ) {
@@ -129,6 +121,20 @@ export default class MgmtCluster extends HybridModel {
       provider = 'import';
     }
 
+    return provider;
+  }
+
+  get emberEditPath() {
+    let clusterTemplateRevision;
+
+    // If the RKE1 cluster is created from an RKE template, we need
+    // to get the template version to pass into the Ember UI for
+    // the iFramed edit cluster form
+    if (this.rkeTemplateVersion) {
+      clusterTemplateRevision = this.rkeTemplateVersion;
+    }
+    const provider = this.providerForEmberParam;
+
     // Avoid passing falsy values as query parameters
     const qp = { };
 

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

@@ -46,11 +46,11 @@ export default class CRTB extends HybridModel {
   }
 
   get roleDisplay() {
-    return this.roleTemplate.nameDisplay;
+    return this.roleTemplate?.nameDisplay;
   }
 
   get roleDescription() {
-    return this.roleTemplate.description;
+    return this.roleTemplate?.description;
   }
 
   get roleTemplate() {

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

@@ -14,6 +14,25 @@ const SPECIAL = [BASE, ADMIN, USER];
 const GLOBAL = SUBTYPE_MAPPING.GLOBAL.key;
 
 export default class GlobalRole extends SteveModel {
+  get availableActions() {
+    const out = super._availableActions;
+
+    const toFilter = ['goToEdit', 'promptRemove'];
+    const editActions = out.filter((a) => {
+      if ( toFilter.includes(a.action) ) {
+        return a;
+      }
+    });
+
+    if ( editActions.length > 0 ) {
+      editActions.forEach((a) => {
+        a.enabled = !this.builtin;
+      });
+    }
+
+    return out;
+  }
+
   get customValidationRules() {
     return Role.customValidationRules();
   }

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

@@ -1,5 +1,7 @@
 import { MANAGEMENT_NODE } from '@shell/config/labels-annotations';
-import { CAPI, MANAGEMENT, NODE, NORMAN } from '@shell/config/types';
+import {
+  ADDRESSES, CAPI, MANAGEMENT, NODE, NORMAN
+} from '@shell/config/types';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
 import { insertAt } from '@shell/utils/array';
@@ -87,7 +89,7 @@ export default class MgmtNode extends HybridModel {
   }
 
   get canUpdate() {
-    return this.norman?.hasLink('update');
+    return this.hasLink('update') && this.norman?.hasLink('update');
   }
 
   remove() {
@@ -111,24 +113,21 @@ export default class MgmtNode extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find(c => c.name === this.namespace);
+    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find(c => c.mgmtClusterId === this.mgmtClusterId);
   }
 
   get doneOverride() {
-    return {
-      name:   'c-cluster-product-resource-namespace-id',
-      params: {
-        resource:  CAPI.RANCHER_CLUSTER,
-        namespace: this.provisioningCluster?.namespace,
-        id:        this.namespace
-      }
-    };
+    return this.provisioningCluster?.detailLocation;
   }
 
   get canClone() {
     return false;
   }
 
+  get ipaddress() {
+    return this.status.internalNodeStatus?.addresses?.find(({ type }) => type === ADDRESSES.INTERNAL_IP)?.address || '-';
+  }
+
   get canScaleDown() {
     const isInOnlyPool = this.pool?.provisioningCluster?.pools?.length === 1;
     const isOnlyNode = this.pool?.nodes?.length === 1;

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

@@ -1,25 +1,40 @@
 import { DEFAULT_PROJECT, SYSTEM_PROJECT } from '@shell/config/labels-annotations';
 import { MANAGEMENT, NAMESPACE, NORMAN } from '@shell/config/types';
 import HybridModel from '@shell/plugins/steve/hybrid-class';
+import isEmpty from 'lodash/isEmpty';
+
+function clearUnusedResourceQuotas(spec, types) {
+  types.forEach((type) => {
+    if (spec[type]?.limit && !isEmpty(spec[type].limit)) {
+      Object.keys(spec[type].limit).forEach((key) => {
+        if (!spec[type].limit[key]) {
+          delete spec[type].limit[key];
+        }
+      });
+    }
 
-function clearResourceQuotas(val, type) {
-  if (val[type]?.limit && Object.keys(val[type].limit).length) {
-    Object.keys(val[type].limit).forEach((key) => {
-      if (!val[type].limit[key]) {
-        delete val[type].limit[key];
-      }
-    });
-  }
+    if (spec[type]?.usedLimit && !isEmpty(spec[type].usedLimit)) {
+      Object.keys(spec[type].usedLimit).forEach((key) => {
+        if (!spec[type].usedLimit[key]) {
+          delete spec[type].usedLimit[key];
+        }
+      });
+    }
 
-  if ( val[type]?.limit && !Object.keys(val[type].limit).length ) {
-    delete val[type].limit;
-  }
+    if ( spec[type]?.limit && isEmpty(spec[type].limit) ) {
+      spec[type].limit = null;
+    }
 
-  if ( val[type] && !Object.keys(val[type]).length ) {
-    delete val[type];
-  }
+    if ( spec[type]?.usedLimit && isEmpty(spec[type].usedLimit) ) {
+      spec[type].usedLimit = null;
+    }
+
+    if ( spec[type] && !isEmpty(spec[type]) && Object.keys(spec[type]).every( k => spec[type][k] === null ) ) {
+      spec[type] = null;
+    }
+  });
 
-  return val[type];
+  return spec;
 }
 
 export default class Project extends HybridModel {
@@ -54,14 +69,27 @@ export default class Project extends HybridModel {
     return this.listLocation;
   }
 
-  async save() {
+  async save(forceReplaceOnReq) {
     const norman = await this.norman;
 
-    const newValue = await norman.save();
-
-    newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
-
-    await this.$dispatch('management/findAll', { type: MANAGEMENT.PROJECT, opt: { force: true } }, { root: true });
+    // PUT requests to Norman have trouble with nested objects due to the
+    // merging strategy performed on the backend. Whenever a field is
+    // removed, the resource should be replaced instead of merged,
+    // 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) {
+        // The backend updates each new project soon after it is created,
+        // so there is a chance of a resource conflict error. If that happens,
+        // retry the action.
+        await newValue.doAction('setpodsecuritypolicytemplate', { podSecurityPolicyTemplateId: this.spec.podSecurityPolicyTemplateId || null });
+      } else {
+        throw err;
+      }
+    }
 
     return newValue;
   }
@@ -70,7 +98,7 @@ export default class Project extends HybridModel {
     const norman = await this.norman;
 
     await norman.remove(...arguments);
-    this.$dispatch('management/remove', this, { root: true });
+    await this.$dispatch('management/findAll', { type: MANAGEMENT.PROJECT, opt: { force: true } }, { root: true });
   }
 
   get norman() {
@@ -79,6 +107,8 @@ export default class Project extends HybridModel {
 
   get normanNewProject() {
     return (async() => {
+      const clearedResourceQuotas = clearUnusedResourceQuotas(this.spec, ['resourceQuota', 'namespaceDefaultResourceQuota']);
+
       const normanProject = await this.$dispatch('rancher/create', {
         type:                          NORMAN.PROJECT,
         name:                          this.spec.displayName,
@@ -88,13 +118,12 @@ export default class Project extends HybridModel {
         clusterId:                     this.$rootGetters['currentCluster'].id,
         creatorId:                     this.$rootGetters['auth/principalId'],
         containerDefaultResourceLimit: this.spec.containerDefaultResourceLimit,
-        namespaceDefaultResourceQuota: clearResourceQuotas(JSON.parse(JSON.stringify(this.spec)), 'namespaceDefaultResourceQuota'),
-        resourceQuota:                 clearResourceQuotas(JSON.parse(JSON.stringify(this.spec)), 'resourceQuota'),
       }, { root: true });
 
       // The backend seemingly required both labels/annotation and metadata.labels/annotations or it doesn't save the labels and annotations
       normanProject.setAnnotations(this.metadata.annotations);
       normanProject.setLabels(this.metadata.labels);
+      normanProject.setResourceQuotas(clearedResourceQuotas);
 
       return normanProject;
     })();
@@ -107,12 +136,13 @@ export default class Project extends HybridModel {
         id:         this.id.replace('/', ':'),
       }, { root: true });
 
+      const clearedResourceQuotas = clearUnusedResourceQuotas(this.spec, ['resourceQuota', 'namespaceDefaultResourceQuota']);
+
       normanProject.setAnnotations(this.metadata.annotations);
       normanProject.setLabels(this.metadata.labels);
+      normanProject.setResourceQuotas(clearedResourceQuotas);
       normanProject.description = this.spec.description;
       normanProject.containerDefaultResourceLimit = this.spec.containerDefaultResourceLimit;
-      normanProject.namespaceDefaultResourceQuota = clearResourceQuotas(JSON.parse(JSON.stringify(this.spec)), 'namespaceDefaultResourceQuota');
-      normanProject.resourceQuota = clearResourceQuotas(JSON.parse(JSON.stringify(this.spec)), 'resourceQuota');
 
       return normanProject;
     })();
@@ -132,4 +162,8 @@ export default class Project extends HybridModel {
   get canEditYaml() {
     return this.schema?.resourceMethods?.find(x => x === 'blocked-PUT') ? false : super.canUpdate;
   }
+
+  get confirmRemove() {
+    return true;
+  }
 }

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

@@ -56,6 +56,25 @@ export const VERBS = [
 ];
 
 export default class RoleTemplate extends SteveModel {
+  get availableActions() {
+    const out = super._availableActions;
+
+    const toFilter = ['goToEdit', 'promptRemove'];
+    const editActions = out.filter((a) => {
+      if ( toFilter.includes(a.action) ) {
+        return a;
+      }
+    });
+
+    if ( editActions.length > 0 ) {
+      editActions.forEach((a) => {
+        a.enabled = !this.builtin;
+      });
+    }
+
+    return out;
+  }
+
   get customValidationRules() {
     return Role.customValidationRules();
   }

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

@@ -54,7 +54,7 @@ export default class AlertmanagerConfig extends SteveModel {
     return 'c-cluster-product-resource-namespace-id';
   }
 
-  getAlertmanagerConfigDetailRoute() {
+  get _detailLocation() {
     return {
       name:   this.alertmanagerConfigDoneRouteName,
       params: {
@@ -64,7 +64,8 @@ export default class AlertmanagerConfig extends SteveModel {
         namespace: this.metadata?.namespace,
         id:        this.name,
       },
-      hash: '#receivers'
+      hash:  '#receivers',
+      query: { as: 'config' }
     };
   }
 

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

@@ -1,6 +1,15 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
 
 export default class PrometheusRule extends SteveModel {
+  get _availableActions() {
+    // the user cannot edit PrometheusRules with a "period" in the name because the name cannot be edited after creation and the backend will reject any name with a "period"
+    const out = super._availableActions.filter((action) => {
+      return !this.metadata.name.includes('.') || !['goToEdit', 'goToEditYaml', 'goToClone'].includes(action.action);
+    });
+
+    return out;
+  }
+
   get customValidationRules() {
     return [
       {

package/models/namespace.js

@@ -12,7 +12,15 @@ import Vue from 'vue';
 
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
-  'p-', // project namespace
+
+  // Project namespace. When a user creates a project, Rancher creates
+  // namespaces in the local cluster with the 'p-' prefix which are
+  // used to manage RBAC for the project. If these namespaces are deleted,
+  // role bindings can be lost and Rancher may need to be restored from
+  // backup. Therefore we hide these namespaces unless the developer setting
+  // is turned on from the user preferences.
+  'p-',
+
   'user-', // user namespace
   'local', // local namespace
 ];

package/models/networking.k8s.io.ingress.js

@@ -14,10 +14,9 @@ function isTlsHost(spec, host) {
   return tlsHosts(spec).includes(host);
 }
 
-export function ingressFullPath(resource, rule) {
+export function ingressFullPath(resource, rule, path = {}) {
   const spec = resource.spec;
   const hostValue = rule.host || '';
-  const path = rule?.http?.paths || [];
   const pathValue = path.path || '';
   let protocol = '';
 
@@ -73,7 +72,7 @@ export default class Ingress extends SteveModel {
 
   createPathForListPage(workloads, rule, path, certificates) {
     const serviceName = get(path?.backend, this.serviceNamePath);
-    const fullPath = this.fullPath(rule);
+    const fullPath = this.fullPath(rule, path);
 
     return {
       // isUrl thinks urls which contain '*' are valid so I'm adding an additional check for '*'
@@ -88,8 +87,8 @@ export default class Ingress extends SteveModel {
     };
   }
 
-  fullPath(rule) {
-    return ingressFullPath(this, rule);
+  fullPath(rule, path) {
+    return ingressFullPath(this, rule, path);
   }
 
   certLink(cert, certificates = []) {
@@ -193,4 +192,17 @@ export default class Ingress extends SteveModel {
   get hasDefaultBackend() {
     return !isEmpty(this.spec[this.defaultBackendPath]);
   }
+
+  get details() {
+    const out = this._details;
+
+    if (this.spec?.ingressClassName) {
+      out.push({
+        label:   this.t('ingress.ingressClass.label'),
+        content: this.spec.ingressClassName,
+      });
+    }
+
+    return out;
+  }
 }

package/models/persistentvolumeclaim.js

@@ -1,7 +1,17 @@
 
-import { _CLONE } from '@shell/config/query-params';
+import { insertAt } from '@shell/utils/array';
+import {
+  AS,
+  _CLONE,
+  FOCUS,
+  MODE,
+  _UNFLAG,
+  _EDIT
+} from '@shell/config/query-params';
 import Vue from 'vue';
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
+import { STORAGE_CLASS } from '@shell/config/types';
 
 export default class PVC extends SteveModel {
   applyDefaults(_, realMode) {
@@ -15,4 +25,40 @@ export default class PVC extends SteveModel {
       resources:        { requests: { storage } }
     });
   }
+
+  get bound() {
+    return this.state === STATES_ENUM.BOUND;
+  }
+
+  get expandable() {
+    return !!this.$getters[`byId`](STORAGE_CLASS, this.spec?.storageClassName)?.allowVolumeExpansion;
+  }
+
+  get _availableActions() {
+    const out = super._availableActions;
+
+    // Add backwards, each one to the top
+    insertAt(out, 0, { divider: true });
+    insertAt(out, 0, {
+      action:     'goToEditVolumeSize',
+      enabled:    this.expandable && this.bound,
+      icon:       'icon icon-fw icon-plus',
+      label:      this.t('persistentVolumeClaim.expand.label'),
+    });
+
+    return out;
+  }
+
+  goToEditVolumeSize() {
+    const location = this.detailLocation;
+
+    location.query = {
+      ...location.query,
+      [MODE]:  _EDIT,
+      [AS]:    _UNFLAG,
+      [FOCUS]: 'volumeclaim'
+    };
+
+    this.currentRouter().push(location);
+  }
 }

package/models/projectroletemplatebinding.js

@@ -7,11 +7,11 @@ export default class PRTB extends NormanModel {
   }
 
   get roleDisplay() {
-    return this.roleTemplate.nameDisplay;
+    return this.roleTemplate?.nameDisplay;
   }
 
   get roleDescription() {
-    return this.roleTemplate.description;
+    return this.roleTemplate?.description;
   }
 
   get roleTemplate() {